FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of demos/shapes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1334 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
beuc 2012-06-09 17:38:24 +00:00
parent 1c26c70ea9
commit 4d5e90860d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freeglut/freeglut/CMakeLists.txt
View File

@ -402,7 +402,9 @@ ADD_DEMO(Lorenz progs/demos/Lorenz/lorenz.c)
ADD_DEMO(One progs/demos/One/one.c) ADD_DEMO(One progs/demos/One/one.c)
ADD_DEMO(Resizer progs/demos/Resizer/Resizer.cpp) ADD_DEMO(Resizer progs/demos/Resizer/Resizer.cpp)
ADD_DEMO(multi-touch progs/demos/multi-touch/multi-touch.c) ADD_DEMO(multi-touch progs/demos/multi-touch/multi-touch.c)
ADD_DEMO(shapes progs/demos/shapes/shapes.c) ADD_DEMO(shapes progs/demos/shapes/shapes.c
progs/demos/shapes/glmatrix.h
progs/demos/shapes/glmatrix.c)
ADD_DEMO(smooth_opengl3 progs/demos/smooth_opengl3/smooth_opengl3.c) ADD_DEMO(smooth_opengl3 progs/demos/smooth_opengl3/smooth_opengl3.c)
IF(UNIX) IF(UNIX)
ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c

10
freeglut/freeglut/progs/demos/shapes/shapes.c
View File

@ -357,11 +357,11 @@ void initShader(void)
gl_UseProgram (program); gl_UseProgram (program);
attribute_fg_coord = getAttribOrUniformLocation("fg_coord" , program, TRUE); attribute_fg_coord = getAttribOrUniformLocation("fg_coord" , program, GL_TRUE);
attribute_fg_normal = getAttribOrUniformLocation("fg_normal" , program, TRUE); attribute_fg_normal = getAttribOrUniformLocation("fg_normal" , program, GL_TRUE);
uniform_m = getAttribOrUniformLocation("m" , program, FALSE); uniform_m = getAttribOrUniformLocation("m" , program, GL_FALSE);
uniform_p = getAttribOrUniformLocation("p" , program, FALSE); uniform_p = getAttribOrUniformLocation("p" , program, GL_FALSE);
uniform_m_3x3_inv_transp= getAttribOrUniformLocation("m_3x3_inv_transp" , program, FALSE); uniform_m_3x3_inv_transp= getAttribOrUniformLocation("m_3x3_inv_transp" , program, GL_FALSE);
gl_UseProgram (0); gl_UseProgram (0);