intel: fix GLESv1 support

Add intelInitExtensionsES1 to enable required and optional GLESv1
extensions.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 14342ef6246464a02a07dfa626f3a59e0dace61c..a05a9c3665a4b01ba72ccec3a4e646a99e72ef81 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -841,6 +841,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 fb2a846d39fe2a6c67c7ebfd67eb0bf41febdd4b..9991c0001086438fc8299f7645edc2111c2ad89f 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_extensions.h
+++ b/src/mesa/drivers/dri/intel/intel_extensions.h
@@ -32,6 +32,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_es.c b/src/mesa/drivers/dri/intel/intel_extensions_es.c
index 5ef6b0561deac883b1eb68269db14cda1e4cb4bc..2af616e8fc52fa103e016896a6655cf99aa4900e 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_extensions_es.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions_es.c
@@ -30,7 +30,7 @@
 
 #include "intel_extensions.h"
 
-static const char *es2_extensions[] = {
+static const char *common_extensions[] = {
    /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */
    "GL_ARB_draw_buffers",
    "GL_ARB_multisample",
@@ -49,6 +49,43 @@ static const char *es2_extensions[] = {
    "GL_MESA_window_pos",
    "GL_NV_vertex_program",
 
+   /* Optional GLES1 or GLES2 */
+#if FEATURE_OES_EGL_image
+   "GL_OES_EGL_image",
+#endif
+   "GL_EXT_texture_filter_anisotropic",
+   "GL_EXT_packed_depth_stencil",
+   "GL_EXT_texture_format_BGRA8888",
+   "GL_EXT_blend_minmax",
+
+   NULL
+};
+
+static const char *es1_extensions[] = {
+   /* Required by GLES1 */
+   "GL_ARB_multitexture",
+   "GL_ARB_texture_env_add",
+   "GL_ARB_texture_env_combine",
+   "GL_ARB_texture_env_dot3",
+   "GL_ARB_point_parameters",
+
+   /* Optional GLES1 */
+   "GL_EXT_blend_equation_separate",
+   "GL_EXT_blend_func_separate",
+   "GL_EXT_blend_subtract",
+   "GL_ARB_framebuffer_object",
+   "GL_EXT_framebuffer_object",
+   "GL_ARB_point_sprite",
+   "GL_EXT_stencil_wrap",
+   "GL_ARB_texture_cube_map",
+   "GL_ARB_texture_env_crossbar",
+   "GL_ARB_texture_mirrored_repeat",
+   "GL_EXT_texture_lod_bias",
+
+   NULL
+};
+
+static const char *es2_extensions[] = {
    /* Required by GLES2 */
    "GL_ARB_fragment_program",
    "GL_ARB_fragment_shader",
@@ -67,19 +104,26 @@ static const char *es2_extensions[] = {
 
    /* Optional GLES2 */
    "GL_ARB_framebuffer_object",
-   "GL_EXT_texture_filter_anisotropic",
    "GL_ARB_depth_texture",
-   "GL_EXT_packed_depth_stencil",
    "GL_EXT_framebuffer_object",
-   "GL_EXT_texture_format_BGRA8888",
-
-#if FEATURE_OES_EGL_image
-   "GL_OES_EGL_image",
-#endif
 
    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; common_extensions[i]; i++)
+      _mesa_enable_extension(ctx, common_extensions[i]);
+   for (i = 0; es1_extensions[i]; i++)
+      _mesa_enable_extension(ctx, es1_extensions[i]);
+}
+
 /**
  * \brief Extensions to disable.
  *
@@ -103,6 +147,8 @@ intelInitExtensionsES2(struct gl_context *ctx)
    /* Can't use driInitExtensions() since it uses extensions from
     * main/remap_helper.h when called the first time. */
 
+   for (i = 0; common_extensions[i]; i++)
+      _mesa_enable_extension(ctx, common_extensions[i]);
    for (i = 0; es2_extensions[i]; i++)
       _mesa_enable_extension(ctx, es2_extensions[i]);
    for (i = 0; es2_extensions_disabled[i]; i++)