summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2011-08-21 21:47:28 +0800
committerChia-I Wu <[email protected]>2011-09-01 10:53:31 +0800
commit6b9e4b6ca7bec9dbafe4f4368f2f33bbeda6cb5c (patch)
treedb0e2197da815c95e2313ecdadf4a70a2b6239cf /src/mesa/drivers
parent820789ac69a72f6ea8081db6f82827da6c7d7110 (diff)
intel: fix GLESv1 support
Add intelInitExtensionsES1 to enable required and optional GLESv1 extensions. Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/intel/intel_context.c1
-rw-r--r--src/mesa/drivers/dri/intel/intel_extensions.h3
-rw-r--r--src/mesa/drivers/dri/intel/intel_extensions_es.c62
3 files changed, 58 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 14342ef6246..a05a9c3665a 100644
--- 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 fb2a846d39f..9991c000108 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_es.c b/src/mesa/drivers/dri/intel/intel_extensions_es.c
index 5ef6b0561de..2af616e8fc5 100644
--- 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++)