diff options
author | José Fonseca <jfonseca@vmware.com> | 2009-01-24 16:39:49 +0000 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2009-01-24 16:39:49 +0000 |
commit | 2e61d136c27b9c740190643668f1e3509ce609dc (patch) | |
tree | 5bdbdaadc620000719422a6d1cfe7d5ec39832c2 /progs | |
parent | 9bf83fb0162b5ce95fc10ca1a38e6b4a62f9690f (diff) |
progs: Port most of the demos to glew.
A couple of test weren't ported due to glew breakage -- it undefines
GLAPIENTRY.
Diffstat (limited to 'progs')
-rw-r--r-- | progs/demos/Makefile | 8 | ||||
-rw-r--r-- | progs/demos/arbocclude.c | 3 | ||||
-rw-r--r-- | progs/demos/copypix.c | 4 | ||||
-rw-r--r-- | progs/demos/engine.c | 4 | ||||
-rw-r--r-- | progs/demos/fbo_firecube.c | 3 | ||||
-rw-r--r-- | progs/demos/fplight.c | 3 | ||||
-rw-r--r-- | progs/demos/isosurf.c | 3 | ||||
-rw-r--r-- | progs/demos/paltex.c | 3 | ||||
-rw-r--r-- | progs/demos/pointblast.c | 3 | ||||
-rw-r--r-- | progs/demos/shadowtex.c | 3 | ||||
-rw-r--r-- | progs/demos/spriteblast.c | 3 | ||||
-rw-r--r-- | progs/demos/streaming_rect.c | 4 |
12 files changed, 26 insertions, 18 deletions
diff --git a/progs/demos/Makefile b/progs/demos/Makefile index 467dbc5cdf..e636cbd9ad 100644 --- a/progs/demos/Makefile +++ b/progs/demos/Makefile @@ -5,16 +5,16 @@ include $(TOP)/configs/current INCDIR = $(TOP)/include -OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) +OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lglew -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) -OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) +OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lglew -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) -OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) +OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lglew -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ $(APP_LIB_DEPS) PROGS = \ diff --git a/progs/demos/arbocclude.c b/progs/demos/arbocclude.c index 6bf4fd218b..9188ad5a56 100644 --- a/progs/demos/arbocclude.c +++ b/progs/demos/arbocclude.c @@ -29,7 +29,7 @@ #include <stdlib.h> #include <string.h> #include <math.h> -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> #define TEST_DISPLAY_LISTS 0 @@ -273,6 +273,7 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 400, 400 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); Win = glutCreateWindow(argv[0]); + glewInit(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutSpecialFunc( SpecialKey ); diff --git a/progs/demos/copypix.c b/progs/demos/copypix.c index 15001e851b..51435acfa0 100644 --- a/progs/demos/copypix.c +++ b/progs/demos/copypix.c @@ -6,11 +6,10 @@ */ -#define GL_GLEXT_PROTOTYPES - #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <GL/glew.h> #include <GL/glut.h> #include "readtex.h" @@ -234,6 +233,7 @@ int main( int argc, char *argv[] ) glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE); glutCreateWindow(argv[0]); + glewInit(); Init(ciMode, filename); Usage(); diff --git a/progs/demos/engine.c b/progs/demos/engine.c index 6040a2f103..5b9b5baa7b 100644 --- a/progs/demos/engine.c +++ b/progs/demos/engine.c @@ -5,12 +5,11 @@ * June 2006 */ -#define GL_GLEXT_PROTOTYPES - #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <math.h> +#include <GL/glew.h> #include <GL/glut.h> #include "readtex.h" #include "trackball.h" @@ -1288,6 +1287,7 @@ main(int argc, char *argv[]) glutInitWindowSize(WinWidth, WinHeight); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); glutCreateWindow("OpenGL Engine Demo"); + glewInit(); glutReshapeFunc(Reshape); glutMouseFunc(Mouse); glutMotionFunc(Motion); diff --git a/progs/demos/fbo_firecube.c b/progs/demos/fbo_firecube.c index f5ee82a2f1..4e42924a09 100644 --- a/progs/demos/fbo_firecube.c +++ b/progs/demos/fbo_firecube.c @@ -29,11 +29,11 @@ * */ -#define GL_GLEXT_PROTOTYPES #include <math.h> #include <stdlib.h> #include <stdio.h> #include <string.h> +#include <GL/glew.h> #include <GL/glut.h> #include "readtex.h" @@ -1037,6 +1037,7 @@ main(int argc, char *argv[]) glutInitWindowSize(WinWidth, WinHeight); Win = glutCreateWindow("fbo_firecube"); + glewInit(); init(argc, argv); glutDisplayFunc(draw); diff --git a/progs/demos/fplight.c b/progs/demos/fplight.c index fb510cccc8..c297354103 100644 --- a/progs/demos/fplight.c +++ b/progs/demos/fplight.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> @@ -273,6 +273,7 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 200, 200 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH ); Win = glutCreateWindow(argv[0]); + glewInit(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutSpecialFunc( SpecialKey ); diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c index 10f94b6ace..e2ff6bea0b 100644 --- a/progs/demos/isosurf.c +++ b/progs/demos/isosurf.c @@ -33,7 +33,7 @@ #include <windows.h> #undef CLIP_MASK #endif -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include "GL/glut.h" #include "readtex.h" @@ -1052,6 +1052,7 @@ int main(int argc, char **argv) glutInitDisplayMode(type); if (glutCreateWindow("Isosurface") <= 0) { + glewInit(); exit(0); } diff --git a/progs/demos/paltex.c b/progs/demos/paltex.c index aa9c0da36b..d0cbcfb5e9 100644 --- a/progs/demos/paltex.c +++ b/progs/demos/paltex.c @@ -11,7 +11,7 @@ #ifdef _WIN32 #include <windows.h> #endif -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> @@ -255,6 +255,7 @@ int main( int argc, char *argv[] ) glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); glutCreateWindow(argv[0]); + glewInit(); Init(); (void) Init2; /* silence warning */ diff --git a/progs/demos/pointblast.c b/progs/demos/pointblast.c index dbbe2f35a2..2a91b76ad3 100644 --- a/progs/demos/pointblast.c +++ b/progs/demos/pointblast.c @@ -18,7 +18,7 @@ #ifdef _WIN32 #include <windows.h> #endif -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> /* Some <math.h> files do not define M_PI... */ @@ -444,6 +444,7 @@ main(int argc, char **argv) } glutCreateWindow("point burst"); + glewInit(); glutDisplayFunc(redraw); glutMouseFunc(mouse); glutMotionFunc(mouseMotion); diff --git a/progs/demos/shadowtex.c b/progs/demos/shadowtex.c index 4787f0f29d..f10a01ec26 100644 --- a/progs/demos/shadowtex.c +++ b/progs/demos/shadowtex.c @@ -31,12 +31,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define GL_GLEXT_PROTOTYPES #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <math.h> +#include <GL/glew.h> #include <GL/glut.h> #include "showbuffer.h" @@ -1025,6 +1025,7 @@ main(int argc, char *argv[]) glutInitWindowSize(WindowWidth, WindowHeight); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL); glutCreateWindow(argv[0]); + glewInit(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutSpecialFunc(SpecialKey); diff --git a/progs/demos/spriteblast.c b/progs/demos/spriteblast.c index 5ad8e4d9a9..f6630c25d0 100644 --- a/progs/demos/spriteblast.c +++ b/progs/demos/spriteblast.c @@ -21,7 +21,7 @@ #ifdef _WIN32 #include <windows.h> #endif -#define GL_GLEXT_PROTOTYPES +#include <GL/glew.h> #include <GL/glut.h> /* Some <math.h> files do not define M_PI... */ @@ -509,6 +509,7 @@ main(int argc, char **argv) glutInitWindowPosition(0, 0); glutInitWindowSize(600,300); glutCreateWindow("sprite blast"); + glewInit(); glutReshapeFunc(reshape); glutDisplayFunc(redraw); glutMouseFunc(mouse); diff --git a/progs/demos/streaming_rect.c b/progs/demos/streaming_rect.c index 4c1d8535fd..4d4656e722 100644 --- a/progs/demos/streaming_rect.c +++ b/progs/demos/streaming_rect.c @@ -6,12 +6,11 @@ * */ -#define GL_GLEXT_PROTOTYPES - #include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <GL/glew.h> #include <GL/glut.h> #include "readtex.h" @@ -303,6 +302,7 @@ int main( int argc, char *argv[] ) glutInitWindowPosition( 0, 0 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); glutCreateWindow(argv[0] ); + glewInit(); Init( argc, argv ); |