diff --git a/gfx_es2/gl_state.cpp b/gfx_es2/gl_state.cpp
index 722a713a32..4749da90d7 100644
--- a/gfx_es2/gl_state.cpp
+++ b/gfx_es2/gl_state.cpp
@@ -5,7 +5,7 @@
 #endif
 
 #if defined(USING_GLES2)
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(BLACKBERRY)
 PFNGLALPHAFUNCQCOMPROC glAlphaFuncQCOM;
 PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC eglGetSystemTimeFrequencyNV;
 PFNEGLGETSYSTEMTIMENVPROC eglGetSystemTimeNV;
@@ -43,7 +43,7 @@ void OpenGLState::Restore() {
 	blendFuncSeparate.restore(); count++;
 	blendColor.restore(); count++;
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(BLACKBERRY)
 	if (gl_extensions.QCOM_alpha_test) {
 		alphaTestQCOM.restore();
 	}
@@ -122,7 +122,7 @@ void CheckGLExtensions() {
 	gl_extensions.OES_depth24 = strstr(extString, "GL_OES_depth24") != 0;
 	gl_extensions.OES_depth_texture = strstr(extString, "GL_OES_depth_texture") != 0;
 	gl_extensions.OES_mapbuffer = strstr(extString, "GL_OES_mapbuffer") != 0;
-	gl_extensions.GL_EXT_shader_framebuffer_fetch = (strstr(extString, "GL_EXT_shader_framebuffer_fetch") != 0) || (strstr(extString, "GL_NV_shader_framebuffer_fetch") != 0);
+	gl_extensions.EXT_shader_framebuffer_fetch = (strstr(extString, "GL_EXT_shader_framebuffer_fetch") != 0) || (strstr(extString, "GL_NV_shader_framebuffer_fetch") != 0);
 #if defined(IOS) || defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN) || defined(MAEMO)
 	gl_extensions.OES_vertex_array_object = false;
 	gl_extensions.EXT_discard_framebuffer = false;
@@ -143,7 +143,7 @@ void CheckGLExtensions() {
 #endif
 #endif
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(BLACKBERRY)
 	if (gl_extensions.OES_mapbuffer) {
 		glMapBuffer = (PFNGLMAPBUFFERPROC)eglGetProcAddress( "glMapBufferOES" );
 	}
diff --git a/gfx_es2/gl_state.h b/gfx_es2/gl_state.h
index 71dff26811..1003adc447 100644
--- a/gfx_es2/gl_state.h
+++ b/gfx_es2/gl_state.h
@@ -7,7 +7,7 @@
 
 #ifdef USING_GLES2
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(BLACKBERRY)
 // Additional extensions not included in GLES2/gl2ext.h from the NDK
 
 /* GL_QCOM_alpha_test */
@@ -273,7 +273,7 @@ public:
 	STATE3(glStencilOp, GLenum, GLenum, GLenum, GL_KEEP, GL_KEEP, GL_KEEP) stencilOp;
 	STATE3(glStencilFunc, GLenum, GLint, GLuint, GL_ALWAYS, 0, 0xFF) stencilFunc;
 
-#ifdef ANDROID
+#if defined(ANDROID) || defined(BLACKBERRY)
 	// QCOM Alpha Test 
 	BoolState<GL_ALPHA_TEST_QCOM, false> alphaTestQCOM;
 	STATE2(glAlphaFuncQCOM, GLenum, GLclampf, GL_ALWAYS, 0.0f) alphaFuncQCOM;
@@ -302,7 +302,7 @@ struct GLExtensions {
 	bool QCOM_binning_control;
 	bool OES_mapbuffer;
 	bool OES_vertex_array_object;
-	bool GL_EXT_shader_framebuffer_fetch;
+	bool EXT_shader_framebuffer_fetch;
 	
 	// EGL extensions