From: Ian Romanick <ian.d.roman...@intel.com>
The following extensions are always enabled, and drivers do not have
to option to disable them:
GL_ARB_vertex_program
GL_EXT_gpu_program_parameters
GL_NV_vertex_program
---
src/mesa/main/enable.c | 16 +-----
src/mesa/main/extensions.c | 20 +------
src/mesa/main/get.c | 127 +++++++++++++++----------------------------
src/mesa/main/mtypes.h | 3 -
4 files changed, 49 insertions(+), 117 deletions(-)
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 9615203..6d1dfa4 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -115,7 +115,6 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean
state)
case GL_VERTEX_ATTRIB_ARRAY13_NV:
case GL_VERTEX_ATTRIB_ARRAY14_NV:
case GL_VERTEX_ATTRIB_ARRAY15_NV:
- CHECK_EXTENSION(NV_vertex_program, cap);
{
GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));
@@ -664,7 +663,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap,
GLboolean state)
/* GL_EXT_secondary_color */
case GL_COLOR_SUM_EXT:
- CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program, cap);
+ CHECK_EXTENSION(EXT_secondary_color, cap);
if (ctx->Fog.ColorSumEnabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_FOG);
@@ -722,21 +721,18 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap,
GLboolean state)
#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
case GL_VERTEX_PROGRAM_ARB:
- CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);
if (ctx->VertexProgram.Enabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->VertexProgram.Enabled = state;
break;
case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
- CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);
if (ctx->VertexProgram.PointSizeEnabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
ctx->VertexProgram.PointSizeEnabled = state;
break;
case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
- CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap);
if (ctx->VertexProgram.TwoSideEnabled == state)
return;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
@@ -760,7 +756,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap,
GLboolean state)
case GL_MAP1_VERTEX_ATTRIB13_4_NV:
case GL_MAP1_VERTEX_ATTRIB14_4_NV:
case GL_MAP1_VERTEX_ATTRIB15_4_NV:
- CHECK_EXTENSION(NV_vertex_program, cap);
{
const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);
FLUSH_VERTICES(ctx, _NEW_EVAL);
@@ -783,7 +778,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap,
GLboolean state)
case GL_MAP2_VERTEX_ATTRIB13_4_NV:
case GL_MAP2_VERTEX_ATTRIB14_4_NV:
case GL_MAP2_VERTEX_ATTRIB15_4_NV:
- CHECK_EXTENSION(NV_vertex_program, cap);
{
const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);
FLUSH_VERTICES(ctx, _NEW_EVAL);
@@ -1239,7 +1233,7 @@ _mesa_IsEnabled( GLenum cap )
/* GL_EXT_secondary_color */
case GL_COLOR_SUM_EXT:
- CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program);
+ CHECK_EXTENSION(EXT_secondary_color);
return ctx->Fog.ColorSumEnabled;
/* GL_ARB_multisample */
@@ -1265,13 +1259,10 @@ _mesa_IsEnabled( GLenum cap )
#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
case GL_VERTEX_PROGRAM_ARB:
- CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
return ctx->VertexProgram.Enabled;
case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
- CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
return ctx->VertexProgram.PointSizeEnabled;
case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
- CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
return ctx->VertexProgram.TwoSideEnabled;
#endif
#if FEATURE_NV_vertex_program
@@ -1291,7 +1282,6 @@ _mesa_IsEnabled( GLenum cap )
case GL_VERTEX_ATTRIB_ARRAY13_NV:
case GL_VERTEX_ATTRIB_ARRAY14_NV:
case GL_VERTEX_ATTRIB_ARRAY15_NV:
- CHECK_EXTENSION(NV_vertex_program);
{
GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
ASSERT(n < Elements(ctx->Array.ArrayObj->VertexAttrib));
@@ -1313,7 +1303,6 @@ _mesa_IsEnabled( GLenum cap )
case GL_MAP1_VERTEX_ATTRIB13_4_NV:
case GL_MAP1_VERTEX_ATTRIB14_4_NV:
case GL_MAP1_VERTEX_ATTRIB15_4_NV:
- CHECK_EXTENSION(NV_vertex_program);
{
const GLuint map = (GLuint) (cap - GL_MAP1_VERTEX_ATTRIB0_4_NV);
return ctx->Eval.Map1Attrib[map];
@@ -1334,7 +1323,6 @@ _mesa_IsEnabled( GLenum cap )
case GL_MAP2_VERTEX_ATTRIB13_4_NV:
case GL_MAP2_VERTEX_ATTRIB14_4_NV:
case GL_MAP2_VERTEX_ATTRIB15_4_NV:
- CHECK_EXTENSION(NV_vertex_program);
{
const GLuint map = (GLuint) (cap - GL_MAP2_VERTEX_ATTRIB0_4_NV);
return ctx->Eval.Map2Attrib[map];
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index a677bfa..b966b9c 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -139,7 +139,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_vertex_array_bgra", o(EXT_vertex_array_bgra),
GL, 2008 },
{ "GL_ARB_vertex_array_object", o(ARB_vertex_array_object),
GL, 2006 },
{ "GL_ARB_vertex_buffer_object", o(dummy_true),
GL, 2003 },
- { "GL_ARB_vertex_program", o(ARB_vertex_program),
GL, 2002 },
+ { "GL_ARB_vertex_program", o(dummy_true),
GL, 2002 },
{ "GL_ARB_vertex_shader", o(ARB_vertex_shader),
GL, 2002 },
{ "GL_ARB_vertex_type_2_10_10_10_rev",
o(ARB_vertex_type_2_10_10_10_rev), GL, 2009 },
{ "GL_ARB_window_pos", o(dummy_true),
GL, 2001 },
@@ -164,7 +164,7 @@ static const struct extension extension_table[] = {
{ "GL_EXT_framebuffer_multisample",
o(EXT_framebuffer_multisample), GL, 2005 },
{ "GL_EXT_framebuffer_object", o(EXT_framebuffer_object),
GL, 2000 },
{ "GL_EXT_framebuffer_sRGB", o(EXT_framebuffer_sRGB),
GL, 1998 },
- { "GL_EXT_gpu_program_parameters",
o(EXT_gpu_program_parameters), GL, 2006 },
+ { "GL_EXT_gpu_program_parameters", o(dummy_true),
GL, 2006 },
{ "GL_EXT_gpu_shader4", o(EXT_gpu_shader4),
GL, 2006 },
{ "GL_EXT_multi_draw_arrays", o(dummy_true),
GL | ES1 | ES2, 1999 },
{ "GL_EXT_packed_depth_stencil",
o(EXT_packed_depth_stencil), GL, 2005 },
@@ -298,7 +298,7 @@ static const struct extension extension_table[] = {
{ "GL_NV_texture_env_combine4", o(NV_texture_env_combine4),
GL, 1999 },
{ "GL_NV_texture_rectangle", o(NV_texture_rectangle),
GL, 2000 },
{ "GL_NV_vertex_program1_1", o(NV_vertex_program1_1),
GL, 2001 },
- { "GL_NV_vertex_program", o(NV_vertex_program),
GL, 2000 },
+ { "GL_NV_vertex_program", o(dummy_true),
GL, 2000 },
{ "GL_S3_s3tc", o(S3_s3tc),
GL, 1999 },
{ "GL_SGIS_generate_mipmap", o(dummy_true),
GL, 1997 },
{ "GL_SGIS_texture_border_clamp",
o(ARB_texture_border_clamp), GL, 1997 },
@@ -343,16 +343,9 @@ name_to_offset(const char* name)
* XXX: Should these defaults also apply to GLES?
*/
static const size_t default_extensions[] = {
- o(ARB_vertex_program),
-
- o(EXT_gpu_program_parameters),
-
o(OES_read_format),
o(OES_standard_derivatives),
- /* Vendor Extensions */
- o(NV_vertex_program),
-
0,
};
@@ -413,9 +406,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_texture_rg = GL_TRUE;
ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;
ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
-#if FEATURE_ARB_vertex_program
- /*ctx->Extensions.ARB_vertex_program = GL_TRUE;*/
-#endif
#if FEATURE_ARB_vertex_shader
ctx->Extensions.ARB_vertex_shader = GL_TRUE;
#endif
@@ -492,7 +482,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
ctx->Extensions.NV_texture_rectangle = GL_TRUE;
#if FEATURE_NV_vertex_program
- /*ctx->Extensions.NV_vertex_program = GL_TRUE;*/
ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
#endif
#if FEATURE_NV_fragment_program
@@ -501,9 +490,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
#if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program
ctx->Extensions.NV_fragment_program_option = GL_TRUE;
#endif
-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
- /*ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;*/
-#endif
#if FEATURE_texture_fxt1
_mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
#endif
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 2d7b02a..37f7184 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -288,13 +288,11 @@ EXTRA_EXT(ARB_ES2_compatibility);
EXTRA_EXT(ARB_multitexture);
EXTRA_EXT(ARB_texture_cube_map);
EXTRA_EXT(MESA_texture_array);
-EXTRA_EXT2(EXT_secondary_color, ARB_vertex_program);
EXTRA_EXT(EXT_secondary_color);
EXTRA_EXT(EXT_fog_coord);
EXTRA_EXT(EXT_texture_lod_bias);
EXTRA_EXT(EXT_texture_filter_anisotropic);
EXTRA_EXT(NV_point_sprite);
-EXTRA_EXT(NV_vertex_program);
EXTRA_EXT(NV_fragment_program);
EXTRA_EXT(NV_texture_rectangle);
EXTRA_EXT(EXT_stencil_two_side);
@@ -315,33 +313,13 @@ EXTRA_EXT(ARB_vertex_shader);
EXTRA_EXT(EXT_transform_feedback);
EXTRA_EXT(ARB_transform_feedback2);
EXTRA_EXT(EXT_pixel_buffer_object);
-EXTRA_EXT(ARB_vertex_program);
EXTRA_EXT2(NV_point_sprite, ARB_point_sprite);
EXTRA_EXT2(ARB_fragment_program, NV_fragment_program);
-EXTRA_EXT2(ARB_vertex_program, NV_vertex_program);
-EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program);
EXTRA_EXT(ARB_geometry_shader4);
EXTRA_EXT(EXT_framebuffer_sRGB);
EXTRA_EXT(ARB_texture_buffer_object);
static const int
-extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {
- EXT(ARB_vertex_program),
- EXT(ARB_fragment_program),
- EXT(NV_vertex_program),
- EXTRA_END
-};
-
-static const int
-extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[]
= {
- EXT(NV_vertex_program),
- EXT(ARB_vertex_program),
- EXT(ARB_fragment_program),
- EXT(NV_vertex_program),
- EXTRA_END
-};
-
-static const int
extra_NV_primitive_restart[] = {
EXT(NV_primitive_restart),
EXTRA_END
@@ -351,13 +329,6 @@ static const int extra_version_30[] = { EXTRA_VERSION_30,
EXTRA_END };
static const int extra_version_31[] = { EXTRA_VERSION_31, EXTRA_END };
static const int extra_version_32[] = { EXTRA_VERSION_32, EXTRA_END };
-static const int
-extra_ARB_vertex_program_version_es2[] = {
- EXT(ARB_vertex_program),
- EXTRA_VERSION_ES2,
- EXTRA_END
-};
-
#define API_OPENGL_BIT (1 << API_OPENGL)
#define API_OPENGLES_BIT (1 << API_OPENGLES)
#define API_OPENGLES2_BIT (1 << API_OPENGLES2)
@@ -704,8 +675,7 @@ static const struct value_desc values[] = {
{ GL_STENCIL_BACK_PASS_DEPTH_PASS, CONTEXT_ENUM(Stencil.ZPassFunc[1]),
NO_EXTRA },
{ GL_MAX_VERTEX_ATTRIBS_ARB,
- CONTEXT_INT(Const.VertexProgram.MaxAttribs),
- extra_ARB_vertex_program_version_es2 },
+ CONTEXT_INT(Const.VertexProgram.MaxAttribs), NO_EXTRA },
/* OES_texture_3D */
{ GL_TEXTURE_BINDING_3D, LOC_CUSTOM, TYPE_INT, TEXTURE_3D_INDEX, NO_EXTRA },
@@ -914,7 +884,7 @@ static const struct value_desc values[] = {
/* GL_EXT_secondary_color */
{ GL_COLOR_SUM_EXT, CONTEXT_BOOL(Fog.ColorSumEnabled),
- extra_EXT_secondary_color_ARB_vertex_program },
+ extra_EXT_secondary_color },
{ GL_CURRENT_SECONDARY_COLOR_EXT,
CONTEXT_FIELD(Current.Attrib[VERT_ATTRIB_COLOR1][0], TYPE_FLOATN_4),
extra_EXT_secondary_color_flush_current },
@@ -952,71 +922,71 @@ static const struct value_desc values[] = {
/* GL_NV_vertex_program */
{ GL_VERTEX_PROGRAM_BINDING_NV, LOC_CUSTOM, TYPE_INT, 0,
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY0_NV, ARRAY_BOOL(VertexAttrib[0].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY1_NV, ARRAY_BOOL(VertexAttrib[1].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY2_NV, ARRAY_BOOL(VertexAttrib[2].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY3_NV, ARRAY_BOOL(VertexAttrib[3].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY4_NV, ARRAY_BOOL(VertexAttrib[4].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY5_NV, ARRAY_BOOL(VertexAttrib[5].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY6_NV, ARRAY_BOOL(VertexAttrib[6].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY7_NV, ARRAY_BOOL(VertexAttrib[7].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY8_NV, ARRAY_BOOL(VertexAttrib[8].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY9_NV, ARRAY_BOOL(VertexAttrib[9].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY10_NV, ARRAY_BOOL(VertexAttrib[10].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY11_NV, ARRAY_BOOL(VertexAttrib[11].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY12_NV, ARRAY_BOOL(VertexAttrib[12].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY13_NV, ARRAY_BOOL(VertexAttrib[13].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY14_NV, ARRAY_BOOL(VertexAttrib[14].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_VERTEX_ATTRIB_ARRAY15_NV, ARRAY_BOOL(VertexAttrib[15].Enabled),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB0_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[0]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB1_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[1]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB2_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[2]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB3_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[3]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB4_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[4]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB5_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[5]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB6_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[6]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB7_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[7]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB8_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[8]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB9_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[9]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB10_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[10]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB11_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[11]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB12_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[12]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB13_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[13]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB14_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[14]),
- extra_NV_vertex_program },
+ NO_EXTRA },
{ GL_MAP1_VERTEX_ATTRIB15_4_NV, CONTEXT_BOOL(Eval.Map1Attrib[15]),
- extra_NV_vertex_program },
+ NO_EXTRA },
/* GL_NV_fragment_program */
{ GL_FRAGMENT_PROGRAM_NV, CONTEXT_BOOL(FragmentProgram.Enabled),
@@ -1068,34 +1038,25 @@ static const struct value_desc values[] = {
/* GL_ARB_vertex_program */
{ GL_VERTEX_PROGRAM_ARB, /* == GL_VERTEX_PROGRAM_NV */
- CONTEXT_BOOL(VertexProgram.Enabled),
- extra_ARB_vertex_program_NV_vertex_program },
+ CONTEXT_BOOL(VertexProgram.Enabled), NO_EXTRA },
{ GL_VERTEX_PROGRAM_POINT_SIZE_ARB, /* == GL_VERTEX_PROGRAM_POINT_SIZE_NV*/
- CONTEXT_BOOL(VertexProgram.PointSizeEnabled),
- extra_ARB_vertex_program_NV_vertex_program },
+ CONTEXT_BOOL(VertexProgram.PointSizeEnabled), NO_EXTRA },
{ GL_VERTEX_PROGRAM_TWO_SIDE_ARB, /* == GL_VERTEX_PROGRAM_TWO_SIDE_NV */
- CONTEXT_BOOL(VertexProgram.TwoSideEnabled),
- extra_ARB_vertex_program_NV_vertex_program },
+ CONTEXT_BOOL(VertexProgram.TwoSideEnabled), NO_EXTRA },
{ GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB, /* ==
GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
- CONTEXT_INT(Const.MaxProgramMatrixStackDepth),
- extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+ CONTEXT_INT(Const.MaxProgramMatrixStackDepth), NO_EXTRA },
{ GL_MAX_PROGRAM_MATRICES_ARB, /* == GL_MAX_TRACK_MATRICES_NV */
- CONTEXT_INT(Const.MaxProgramMatrices),
- extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+ CONTEXT_INT(Const.MaxProgramMatrices), NO_EXTRA },
{ GL_CURRENT_MATRIX_STACK_DEPTH_ARB, /* == GL_CURRENT_MATRIX_STACK_DEPTH_NV
*/
- LOC_CUSTOM, TYPE_INT, 0,
- extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+ LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
{ GL_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */
- LOC_CUSTOM, TYPE_MATRIX, 0,
- extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program },
+ LOC_CUSTOM, TYPE_MATRIX, 0, NO_EXTRA },
{ GL_TRANSPOSE_CURRENT_MATRIX_ARB, /* == GL_CURRENT_MATRIX_NV */
- LOC_CUSTOM, TYPE_MATRIX, 0,
- extra_ARB_vertex_program_ARB_fragment_program },
+ LOC_CUSTOM, TYPE_MATRIX, 0, NO_EXTRA },
{ GL_PROGRAM_ERROR_POSITION_ARB, /* == GL_PROGRAM_ERROR_POSITION_NV */
- CONTEXT_INT(Program.ErrorPos),
-
extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_program
},
+ CONTEXT_INT(Program.ErrorPos), NO_EXTRA },
/* GL_ARB_fragment_program */
{ GL_FRAGMENT_PROGRAM_ARB, CONTEXT_BOOL(FragmentProgram.Enabled),
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index a6008d5..125a905 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2818,7 +2818,6 @@ struct gl_extensions
GLboolean ARB_transform_feedback2;
GLboolean ARB_uniform_buffer_object;
GLboolean ARB_vertex_array_object;
- GLboolean ARB_vertex_program;
GLboolean ARB_vertex_shader;
GLboolean ARB_vertex_type_2_10_10_10_rev;
GLboolean EXT_blend_color;
@@ -2835,7 +2834,6 @@ struct gl_extensions
GLboolean EXT_framebuffer_multisample;
GLboolean EXT_framebuffer_object;
GLboolean EXT_framebuffer_sRGB;
- GLboolean EXT_gpu_program_parameters;
GLboolean EXT_gpu_shader4;
GLboolean EXT_paletted_texture;
GLboolean EXT_packed_depth_stencil;
@@ -2895,7 +2893,6 @@ struct gl_extensions
GLboolean NV_texture_barrier;
GLboolean NV_texture_env_combine4;
GLboolean NV_texture_rectangle;
- GLboolean NV_vertex_program;
GLboolean NV_vertex_program1_1;
GLboolean OES_read_format;
GLboolean TDFX_texture_compression_FXT1;
--
1.7.4.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
