intel: Clean-up ARB_texture_env_crossbar

Enable support for ARB_texture_env_crossbar in the master extension
list instead of in every single device-specific list.

diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index acb7178..16c8a8d 100644 (file)
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -42,12 +42,6 @@
  * Mesa's Driver Functions
  ***************************************/
 
-static const struct dri_extension i830_extensions[] = {
-   {"GL_ARB_texture_env_crossbar", NULL},
-   {NULL, NULL}
-};
-
-
 static void
 i830InitDriverFunctions(struct dd_function_table *functions)
 {
@@ -105,8 +99,6 @@ i830CreateContext(const __GLcontextModes * mesaVis,
 
    intel->verts = TNL_CONTEXT(ctx)->clipspace.vertex_buf;
 
-   driInitExtensions(ctx, i830_extensions, GL_FALSE);
-
    i830InitState(i830);
    i830InitMetaFuncs(i830);
 

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 532b402..bd9f1d5 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -54,7 +54,6 @@ static const struct dri_extension i915_extensions[] = {
    {"GL_ARB_depth_texture", NULL},
    {"GL_ARB_fragment_program", NULL},
    {"GL_ARB_shadow", NULL},
-   {"GL_ARB_texture_env_crossbar", NULL},
    {"GL_ARB_texture_non_power_of_two", NULL},
    {"GL_EXT_shadow_funcs", NULL},
    /* ARB extn won't work if not enabled */

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index f8ea646..f9f0c74 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -194,9 +194,8 @@ intelGetString(GLcontext * ctx, GLenum name)
 /**
  * Extension strings exported by the intel driver.
  *
- * \note
- * It appears that ARB_texture_env_crossbar has "disappeared" compared to the
- * old i830-specific driver.
+ * Extensions supported by all chips supported by i830_dri, i915_dri, or
+ * i965_dri.
  */
 static const struct dri_extension card_extensions[] = {
    {"GL_ARB_multisample", GL_ARB_multisample_functions},
@@ -208,6 +207,7 @@ static const struct dri_extension card_extensions[] = {
    {"GL_ARB_texture_cube_map", NULL},
    {"GL_ARB_texture_env_add", NULL},
    {"GL_ARB_texture_env_combine", NULL},
+   {"GL_ARB_texture_env_crossbar", NULL},
    {"GL_ARB_texture_env_dot3", NULL},
    {"GL_ARB_texture_mirrored_repeat", NULL},
    {"GL_ARB_texture_non_power_of_two",   NULL },
@@ -264,7 +264,6 @@ static const struct dri_extension brw_extensions[] = {
    { "GL_EXT_shadow_funcs",               NULL },
    /* ARB extn won't work if not enabled */
    { "GL_SGIX_depth_texture",             NULL },
-   { "GL_ARB_texture_env_crossbar",       NULL },
    { "GL_EXT_texture_sRGB",              NULL},
    { NULL,                                NULL }
 };