[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58537] branches/soc-2013-viewport_fx/ source/blender/gpu/intern: Fixed syntax errors the appeared in the WITH_GL_PROFILE_COMPAT build.

Jason Wilkins Jason.A.Wilkins at gmail.com
Tue Jul 23 10:39:52 CEST 2013


Revision: 58537
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58537
Author:   jwilkins
Date:     2013-07-23 08:39:52 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
Fixed syntax errors the appeared in the WITH_GL_PROFILE_COMPAT build.

Modified Paths:
--------------
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_simple_shader.c
    branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.c

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_simple_shader.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_simple_shader.c	2013-07-23 08:28:28 UTC (rev 58536)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_simple_shader.c	2013-07-23 08:39:52 UTC (rev 58537)
@@ -53,6 +53,7 @@
 
 #include "GPU_extensions.h"
 #include "GPU_simple_shader.h"
+#include "gpu_profile.h"
 
 /* State */
 

Modified: branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.c	2013-07-23 08:28:28 UTC (rev 58536)
+++ branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.c	2013-07-23 08:39:52 UTC (rev 58537)
@@ -63,18 +63,14 @@
 }
 
 
-#if defined(WITH_GL_PROFILE_CORE) || defined(WITH_GL_PROFILE_ES20)
 static GLint viewport[4];
-#endif
 
 void gpuViewport_gl(int x, int y, unsigned int width, unsigned int height)
 {
-#if defined(WITH_GL_PROFILE_CORE) || defined(WITH_GL_PROFILE_ES20)
 	viewport[0] = x;
 	viewport[1] = y;
 	viewport[2] = width;
 	viewport[3] = height;
-#endif
 
 	glViewport(x, y, width, height);
 }




More information about the Bf-blender-cvs mailing list