diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-09-22 11:01:11 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-09-22 11:01:45 -0400 |
| commit | b91dba49e0b08b18dbd6c477facdcc7b5472c8c7 (patch) | |
| tree | 152cf86c3b27491bc5a13cd439ed4de39aa01439 /src/mesa/drivers/dri/intel/intel_extensions.c | |
| parent | 1abe48afbe5ba894f6c160e830c04288bb2913b4 (diff) | |
intel: Fix GL_ARB_shading_language_120 commit
Fix commit e7087175f8a04f777403366fb34b58edd00f4d60. Move the reference to
GL_VERSION_2_1_functions to intel_extensions.c where it's available,
don't try to enable a non-existing extension and advertise 1.20 for all
intel chipsets, not just GEN4 and up.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_extensions.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_extensions.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index a066b5b559..4b6229ffe6 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -212,6 +212,9 @@ intelInitExtensions(GLcontext *ctx) */ driInitExtensions(ctx, card_extensions, GL_FALSE); + _mesa_map_function_array(GL_VERSION_2_1_functions); + ctx->Const.GLSLVersion = 120; + if (intel->gen >= 5) driInitExtensions(ctx, ironlake_extensions, GL_FALSE); |