Mesa (intel-2008-q4): intel: disable ATI_texture_env_combine3 for i830( and related device).

[Haihao Xiang]

Module: Mesa
Branch: intel-2008-q4
Commit: 7dd810c4618a93ac4a9315d92d052ff6178dd85c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7dd810c4618a93ac4a9315d92d052ff6178dd85c

Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Tue Dec 30 11:25:45 2008 +0800

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

Thanks to Eric for pointing it out.
(cherry picked from commit 0c4346e63258bcaaae6f3045bc44d0e24073dd0e)

---

 src/mesa/drivers/dri/i915/i915_context.c   |    1 +
 src/mesa/drivers/dri/intel/intel_context.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index e0ddc7f..9bff742 100644
--- 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 65c27a5..c779e2d 100644
--- 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 }
 };