fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: Fix GL_ARB_shading_language_120 commit

Browse source 
Fix commit e7087175f8.  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.
This commit is contained in:
Kristian Høgsberg 2010-09-22 11:01:11 -04:00
parent 1abe48afbe
commit b91dba49e0
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -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;

3
src/mesa/drivers/dri/intel/intel_extensions.c
View file

@ -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);