diff options
| -rw-r--r-- | src/mesa/drivers/dri/swrast/swrast.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/extensions.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
5 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index c79dc5dd5de..96a86654482 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -649,7 +649,6 @@ swrast_init_driver_functions(struct dd_function_table *driver) static const char *es2_extensions[] = { /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */ "GL_EXT_blend_func_separate", - "GL_EXT_compiled_vertex_array", "GL_EXT_framebuffer_blit", "GL_IBM_multimode_draw_arrays", "GL_MESA_window_pos", diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 6ac0e5d197c..b77eca01a47 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -164,7 +164,7 @@ static const struct extension extension_table[] = { { "GL_EXT_blend_minmax", o(EXT_blend_minmax), GLL | ES1 | ES2, 1995 }, { "GL_EXT_blend_subtract", o(dummy_true), GLL, 1995 }, { "GL_EXT_clip_volume_hint", o(EXT_clip_volume_hint), GL, 1996 }, - { "GL_EXT_compiled_vertex_array", o(EXT_compiled_vertex_array), GLL, 1996 }, + { "GL_EXT_compiled_vertex_array", o(dummy_true), GLL, 1996 }, { "GL_EXT_copy_texture", o(dummy_true), GLL, 1995 }, { "GL_EXT_depth_bounds_test", o(EXT_depth_bounds_test), GL, 2002 }, { "GL_EXT_draw_buffers2", o(EXT_draw_buffers2), GL, 2006 }, @@ -357,7 +357,6 @@ name_to_offset(const char* name) * XXX: Should these defaults also apply to GLES? */ static const size_t default_extensions[] = { - o(EXT_compiled_vertex_array), o(EXT_draw_range_elements), o(EXT_packed_pixels), o(EXT_rescale_normal), diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 9acec6ccfe2..7e71d7a4108 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -319,7 +319,6 @@ EXTRA_EXT(ARB_fragment_program); EXTRA_EXT2(ARB_framebuffer_object, EXT_framebuffer_multisample); EXTRA_EXT(EXT_framebuffer_object); EXTRA_EXT(ARB_seamless_cube_map); -EXTRA_EXT(EXT_compiled_vertex_array); EXTRA_EXT(ARB_sync); EXTRA_EXT(ARB_vertex_shader); EXTRA_EXT(EXT_transform_feedback); diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 84f13abe309..34c0a87a450 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -480,8 +480,8 @@ descriptor=[ [ "TEXTURE_COMPRESSION_HINT_ARB", "CONTEXT_INT(Hint.TextureCompression), NO_EXTRA" ], # GL_EXT_compiled_vertex_array - [ "ARRAY_ELEMENT_LOCK_FIRST_EXT", "CONTEXT_INT(Array.LockFirst), extra_EXT_compiled_vertex_array" ], - [ "ARRAY_ELEMENT_LOCK_COUNT_EXT", "CONTEXT_INT(Array.LockCount), extra_EXT_compiled_vertex_array" ], + [ "ARRAY_ELEMENT_LOCK_FIRST_EXT", "CONTEXT_INT(Array.LockFirst), NO_EXTRA" ], + [ "ARRAY_ELEMENT_LOCK_COUNT_EXT", "CONTEXT_INT(Array.LockCount), NO_EXTRA" ], # GL_ARB_transpose_matrix [ "TRANSPOSE_MODELVIEW_MATRIX_ARB", "CONTEXT_MATRIX_T(ModelviewMatrixStack), NO_EXTRA" ], diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 14c1679c52a..68fc8fcc32f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2995,7 +2995,6 @@ struct gl_extensions GLboolean EXT_blend_func_separate; GLboolean EXT_blend_minmax; GLboolean EXT_clip_volume_hint; - GLboolean EXT_compiled_vertex_array; GLboolean EXT_depth_bounds_test; GLboolean EXT_draw_buffers2; GLboolean EXT_draw_range_elements; |