Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Bolsee <benoit.bolsee@online.be>2008-04-19 02:22:50 +0400
committerBenoit Bolsee <benoit.bolsee@online.be>2008-04-19 02:22:50 +0400
commit1fc1fb117ea56765267a74a93ab3cc09f6d89abd (patch)
treea36e60ae2459f1a6fa5f8954413f1c9a2b8ec139 /source/gameengine/Rasterizer
parent10a396d4b73f447457602e1b80d7725ef0cc89f5 (diff)
BGE: fix compilation error with 2D filters on System without GL extenstion: add conditional compile statements
Diffstat (limited to 'source/gameengine/Rasterizer')
-rw-r--r--source/gameengine/Rasterizer/RAS_2DFilterManager.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 39f81bd1156..e03133b9031 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -91,7 +91,8 @@ RAS_2DFilterManager::~RAS_2DFilterManager()
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 @@ unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
std::cout << "2dFilters - Shader program validation error" << std::endl;
return 0;
}
+#endif
return program;
}
@@ -160,7 +162,8 @@ unsigned int RAS_2DFilterManager::CreateShaderProgram(int filtermode)
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 @@ void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
{
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 @@ void RAS_2DFilterManager::EnableFilter(RAS_2DFILTER_MODE mode, int pass, STR_Str
{
if(!isshadersupported)
return;
+#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
if(pass<0 || pass>=MAX_RENDER_PASS)
return;
@@ -337,4 +343,5 @@ void RAS_2DFilterManager::EnableFilter(RAS_2DFILTER_MODE mode, int pass, STR_Str
m_filters[pass] = CreateShaderProgram(mode);
m_enabled[pass] = 1;
}
+#endif
}