summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_extensions.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-09-21 18:13:02 -0600
committerBrian Paul <brianp@vmware.com>2010-09-21 18:13:04 -0600
commite7087175f8a04f777403366fb34b58edd00f4d60 (patch)
treea6720bb374844ccd8c7eb790f33e0ebda6cdc324 /src/mesa/drivers/dri/intel/intel_extensions.c
parent3642ca2f66efa8e078062f566b8f9975928d9f44 (diff)
mesa: don't advertise bogus GL_ARB_shading_language_120 extension
Instead of using the invalid GL_ARB_shading_language_120 extension to determine the GLSL version, use a new ctx->Const.GLSLVersion field. Updated the intel and r600 drivers, but untested. See fd.o bug 29910 NOTE: This is a candidate for the 7.9 branch (but let's wait and see if there's any regressions).
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_extensions.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_extensions.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index bf22a423fc..a066b5b559 100644
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -89,7 +89,6 @@ static const struct dri_extension card_extensions[] = {
{ "GL_ARB_point_sprite", NULL },
{ "GL_ARB_shader_objects", GL_ARB_shader_objects_functions },
{ "GL_ARB_shading_language_100", GL_VERSION_2_0_functions },
- { "GL_ARB_shading_language_120", GL_VERSION_2_1_functions },
{ "GL_ARB_sync", GL_ARB_sync_functions },
{ "GL_ARB_texture_border_clamp", NULL },
{ "GL_ARB_texture_cube_map", NULL },