78 lines
1.9 KiB
Diff
78 lines
1.9 KiB
Diff
|
From: Xavier Bachelot <xavier@bachelot.org>
|
||
|
Date: Fri, 6 Jul 2007 18:56:21 +0000 (-0600)
|
||
|
Subject: call glutInit(), bug 11486
|
||
|
X-Git-Url: http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=commitdiff;h=f98bdfca574478837b33c97d131dad4833e3ee12
|
||
|
|
||
|
call glutInit(), bug 11486
|
||
|
---
|
||
|
|
||
|
--- a/progs/demos/geartrain.c
|
||
|
+++ b/progs/demos/geartrain.c
|
||
|
@@ -1053,6 +1053,7 @@ main (int argc, char *argv[])
|
||
|
else
|
||
|
file = argv[1];
|
||
|
|
||
|
+ glutInit(&argc, argv);
|
||
|
glutInitWindowPosition (0, 0);
|
||
|
glutInitWindowSize(640,480);
|
||
|
glutInitDisplayMode (GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
|
||
|
--- a/progs/demos/gltestperf.c
|
||
|
+++ b/progs/demos/gltestperf.c
|
||
|
@@ -569,6 +569,7 @@ main(int ac, char **av)
|
||
|
if (ac == 2)
|
||
|
frontbuffer = 0;
|
||
|
|
||
|
+ glutInit(&ac, av);
|
||
|
glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
|
||
|
glutInitWindowPosition(0, 0);
|
||
|
glutInitWindowSize(640, 480);
|
||
|
--- a/progs/demos/isosurf.c
|
||
|
+++ b/progs/demos/isosurf.c
|
||
|
@@ -1042,6 +1042,7 @@ int main(int argc, char **argv)
|
||
|
|
||
|
read_surface( "isosurf.dat" );
|
||
|
|
||
|
+ glutInit( &argc, argv);
|
||
|
glutInitWindowPosition(0, 0);
|
||
|
glutInitWindowSize(400, 400);
|
||
|
|
||
|
--- a/progs/demos/morph3d.c
|
||
|
+++ b/progs/demos/morph3d.c
|
||
|
@@ -826,7 +826,7 @@ static void pinit(void)
|
||
|
|
||
|
}
|
||
|
|
||
|
-static void INIT(void)
|
||
|
+int main(int argc, char **argv)
|
||
|
{
|
||
|
printf("Morph 3D - Shows morphing platonic polyhedra\n");
|
||
|
printf("Author: Marcelo Fernandes Vianna (vianna@cat.cbpf.br)\n\n");
|
||
|
@@ -841,6 +841,7 @@ static void INIT(void)
|
||
|
|
||
|
object=1;
|
||
|
|
||
|
+ glutInit(&argc, argv);
|
||
|
glutInitWindowPosition(0,0);
|
||
|
glutInitWindowSize(640,480);
|
||
|
|
||
|
@@ -888,9 +889,3 @@ static void INIT(void)
|
||
|
glutMainLoop();
|
||
|
|
||
|
}
|
||
|
-
|
||
|
-int main(int argc, char **argv)
|
||
|
-{
|
||
|
- INIT();
|
||
|
- return(0);
|
||
|
-}
|
||
|
--- a/progs/demos/winpos.c
|
||
|
+++ b/progs/demos/winpos.c
|
||
|
@@ -100,6 +100,7 @@ static void init( void )
|
||
|
|
||
|
int main( int argc, char *argv[] )
|
||
|
{
|
||
|
+ glutInit(&argc, argv);
|
||
|
glutInitWindowPosition(0, 0);
|
||
|
glutInitWindowSize(500, 500);
|
||
|
glutInitDisplayMode( GLUT_RGB );
|