intel: disable ATI_texture_env_combine3 for i830( and related device).

Thanks to Eric for pointing it out.

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index e0ddc7fd61314d8c6ae5c5d96a3a8dd2448f9da4..9bff74294d859f3f6175b0acc1c5ac14786c7450 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -55,6 +55,7 @@ static const struct dri_extension i915_extensions[] = {
    {"GL_ARB_fragment_program", NULL},
    {"GL_ARB_shadow", NULL},
    {"GL_ARB_texture_non_power_of_two", NULL},
+   {"GL_ATI_texture_env_combine3",       NULL},
    {"GL_EXT_shadow_funcs", NULL},
    {NULL, NULL}
 };

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 83661dfef9b05a594af921a9a7ec3896a5cc9e97..44b276a123ee8df3de43369dd61fb12793ced340 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -388,7 +388,6 @@ static const struct dri_extension card_extensions[] = {
    { "GL_NV_vertex_program",              GL_NV_vertex_program_functions },
    { "GL_NV_vertex_program1_1",           NULL },
    { "GL_SGIS_generate_mipmap",           NULL },
-   { "GL_ATI_texture_env_combine3",       NULL },
    { NULL, NULL }
 };
 
@@ -413,6 +412,7 @@ static const struct dri_extension brw_extensions[] = {
    { "GL_EXT_shadow_funcs",               NULL },
    { "GL_EXT_texture_sRGB",              NULL },
    { "GL_ATI_separate_stencil",           GL_ATI_separate_stencil_functions },
+   { "GL_ATI_texture_env_combine3",       NULL },
    { NULL,                                NULL }
 };