diff options
| author | Marek Olšák <[email protected]> | 2013-05-29 17:32:44 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-06-13 03:54:13 +0200 |
| commit | 45595d506646f560ab16af58acdea2fc563e942b (patch) | |
| tree | 554838041f27519cde08e0a146433a43f549d9df /src/mesa/main | |
| parent | cfa3c5ad828f56559a6cc2de299f993b8e748ea4 (diff) | |
mesa: fix OES_EGL_image_external being partially allowed in the core profile
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 3 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 91c425be678..d162da8db0c 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -31,6 +31,7 @@ extern "C" { #include "glheader.h" #include "imports.h" #include "mtypes.h" +#include "main/context.h" #include "main/uniforms.h" #include "main/macros.h" #include "main/samplerobj.h" @@ -1309,7 +1310,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key) state->language_version = 130; state->es_shader = false; - if (ctx->Extensions.OES_EGL_image_external) + if (_mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external) state->OES_EGL_image_external_enable = true; _mesa_glsl_initialize_types(state); _mesa_glsl_initialize_variables(p.instructions, state); diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 9aaa63f136f..6f7fbc0d2a1 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -798,7 +798,7 @@ _mesa_select_tex_object(struct gl_context *ctx, ctx->Extensions.ARB_texture_buffer_object ? texUnit->CurrentTex[TEXTURE_BUFFER_INDEX] : NULL; case GL_TEXTURE_EXTERNAL_OES: - return ctx->Extensions.OES_EGL_image_external + return _mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external ? texUnit->CurrentTex[TEXTURE_EXTERNAL_INDEX] : NULL; case GL_TEXTURE_2D_MULTISAMPLE: return ctx->Extensions.ARB_texture_multisample @@ -3243,7 +3243,8 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) valid_target = ctx->Extensions.OES_EGL_image; break; case GL_TEXTURE_EXTERNAL_OES: - valid_target = ctx->Extensions.OES_EGL_image_external; + valid_target = + _mesa_is_gles(ctx) ? ctx->Extensions.OES_EGL_image_external : false; break; default: valid_target = false; |