ofShader: fix ubo ext check

openframeworks · Sep 16, 2016 · 95ab11f · 95ab11f
1 parent 8678879
commit 95ab11f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/libs/openFrameworks/gl/ofShader.cpp b/libs/openFrameworks/gl/ofShader.cpp
@@ -17,9 +17,6 @@
 #include "ofxAndroidUtils.h"
 #endif
 
-#ifndef GLEW_ARB_uniform_buffer_object
-#define GLEW_ARB_uniform_buffer_object 0
-#endif
 
 static const string COLOR_ATTRIBUTE="color";
 static const string POSITION_ATTRIBUTE="position";
@@ -698,6 +695,7 @@ bool ofShader::linkProgram() {
 		}
 
 #ifndef TARGET_OPENGLES
+#ifdef GLEW_ARB_uniform_buffer_object
 		if(GLEW_ARB_uniform_buffer_object) {
 			// Pre-cache all active uniforms blocks
 			GLint numUniformBlocks = 0;
@@ -713,6 +711,7 @@ bool ofShader::linkProgram() {
 			}
 		}
 #endif
+#endif
 
 #ifdef TARGET_ANDROID
 		ofAddListener(ofxAndroidEvents().unloadGL,this,&ofShader::unloadGL);
@@ -1287,6 +1286,7 @@ GLint ofShader::getUniformLocation(const string & name)  const{
 }
 
 #ifndef TARGET_OPENGLES
+#ifdef GLEW_ARB_uniform_buffer_object
 //--------------------------------------------------------------
 GLint ofShader::getUniformBlockIndex(const string & name)  const{
 	if(!bLoaded) return -1;
@@ -1369,6 +1369,7 @@ void ofShader::bindUniformBlock(GLuint binding, const string & name) const{
 	}
 }
 #endif
+#endif
 
 //--------------------------------------------------------------
 void ofShader::printActiveUniforms()  const{

diff --git a/libs/openFrameworks/gl/ofShader.h b/libs/openFrameworks/gl/ofShader.h
@@ -177,11 +177,13 @@ class ofShader {
 	GLint getAttributeLocation(const string & name) const;
 
 #ifndef TARGET_OPENGLES
+#ifdef GLEW_ARB_uniform_buffer_object
 	GLint getUniformBlockIndex(const string & name) const;
 	GLint getUniformBlockBinding(const string & name) const;
 	void bindUniformBlock(GLuint bindind, const string & name) const;
 	void printActiveUniformBlocks() const;
 #endif
+#endif
 
 #ifndef TARGET_OPENGLES
 	void setAttribute1s(GLint location, short v1) const;