From 250e3b2093c522cb949be35055577ebd668abe80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mika=20Isoj=C3=A4rvi?= Date: Mon, 26 Jan 2015 15:51:42 -0800 Subject: [PATCH] Enable GL_EXT_draw_buffers_indexed instead of OES. Enable GL_EXT_draw_buffers_indexed instead of GL_OES_draw_buffers_indexed. Change-Id: Id66e27f39393c11d9f0c5d78f642a624b969bf05 --- framework/opengl/wrapper/glwInitExtES.inl | 18 +++++++++--------- scripts/opengl/src_util.py | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/framework/opengl/wrapper/glwInitExtES.inl b/framework/opengl/wrapper/glwInitExtES.inl index db5d2e8..0b1daf8 100644 --- a/framework/opengl/wrapper/glwInitExtES.inl +++ b/framework/opengl/wrapper/glwInitExtES.inl @@ -66,14 +66,14 @@ if (de::contains(extSet, "GL_EXT_copy_image")) gl->copyImageSubData = (glCopyImageSubDataFunc) loader->get("glCopyImageSubDataEXT"); } -if (de::contains(extSet, "GL_OES_draw_buffers_indexed")) +if (de::contains(extSet, "GL_EXT_draw_buffers_indexed")) { - gl->blendEquationSeparatei = (glBlendEquationSeparateiFunc) loader->get("glBlendEquationSeparateiOES"); - gl->blendEquationi = (glBlendEquationiFunc) loader->get("glBlendEquationiOES"); - gl->blendFuncSeparatei = (glBlendFuncSeparateiFunc) loader->get("glBlendFuncSeparateiOES"); - gl->blendFunci = (glBlendFunciFunc) loader->get("glBlendFunciOES"); - gl->colorMaski = (glColorMaskiFunc) loader->get("glColorMaskiOES"); - gl->disablei = (glDisableiFunc) loader->get("glDisableiOES"); - gl->enablei = (glEnableiFunc) loader->get("glEnableiOES"); - gl->isEnabledi = (glIsEnablediFunc) loader->get("glIsEnablediOES"); + gl->blendEquationSeparatei = (glBlendEquationSeparateiFunc) loader->get("glBlendEquationSeparateiEXT"); + gl->blendEquationi = (glBlendEquationiFunc) loader->get("glBlendEquationiEXT"); + gl->blendFuncSeparatei = (glBlendFuncSeparateiFunc) loader->get("glBlendFuncSeparateiEXT"); + gl->blendFunci = (glBlendFunciFunc) loader->get("glBlendFunciEXT"); + gl->colorMaski = (glColorMaskiFunc) loader->get("glColorMaskiEXT"); + gl->disablei = (glDisableiFunc) loader->get("glDisableiEXT"); + gl->enablei = (glEnableiFunc) loader->get("glEnableiEXT"); + gl->isEnabledi = (glIsEnablediFunc) loader->get("glIsEnablediEXT"); } diff --git a/scripts/opengl/src_util.py b/scripts/opengl/src_util.py index 17cc880..3b2a1fc 100644 --- a/scripts/opengl/src_util.py +++ b/scripts/opengl/src_util.py @@ -39,7 +39,7 @@ EXTENSIONS = [ 'GL_EXT_texture_compression_s3tc', 'GL_IMG_texture_compression_pvrtc', 'GL_EXT_copy_image', - 'GL_OES_draw_buffers_indexed' + 'GL_EXT_draw_buffers_indexed' ] def getGLRegistry (): -- 2.7.4