Committing in .
-Compile support for tests on OpenVMS -Fixed missing header file -Fixed missing return value on function return Modified Files: Mesa/descrip.mms Mesa/tests/sharedtex.c Added Files: Mesa/tests/descrip.mms ----------------------------------------------------------------------
This commit is contained in:
parent
40fac75370
commit
43df32e438
|
@ -0,0 +1,68 @@
|
|||
# Makefile for GLUT-based demo programs for VMS
|
||||
# contributed by Jouk Jansen joukj@crys.chem.uva.nl
|
||||
|
||||
|
||||
.first
|
||||
define gl [-.include.gl]
|
||||
|
||||
.include [-]mms-config.
|
||||
|
||||
##### MACROS #####
|
||||
|
||||
INCDIR = ([-.include],[-.util])
|
||||
CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)
|
||||
|
||||
.ifdef SHARE
|
||||
GL_LIBS = $(XLIBS)
|
||||
.else
|
||||
GL_LIBS = [-.lib]libGLUT/l,libMesaGLU/l,libMesaGL/l,$(XLIBS)
|
||||
.endif
|
||||
|
||||
LIB_DEP = [-.lib]$(GL_LIB) [-.lib]$(GLU_LIB) [-.lib]$(GLUT_LIB)
|
||||
|
||||
PROGS = cva.exe,\
|
||||
dinoshade.exe,\
|
||||
fogcoord.exe,\
|
||||
manytex.exe,\
|
||||
multipal.exe,\
|
||||
projtex.exe,\
|
||||
seccolor.exe,\
|
||||
sharedtex.exe,\
|
||||
texline.exe,\
|
||||
texwrap.exe,\
|
||||
vptest1.exe,\
|
||||
vptest2.exe,\
|
||||
vptest3.exe,\
|
||||
vptorus.exe,\
|
||||
vpwarpmesh.exe
|
||||
|
||||
##### RULES #####
|
||||
.obj.exe :
|
||||
cxxlink $(MMS$TARGET_NAME),$(GL_LIBS)
|
||||
|
||||
##### TARGETS #####
|
||||
default :
|
||||
$(MMS)$(MMSQUALIFIERS) $(PROGS)
|
||||
|
||||
clean :
|
||||
delete *.obj;*
|
||||
|
||||
realclean :
|
||||
delete $(PROGS)
|
||||
delete *.obj;*
|
||||
|
||||
cva.exe : cva.obj $(LIB_DEP)
|
||||
dinoshade.exe : dinoshade.obj $(LIB_DEP)
|
||||
fogcoord.exe : fogcoord.obj $(LIB_DEP)
|
||||
manytex.exe : manytex.obj $(LIB_DEP)
|
||||
multipal.exe : multipal.obj $(LIB_DEP)
|
||||
projtex.exe : projtex.obj $(LIB_DEP)
|
||||
seccolor.exe : seccolor.obj $(LIB_DEP)
|
||||
sharedtex.exe : sharedtex.obj $(LIB_DEP)
|
||||
texline.exe : texline.obj $(LIB_DEP)
|
||||
texwrap.exe : texwrap.obj $(LIB_DEP)
|
||||
vptest1.exe : vptest1.obj $(LIB_DEP)
|
||||
vptest2.exe : vptest2.obj $(LIB_DEP)
|
||||
vptest3.exe : vptest3.obj $(LIB_DEP)
|
||||
vptorus.exe : vptorus.obj $(LIB_DEP)
|
||||
vpwarpmesh.exe : vpwarpmesh.obj $(LIB_DEP)
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: sharedtex.c,v 1.1 2000/09/01 21:01:18 brianp Exp $ */
|
||||
/* $Id: sharedtex.c,v 1.2 2002/01/16 14:32:46 joukj Exp $ */
|
||||
|
||||
/*
|
||||
* Test sharing of display lists and texture objects between GLX contests.
|
||||
|
@ -32,6 +32,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
struct window {
|
||||
|
@ -142,7 +143,7 @@ AddWindow(const char *displayName, int xpos, int ypos,
|
|||
if (!glXMakeCurrent(dpy, win, ctx)) {
|
||||
Error(displayName, "glXMakeCurrent failed");
|
||||
printf("glXMakeCurrent failed in Redraw()\n");
|
||||
return;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* save the info for this window */
|
||||
|
|
Loading…
Reference in New Issue