[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14470] trunk/blender/source/gameengine: BGE: fix compilation error with 2D filters on System without GL extenstion : add conditional compile statements

[Benoit Bolsee]

Revision: 14470
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14470
Author:   ben2610
Date:     2008-04-19 00:22:50 +0200 (Sat, 19 Apr 2008)

Log Message:
-----------
BGE: fix compilation error with 2D filters on System without GL extenstion: add conditional compile statements

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

Modified: trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp	2008-04-18 22:13:22 UTC (rev 14469)
+++ trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp	2008-04-18 22:22:50 UTC (rev 14470)
@@ -1428,8 +1428,8 @@
 		bgl::blBindAttribLocationARB(mShader, mAttr, "Tangent");
 		Py_Return;
 	}
+#endif
 	return NULL;
-#endif
 }
 
 

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2008-04-18 22:13:22 UTC (rev 14469)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp	2008-04-18 22:22:50 UTC (rev 14470)
@@ -91,7 +91,8 @@
 
 unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
 {
-		GLuint program;	
+		GLuint program = 0;	
+#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
 		GLuint fShader = bgl::blCreateShaderObjectARB(GL_FRAGMENT_SHADER);
         GLint success;
 
@@ -127,6 +128,7 @@
 			std::cout << "2dFilters - Shader program validation error" << std::endl;
 			return 0;
 		}
+#endif
 		return program;
 }
 
@@ -160,7 +162,8 @@
 
 void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
 {
-    GLint uniformLoc;
+#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
+	GLint uniformLoc;
 	bgl::blUseProgramObjectARB(shaderprogram);
 	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTexture");
     if (uniformLoc != -1)
@@ -182,12 +185,14 @@
     {
 		bgl::blUniform1fARB(uniformLoc,textureheight);
     }
-
+#endif
 }
 
 void RAS_2DFilterManager::EndShaderProgram()
 {
+#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
 	bgl::blUseProgramObjectARB(0);
+#endif
 }
 
 void RAS_2DFilterManager::SetupTexture()
@@ -297,6 +302,7 @@
 {
 	if(!isshadersupported)
 		return;
+#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
 	if(pass<0 || pass>=MAX_RENDER_PASS)
 		return;
 
@@ -337,4 +343,5 @@
 		m_filters[pass] = CreateShaderProgram(mode);
 		m_enabled[pass] = 1;
 	}
+#endif
 }