[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14495] trunk/blender/source/gameengine/ Rasterizer/RAS_2DFilterManager.cpp: second attempt to fix compilation problem with 2D shaders on systems without GLExt or without shader support : use GL_ARB_shader_objects to conditionally compile the 2D shader code

[Benoit Bolsee]

Revision: 14495
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14495
Author:   ben2610
Date:     2008-04-20 23:01:13 +0200 (Sun, 20 Apr 2008)

Log Message:
-----------
second attempt to fix compilation problem with 2D shaders on systems without GLExt or without shader support: use GL_ARB_shader_objects to conditionally compile the 2D shader code

Modified Paths:
--------------
    trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2008-04-20 19:35:02 UTC (rev 14494)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2008-04-20 21:01:13 UTC (rev 14495)
@@ -92,7 +92,7 @@
 unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
 {
 		GLuint program = 0;	
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
+#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
 		GLuint fShader = bgl::blCreateShaderObjectARB(GL_FRAGMENT_SHADER);
         GLint success;
 
@@ -162,7 +162,7 @@
 
 void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
+#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
 	GLint uniformLoc;
 	bgl::blUseProgramObjectARB(shaderprogram);
 	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTexture");
@@ -190,7 +190,7 @@
 
 void RAS_2DFilterManager::EndShaderProgram()
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
+#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
 	bgl::blUseProgramObjectARB(0);
 #endif
 }
@@ -302,7 +302,7 @@
 {
 	if(!isshadersupported)
 		return;
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
+#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
 	if(pass<0 || pass>=MAX_RENDER_PASS)
 		return;