diff options
| author | Brian Paul <[email protected]> | 2010-09-21 18:13:02 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-09-21 18:13:04 -0600 |
| commit | e7087175f8a04f777403366fb34b58edd00f4d60 (patch) | |
| tree | a6720bb374844ccd8c7eb790f33e0ebda6cdc324 /src/mesa/main/version.c | |
| parent | 3642ca2f66efa8e078062f566b8f9975928d9f44 (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/main/version.c')
| -rw-r--r-- | src/mesa/main/version.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 9e1f5f2a4fe..5997ca00fdc 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -84,7 +84,7 @@ compute_version(GLcontext *ctx) (ctx->Extensions.EXT_stencil_two_side || ctx->Extensions.ATI_separate_stencil)); const GLboolean ver_2_1 = (ver_2_0 && - ctx->Extensions.ARB_shading_language_120 && + ctx->Const.GLSLVersion >= 120 && ctx->Extensions.EXT_pixel_buffer_object && ctx->Extensions.EXT_texture_sRGB); const GLboolean ver_3_0 = (ver_2_1 && |