diff options
| author | Kristian Høgsberg <[email protected]> | 2010-09-22 11:01:11 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-09-22 11:01:45 -0400 |
| commit | b91dba49e0b08b18dbd6c477facdcc7b5472c8c7 (patch) | |
| tree | 152cf86c3b27491bc5a13cd439ed4de39aa01439 | |
| 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.
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 11 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_extensions.c | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 49be289750b..4b44e2adec0 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -41,13 +41,6 @@ #include "intel_span.h" #include "tnl/t_pipeline.h" - -static const struct dri_extension gl_21_extension[] = { - {"GL_VERSION_2_1", GL_VERSION_2_1_functions }, -}; - - - /*************************************** * Mesa's Driver Functions ***************************************/ @@ -94,8 +87,6 @@ GLboolean brwCreateContext( int api, TNL_CONTEXT(ctx)->Driver.RunPipeline = _tnl_run_pipeline; - ctx->Const.GLSLVersion = 120; - ctx->Const.MaxDrawBuffers = BRW_MAX_DRAW_BUFFERS; ctx->Const.MaxTextureImageUnits = BRW_MAX_TEX_UNIT; ctx->Const.MaxTextureCoordUnits = 8; /* Mesa limit */ @@ -160,8 +151,6 @@ GLboolean brwCreateContext( int api, MIN2(ctx->Const.FragmentProgram.MaxNativeParameters, ctx->Const.FragmentProgram.MaxEnvParams); - driInitExtensions(ctx, gl_21_extension, GL_TRUE); - if (intel->is_g4x || intel->gen >= 5) { brw->CMD_VF_STATISTICS = CMD_VF_STATISTICS_GM45; brw->CMD_PIPELINE_SELECT = CMD_PIPELINE_SELECT_GM45; diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index a066b5b5597..4b6229ffe6f 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); |