From 815f0dfca310beeee028d0ba4ff78dde5813c99a Mon Sep 17 00:00:00 2001
From: Ansgar Philippsen <ansgar.philippsen@gmail.com>
Date: Mon, 19 Nov 2012 13:30:25 -0500
Subject: [PATCH] compile fix for USE_SHADER=0
---
modules/gfx/src/gfx_object.cc | 4 +++-
modules/gfx/src/scene.cc | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/gfx/src/gfx_object.cc b/modules/gfx/src/gfx_object.cc
index 0938781ac..c205e6a1c 100644
--- a/modules/gfx/src/gfx_object.cc
+++ b/modules/gfx/src/gfx_object.cc
@@ -166,8 +166,8 @@ void GfxObj::RenderGL(RenderPass pass)
*/
if(clip_flag_) {
- glEnable(GL_CLIP_DISTANCE0);
#if OST_SHADER_SUPPORT_ENABLED
+ glEnable(GL_CLIP_DISTANCE0);
GLuint cp = Shader::Instance().GetCurrentProgram();
if(cp>0) {
glUniform1i(glGetUniformLocation(cp,"clip_flag"),1);
@@ -214,7 +214,9 @@ void GfxObj::RenderGL(RenderPass pass)
}
if(clip_flag_) {
+#if OST_SHADER_SUPPORT_ENABLED
glDisable(GL_CLIP_DISTANCE0);
+#endif
}
glPopMatrix();
diff --git a/modules/gfx/src/scene.cc b/modules/gfx/src/scene.cc
index f61b0ed1e..b3fd78bc2 100644
--- a/modules/gfx/src/scene.cc
+++ b/modules/gfx/src/scene.cc
@@ -1677,9 +1677,11 @@ void Scene::Export(const String& fname, unsigned int width,
if(of_flag) {
if(max_samples<0) {
int msamples=0;
+#if OST_SHADER_SUPPORT_ENABLED
if(OST_GL_VERSION_2_0) {
glGetIntegerv(GL_SAMPLES, &msamples);
}
+#endif
max_samples=msamples;
}
if(!StartOffscreenMode(width,height, max_samples)) {
--
GitLab