diff options
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_extensions.h | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_extensions_es2.c | 14 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex.c | 2 |
4 files changed, 20 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 9c222c7b48..de8a2ce1e9 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -789,6 +789,7 @@ intelInitContext(struct intel_context *intel, intelInitExtensions(ctx); break; case API_OPENGLES: + intelInitExtensionsES1(ctx); break; case API_OPENGLES2: intelInitExtensionsES2(ctx); diff --git a/src/mesa/drivers/dri/intel/intel_extensions.h b/src/mesa/drivers/dri/intel/intel_extensions.h index fb2a846d39..9991c00010 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.h +++ b/src/mesa/drivers/dri/intel/intel_extensions.h @@ -33,6 +33,9 @@ extern void intelInitExtensions(struct gl_context *ctx); extern void +intelInitExtensionsES1(struct gl_context *ctx); + +extern void intelInitExtensionsES2(struct gl_context *ctx); diff --git a/src/mesa/drivers/dri/intel/intel_extensions_es2.c b/src/mesa/drivers/dri/intel/intel_extensions_es2.c index 71c86339c7..4272ed5d9c 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions_es2.c +++ b/src/mesa/drivers/dri/intel/intel_extensions_es2.c @@ -78,6 +78,20 @@ static const char *es2_extensions[] = { NULL, }; +void +intelInitExtensionsES1(struct gl_context *ctx) +{ + int i; + + /* Can't use driInitExtensions() since it uses extensions from + * main/remap_helper.h when called the first time. */ + + for (i = 0; es2_extensions[i]; i++) + _mesa_enable_extension(ctx, es2_extensions[i]); + + _mesa_enable_extension(ctx, "GL_OES_draw_texture"); +} + /** * Initializes potential list of extensions if ctx == NULL, or actually enables * extensions for a context. diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c index 2c21ea0576..646e55bdff 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.c +++ b/src/mesa/drivers/dri/intel/intel_tex.c @@ -120,4 +120,6 @@ intelInitTextureFuncs(struct dd_function_table *functions) functions->NewTextureImage = intelNewTextureImage; functions->DeleteTexture = intelDeleteTextureObject; functions->FreeTexImageData = intelFreeTextureImageData; + + functions->DrawTex = _mesa_meta_DrawTex; } |