[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58462] branches/soc-2013-viewport_fx: Fixed some syntax errors when compiling WITH_GL_PROFILE_COMPAT instead of WITH_GL_PROFILE_ES20 .

[Jason Wilkins]

Revision: 58462
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58462
Author:   jwilkins
Date:     2013-07-21 03:03:28 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
Fixed some syntax errors when compiling WITH_GL_PROFILE_COMPAT instead of WITH_GL_PROFILE_ES20.

(Also noticed that I left gpu_profile and gpu_pixels on my computer at the office, ack)

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h
    branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c

Modified: branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h
===================================================================
--- branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h	2013-07-20 22:31:56 UTC (rev 58461)
+++ branches/soc-2013-viewport_fx/extern/glew-es/include/GL/glew.h	2013-07-21 03:03:28 UTC (rev 58462)
@@ -1588,7 +1588,7 @@
 #define glLightModeliv GLEW_GET_FUN(__glewLightModeliv)
 #define glLighti GLEW_GET_FUN(__glewLighti)
 #define glLightiv GLEW_GET_FUN(__glewLightiv)
-#define gpuLineStipple GLEW_GET_FUN(__glewLineStipple)
+#define glLineStipple GLEW_GET_FUN(__glewLineStipple)
 #define glListBase GLEW_GET_FUN(__glewListBase)
 #define glLoadMatrixd GLEW_GET_FUN(__glewLoadMatrixd)
 #define glLoadName GLEW_GET_FUN(__glewLoadName)
@@ -17949,6 +17949,7 @@
 GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri;
 GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv;
 
+#if 0 // XXX jwilkins: inconsistencies between ES and Desktop versions
 GLEW_FUN_EXPORT PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram;
 GLEW_FUN_EXPORT PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline;
 GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv;
@@ -18009,6 +18010,7 @@
 GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv;
 GLEW_FUN_EXPORT PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages;
 GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline;
+#endif
 
 GLEW_FUN_EXPORT PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv;
 
@@ -18848,9 +18850,11 @@
 GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT;
 GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT;
 
+#if 0 // XXX jwilkins: inconsistencies...
 GLEW_FUN_EXPORT PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT;
 GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT;
 GLEW_FUN_EXPORT PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT;
+#endif
 
 GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT;
 GLEW_FUN_EXPORT PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT;

Modified: branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c
===================================================================
--- branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c	2013-07-20 22:31:56 UTC (rev 58461)
+++ branches/soc-2013-viewport_fx/extern/glew-es/src/glew.c	2013-07-21 03:03:28 UTC (rev 58462)
@@ -1295,6 +1295,7 @@
 PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri = NULL;
 PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv = NULL;
 
+#if 0 // XXX jwilkins: inconsistencies
 PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram = NULL;
 PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline = NULL;
 PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv = NULL;
@@ -1355,6 +1356,7 @@
 PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv = NULL;
 PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages = NULL;
 PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline = NULL;
+#endif
 
 PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv = NULL;
 
@@ -2194,9 +2196,11 @@
 PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT = NULL;
 PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT = NULL;
 
+#if 0 // XXX jwilkins: inconsistencies
 PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT = NULL;
 PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT = NULL;
 PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT = NULL;
+#endif
 
 PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT = NULL;
 PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT = NULL;
@@ -4492,7 +4496,7 @@
   r = ((glLightModeliv = (PFNGLLIGHTMODELIVPROC)glewGetProcAddress((const GLubyte*)"glLightModeliv")) == NULL) || r;
   r = ((glLighti = (PFNGLLIGHTIPROC)glewGetProcAddress((const GLubyte*)"glLighti")) == NULL) || r;
   r = ((glLightiv = (PFNGLLIGHTIVPROC)glewGetProcAddress((const GLubyte*)"glLightiv")) == NULL) || r;
-  r = ((gpuLineStipple = (PFNGLLINESTIPPLEPROC)glewGetProcAddress((const GLubyte*)"gpuLineStipple")) == NULL) || r;
+  r = ((glLineStipple = (PFNGLLINESTIPPLEPROC)glewGetProcAddress((const GLubyte*)"gpuLineStipple")) == NULL) || r;
   r = ((glListBase = (PFNGLLISTBASEPROC)glewGetProcAddress((const GLubyte*)"glListBase")) == NULL) || r;
   r = ((glLoadMatrixd = (PFNGLLOADMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glLoadMatrixd")) == NULL) || r;
   r = ((glLoadName = (PFNGLLOADNAMEPROC)glewGetProcAddress((const GLubyte*)"glLoadName")) == NULL) || r;

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c	2013-07-20 22:31:56 UTC (rev 58461)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c	2013-07-21 03:03:28 UTC (rev 58462)
@@ -148,7 +148,7 @@
 
 	if (GLEW_VERSION_2_0 || GLEW_ES_VERSION_2_0 || GLEW_ARB_fragment_program) {
 #if !defined(GLEW_ES_ONLY)
-		if (GPU_LEGACY) {
+		if (GPU_PROFILE_COMPAT) {
 			/* size of gl_TexCoord array in GLSL */
 			glGetIntegerv(GL_MAX_TEXTURE_COORDS, &maxTextureCoords);
 		}

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c	2013-07-20 22:31:56 UTC (rev 58461)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c	2013-07-21 03:03:28 UTC (rev 58462)
@@ -89,7 +89,7 @@
 			break;
 	}
 
-	gpuBindTexture(target, name);
+	glBindTexture(target, name);
 }