OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove many extension enable flags

Browse Source 
The following extensions are always enabled, and drivers do not have
to option to disable them:

    GL_ARB_multisample
    GL_ARB_texture_compression
    GL_ARB_vertex_buffer_object / GL_OES_mapbuffer
    GL_EXT_copy_texture
    GL_EXT_multi_draw_arrays / GL_SUN_multi_draw_arrays
    GL_EXT_polygon_offset
    GL_EXT_subtexture
    GL_EXT_texture_edge_clamp / GL_SGIS_texture_edge_clamp
    GL_EXT_vertex_array
    GL_SGIS_generate_mipmap

This set was picked because the are all either required or optional
features in desktop OpenGL, OpenGL ES 1.x, and OpenGL ES 2.x.  The
existing support for some is already partially broken in Mesa (e.g.,
proxy texture targets in OpenGL ES).  This patch does not change the
situation in any way.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2011-08-30 16:29:52 -07:00
parent 2bf30b1ccc
commit 34eae1c72a
7 changed files with 23 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesa/drivers/dri/intel/intel_extensions_es.c
View File

@@ -33,18 +33,11 @@
static const char *common_extensions[] = { static const char *common_extensions[] = {
/* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */ /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */
"GL_ARB_draw_buffers", "GL_ARB_draw_buffers",
"GL_ARB_multisample",
"GL_ARB_texture_compression",
"GL_ARB_transpose_matrix", "GL_ARB_transpose_matrix",
"GL_ARB_vertex_buffer_object",
"GL_ARB_window_pos", "GL_ARB_window_pos",
"GL_EXT_blend_func_separate", "GL_EXT_blend_func_separate",
"GL_EXT_compiled_vertex_array", "GL_EXT_compiled_vertex_array",
"GL_EXT_framebuffer_blit", "GL_EXT_framebuffer_blit",
"GL_EXT_multi_draw_arrays",
"GL_EXT_polygon_offset",
"GL_EXT_texture_object",
"GL_EXT_vertex_array",
"GL_IBM_multimode_draw_arrays", "GL_IBM_multimode_draw_arrays",
"GL_MESA_window_pos", "GL_MESA_window_pos",
"GL_NV_vertex_program", "GL_NV_vertex_program",

7
src/mesa/drivers/dri/swrast/swrast.c
View File

@@ -578,18 +578,11 @@ swrast_init_driver_functions(struct dd_function_table *driver)
static const char *es2_extensions[] = { static const char *es2_extensions[] = {
/* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */ /* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */
"GL_ARB_draw_buffers", "GL_ARB_draw_buffers",
"GL_ARB_multisample",
"GL_ARB_texture_compression",
"GL_ARB_transpose_matrix", "GL_ARB_transpose_matrix",
"GL_ARB_vertex_buffer_object",
"GL_ARB_window_pos", "GL_ARB_window_pos",
"GL_EXT_blend_func_separate", "GL_EXT_blend_func_separate",
"GL_EXT_compiled_vertex_array", "GL_EXT_compiled_vertex_array",
"GL_EXT_framebuffer_blit", "GL_EXT_framebuffer_blit",
"GL_EXT_multi_draw_arrays",
"GL_EXT_polygon_offset",
"GL_EXT_texture_object",
"GL_EXT_vertex_array",
"GL_IBM_multimode_draw_arrays", "GL_IBM_multimode_draw_arrays",
"GL_MESA_window_pos", "GL_MESA_window_pos",
"GL_NV_vertex_program", "GL_NV_vertex_program",

55
src/mesa/main/extensions.c
View File

@@ -100,7 +100,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_half_float_vertex", o(ARB_half_float_vertex), GL, 2008 }, { "GL_ARB_half_float_vertex", o(ARB_half_float_vertex), GL, 2008 },
{ "GL_ARB_instanced_arrays", o(ARB_instanced_arrays), GL, 2008 }, { "GL_ARB_instanced_arrays", o(ARB_instanced_arrays), GL, 2008 },
{ "GL_ARB_map_buffer_range", o(ARB_map_buffer_range), GL, 2008 }, { "GL_ARB_map_buffer_range", o(ARB_map_buffer_range), GL, 2008 },
{ "GL_ARB_multisample", o(ARB_multisample), GL, 1994 }, { "GL_ARB_multisample", o(dummy_true), GL, 1994 },
{ "GL_ARB_multitexture", o(ARB_multitexture), GL, 1998 }, { "GL_ARB_multitexture", o(ARB_multitexture), GL, 1998 },
{ "GL_ARB_occlusion_query2", o(ARB_occlusion_query2), GL, 2003 }, { "GL_ARB_occlusion_query2", o(ARB_occlusion_query2), GL, 2003 },
{ "GL_ARB_occlusion_query", o(ARB_occlusion_query), GL, 2001 }, { "GL_ARB_occlusion_query", o(ARB_occlusion_query), GL, 2001 },
@@ -120,7 +120,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_sync", o(ARB_sync), GL, 2003 }, { "GL_ARB_sync", o(ARB_sync), GL, 2003 },
{ "GL_ARB_texture_border_clamp", o(ARB_texture_border_clamp), GL, 2000 }, { "GL_ARB_texture_border_clamp", o(ARB_texture_border_clamp), GL, 2000 },
{ "GL_ARB_texture_buffer_object", o(ARB_texture_buffer_object), GL, 2008 }, { "GL_ARB_texture_buffer_object", o(ARB_texture_buffer_object), GL, 2008 },
{ "GL_ARB_texture_compression", o(ARB_texture_compression), GL, 2000 }, { "GL_ARB_texture_compression", o(dummy_true), GL, 2000 },
{ "GL_ARB_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 }, { "GL_ARB_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 },
{ "GL_ARB_texture_cube_map", o(ARB_texture_cube_map), GL, 1999 }, { "GL_ARB_texture_cube_map", o(ARB_texture_cube_map), GL, 1999 },
{ "GL_ARB_texture_env_add", o(EXT_texture_env_add), GL, 1999 }, { "GL_ARB_texture_env_add", o(EXT_texture_env_add), GL, 1999 },
@@ -140,7 +140,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_uniform_buffer_object", o(ARB_uniform_buffer_object), GL, 2002 }, { "GL_ARB_uniform_buffer_object", o(ARB_uniform_buffer_object), GL, 2002 },
{ "GL_ARB_vertex_array_bgra", o(EXT_vertex_array_bgra), GL, 2008 }, { "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_array_object", o(ARB_vertex_array_object), GL, 2006 },
{ "GL_ARB_vertex_buffer_object", o(ARB_vertex_buffer_object), GL, 2003 }, { "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(ARB_vertex_program), GL, 2002 },
{ "GL_ARB_vertex_shader", o(ARB_vertex_shader), 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_vertex_type_2_10_10_10_rev", o(ARB_vertex_type_2_10_10_10_rev), GL, 2009 },
@@ -155,7 +155,7 @@ static const struct extension extension_table[] = {
{ "GL_EXT_blend_subtract", o(EXT_blend_subtract), GL, 1995 }, { "GL_EXT_blend_subtract", o(EXT_blend_subtract), GL, 1995 },
{ "GL_EXT_clip_volume_hint", o(EXT_clip_volume_hint), GL, 1996 }, { "GL_EXT_clip_volume_hint", o(EXT_clip_volume_hint), GL, 1996 },
{ "GL_EXT_compiled_vertex_array", o(EXT_compiled_vertex_array), GL, 1996 }, { "GL_EXT_compiled_vertex_array", o(EXT_compiled_vertex_array), GL, 1996 },
{ "GL_EXT_copy_texture", o(EXT_copy_texture), GL, 1995 }, { "GL_EXT_copy_texture", o(dummy_true), GL, 1995 },
{ "GL_EXT_depth_bounds_test", o(EXT_depth_bounds_test), GL, 2002 }, { "GL_EXT_depth_bounds_test", o(EXT_depth_bounds_test), GL, 2002 },
{ "GL_EXT_draw_buffers2", o(EXT_draw_buffers2), GL, 2006 }, { "GL_EXT_draw_buffers2", o(EXT_draw_buffers2), GL, 2006 },
{ "GL_EXT_draw_instanced", o(ARB_draw_instanced), GL, 2006 }, { "GL_EXT_draw_instanced", o(ARB_draw_instanced), GL, 2006 },
@@ -167,13 +167,13 @@ static const struct extension extension_table[] = {
{ "GL_EXT_framebuffer_sRGB", o(EXT_framebuffer_sRGB), GL, 1998 }, { "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(EXT_gpu_program_parameters), GL, 2006 },
{ "GL_EXT_gpu_shader4", o(EXT_gpu_shader4), GL, 2006 }, { "GL_EXT_gpu_shader4", o(EXT_gpu_shader4), GL, 2006 },
{ "GL_EXT_multi_draw_arrays", o(EXT_multi_draw_arrays), GL | ES1 | ES2, 1999 }, { "GL_EXT_multi_draw_arrays", o(dummy_true), GL | ES1 | ES2, 1999 },
{ "GL_EXT_packed_depth_stencil", o(EXT_packed_depth_stencil), GL, 2005 }, { "GL_EXT_packed_depth_stencil", o(EXT_packed_depth_stencil), GL, 2005 },
{ "GL_EXT_packed_float", o(EXT_packed_float), GL, 2004 }, { "GL_EXT_packed_float", o(EXT_packed_float), GL, 2004 },
{ "GL_EXT_packed_pixels", o(EXT_packed_pixels), GL, 1997 }, { "GL_EXT_packed_pixels", o(EXT_packed_pixels), GL, 1997 },
{ "GL_EXT_pixel_buffer_object", o(EXT_pixel_buffer_object), GL, 2004 }, { "GL_EXT_pixel_buffer_object", o(EXT_pixel_buffer_object), GL, 2004 },
{ "GL_EXT_point_parameters", o(EXT_point_parameters), GL, 1997 }, { "GL_EXT_point_parameters", o(EXT_point_parameters), GL, 1997 },
{ "GL_EXT_polygon_offset", o(EXT_polygon_offset), GL, 1995 }, { "GL_EXT_polygon_offset", o(dummy_true), GL, 1995 },
{ "GL_EXT_provoking_vertex", o(EXT_provoking_vertex), GL, 2009 }, { "GL_EXT_provoking_vertex", o(EXT_provoking_vertex), GL, 2009 },
{ "GL_EXT_rescale_normal", o(EXT_rescale_normal), GL, 1997 }, { "GL_EXT_rescale_normal", o(EXT_rescale_normal), GL, 1997 },
{ "GL_EXT_secondary_color", o(EXT_secondary_color), GL, 1999 }, { "GL_EXT_secondary_color", o(EXT_secondary_color), GL, 1999 },
@@ -182,7 +182,7 @@ static const struct extension extension_table[] = {
{ "GL_EXT_shadow_funcs", o(EXT_shadow_funcs), GL, 2002 }, { "GL_EXT_shadow_funcs", o(EXT_shadow_funcs), GL, 2002 },
{ "GL_EXT_stencil_two_side", o(EXT_stencil_two_side), GL, 2001 }, { "GL_EXT_stencil_two_side", o(EXT_stencil_two_side), GL, 2001 },
{ "GL_EXT_stencil_wrap", o(EXT_stencil_wrap), GL, 2002 }, { "GL_EXT_stencil_wrap", o(EXT_stencil_wrap), GL, 2002 },
{ "GL_EXT_subtexture", o(EXT_subtexture), GL, 1995 }, { "GL_EXT_subtexture", o(dummy_true), GL, 1995 },
{ "GL_EXT_texture3D", o(EXT_texture3D), GL, 1996 }, { "GL_EXT_texture3D", o(EXT_texture3D), GL, 1996 },
{ "GL_EXT_texture_array", o(EXT_texture_array), GL, 2006 }, { "GL_EXT_texture_array", o(EXT_texture_array), GL, 2006 },
{ "GL_EXT_texture_compression_dxt1", o(EXT_texture_compression_s3tc), GL | ES1 | ES2, 2004 }, { "GL_EXT_texture_compression_dxt1", o(EXT_texture_compression_s3tc), GL | ES1 | ES2, 2004 },
@@ -190,7 +190,7 @@ static const struct extension extension_table[] = {
{ "GL_EXT_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 }, { "GL_EXT_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 },
{ "GL_EXT_texture_compression_s3tc", o(EXT_texture_compression_s3tc), GL, 2000 }, { "GL_EXT_texture_compression_s3tc", o(EXT_texture_compression_s3tc), GL, 2000 },
{ "GL_EXT_texture_cube_map", o(ARB_texture_cube_map), GL, 2001 }, { "GL_EXT_texture_cube_map", o(ARB_texture_cube_map), GL, 2001 },
{ "GL_EXT_texture_edge_clamp", o(SGIS_texture_edge_clamp), GL, 1997 }, { "GL_EXT_texture_edge_clamp", o(dummy_true), GL, 1997 },
{ "GL_EXT_texture_env_add", o(EXT_texture_env_add), GL, 1999 }, { "GL_EXT_texture_env_add", o(EXT_texture_env_add), GL, 1999 },
{ "GL_EXT_texture_env_combine", o(EXT_texture_env_combine), GL, 2006 }, { "GL_EXT_texture_env_combine", o(EXT_texture_env_combine), GL, 2006 },
{ "GL_EXT_texture_env_dot3", o(EXT_texture_env_dot3), GL, 2000 }, { "GL_EXT_texture_env_dot3", o(EXT_texture_env_dot3), GL, 2000 },
@@ -199,8 +199,8 @@ static const struct extension extension_table[] = {
{ "GL_EXT_texture_integer", o(EXT_texture_integer), GL, 2006 }, { "GL_EXT_texture_integer", o(EXT_texture_integer), GL, 2006 },
{ "GL_EXT_texture_lod_bias", o(EXT_texture_lod_bias), GL | ES1, 1999 }, { "GL_EXT_texture_lod_bias", o(EXT_texture_lod_bias), GL | ES1, 1999 },
{ "GL_EXT_texture_mirror_clamp", o(EXT_texture_mirror_clamp), GL, 2004 }, { "GL_EXT_texture_mirror_clamp", o(EXT_texture_mirror_clamp), GL, 2004 },
{ "GL_EXT_texture_object", o(EXT_texture_object), GL, 1995 }, { "GL_EXT_texture_object", o(dummy_true), GL, 1995 },
{ "GL_EXT_texture", o(EXT_texture), GL, 1996 }, { "GL_EXT_texture", o(dummy_true), GL, 1996 },
{ "GL_EXT_texture_rectangle", o(NV_texture_rectangle), GL, 2004 }, { "GL_EXT_texture_rectangle", o(NV_texture_rectangle), GL, 2004 },
{ "GL_EXT_texture_shared_exponent", o(EXT_texture_shared_exponent), GL, 2004 }, { "GL_EXT_texture_shared_exponent", o(EXT_texture_shared_exponent), GL, 2004 },
{ "GL_EXT_texture_snorm", o(EXT_texture_snorm), GL, 2009 }, { "GL_EXT_texture_snorm", o(EXT_texture_snorm), GL, 2009 },
@@ -211,7 +211,7 @@ static const struct extension extension_table[] = {
{ "GL_EXT_timer_query", o(EXT_timer_query), GL, 2006 }, { "GL_EXT_timer_query", o(EXT_timer_query), GL, 2006 },
{ "GL_EXT_transform_feedback", o(EXT_transform_feedback), GL, 2011 }, { "GL_EXT_transform_feedback", o(EXT_transform_feedback), GL, 2011 },
{ "GL_EXT_vertex_array_bgra", o(EXT_vertex_array_bgra), GL, 2008 }, { "GL_EXT_vertex_array_bgra", o(EXT_vertex_array_bgra), GL, 2008 },
{ "GL_EXT_vertex_array", o(EXT_vertex_array), GL, 1995 }, { "GL_EXT_vertex_array", o(dummy_true), GL, 1995 },
{ "GL_EXT_vertex_array_set", o(EXT_vertex_array_set), GL, 1997 }, { "GL_EXT_vertex_array_set", o(EXT_vertex_array_set), GL, 1997 },
/* OES extensions */ /* OES extensions */
@@ -230,11 +230,11 @@ static const struct extension extension_table[] = {
/* FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */ /* FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */
{ "GL_OES_EGL_image", o(OES_EGL_image), GL | ES1 | ES2, 2006 }, { "GL_OES_EGL_image", o(OES_EGL_image), GL | ES1 | ES2, 2006 },
#endif #endif
{ "GL_OES_element_index_uint", o(EXT_vertex_array), ES1 | ES2, 2005 }, { "GL_OES_element_index_uint", o(dummy_true), ES1 | ES2, 2005 },
{ "GL_OES_fbo_render_mipmap", o(EXT_framebuffer_object), ES1 | ES2, 2005 }, { "GL_OES_fbo_render_mipmap", o(EXT_framebuffer_object), ES1 | ES2, 2005 },
{ "GL_OES_fixed_point", o(dummy_true), ES1, 2002 }, { "GL_OES_fixed_point", o(dummy_true), ES1, 2002 },
{ "GL_OES_framebuffer_object", o(EXT_framebuffer_object), ES1, 2005 }, { "GL_OES_framebuffer_object", o(EXT_framebuffer_object), ES1, 2005 },
{ "GL_OES_mapbuffer", o(ARB_vertex_buffer_object), ES1 | ES2, 2005 }, { "GL_OES_mapbuffer", o(dummy_true), ES1 | ES2, 2005 },
{ "GL_OES_matrix_get", o(dummy_true), ES1, 2004 }, { "GL_OES_matrix_get", o(dummy_true), ES1, 2004 },
{ "GL_OES_packed_depth_stencil", o(EXT_packed_depth_stencil), ES1 | ES2, 2007 }, { "GL_OES_packed_depth_stencil", o(EXT_packed_depth_stencil), ES1 | ES2, 2007 },
{ "GL_OES_point_size_array", o(dummy_true), ES1, 2004 }, { "GL_OES_point_size_array", o(dummy_true), ES1, 2004 },
@@ -298,11 +298,11 @@ static const struct extension extension_table[] = {
{ "GL_NV_vertex_program1_1", o(NV_vertex_program1_1), GL, 2001 }, { "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(NV_vertex_program), GL, 2000 },
{ "GL_S3_s3tc", o(S3_s3tc), GL, 1999 }, { "GL_S3_s3tc", o(S3_s3tc), GL, 1999 },
{ "GL_SGIS_generate_mipmap", o(SGIS_generate_mipmap), GL, 1997 }, { "GL_SGIS_generate_mipmap", o(dummy_true), GL, 1997 },
{ "GL_SGIS_texture_border_clamp", o(ARB_texture_border_clamp), GL, 1997 }, { "GL_SGIS_texture_border_clamp", o(ARB_texture_border_clamp), GL, 1997 },
{ "GL_SGIS_texture_edge_clamp", o(SGIS_texture_edge_clamp), GL, 1997 }, { "GL_SGIS_texture_edge_clamp", o(dummy_true), GL, 1997 },
{ "GL_SGIS_texture_lod", o(SGIS_texture_lod), GL, 1997 }, { "GL_SGIS_texture_lod", o(SGIS_texture_lod), GL, 1997 },
{ "GL_SUN_multi_draw_arrays", o(EXT_multi_draw_arrays), GL, 1999 }, { "GL_SUN_multi_draw_arrays", o(dummy_true), GL, 1999 },
{ 0, 0, 0, 0 }, { 0, 0, 0, 0 },
}; };
@@ -343,27 +343,17 @@ name_to_offset(const char* name)
static const size_t default_extensions[] = { static const size_t default_extensions[] = {
o(ARB_copy_buffer), o(ARB_copy_buffer),
o(ARB_draw_buffers), o(ARB_draw_buffers),
o(ARB_multisample),
o(ARB_texture_compression),
o(ARB_transpose_matrix), o(ARB_transpose_matrix),
o(ARB_vertex_buffer_object),
o(ARB_window_pos), o(ARB_window_pos),
o(EXT_abgr), o(EXT_abgr),
o(EXT_bgra), o(EXT_bgra),
o(EXT_compiled_vertex_array), o(EXT_compiled_vertex_array),
o(EXT_copy_texture),
o(EXT_draw_range_elements), o(EXT_draw_range_elements),
o(EXT_multi_draw_arrays),
o(EXT_packed_pixels), o(EXT_packed_pixels),
o(EXT_polygon_offset),
o(EXT_rescale_normal), o(EXT_rescale_normal),
o(EXT_separate_specular_color), o(EXT_separate_specular_color),
o(EXT_subtexture),
o(EXT_texture),
o(EXT_texture3D), o(EXT_texture3D),
o(EXT_texture_object),
o(EXT_vertex_array),
o(OES_read_format), o(OES_read_format),
o(OES_standard_derivatives), o(OES_standard_derivatives),
@@ -374,8 +364,6 @@ static const size_t default_extensions[] = {
o(IBM_rasterpos_clip), o(IBM_rasterpos_clip),
o(NV_light_max_exponent), o(NV_light_max_exponent),
o(NV_texgen_reflection), o(NV_texgen_reflection),
o(SGIS_generate_mipmap),
o(SGIS_texture_edge_clamp),
o(SGIS_texture_lod), o(SGIS_texture_lod),
0, 0,
@@ -446,9 +434,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
#if FEATURE_ARB_vertex_shader #if FEATURE_ARB_vertex_shader
ctx->Extensions.ARB_vertex_shader = GL_TRUE; ctx->Extensions.ARB_vertex_shader = GL_TRUE;
#endif #endif
#if FEATURE_ARB_vertex_buffer_object
/*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
#endif
#if FEATURE_ARB_sync #if FEATURE_ARB_sync
ctx->Extensions.ARB_sync = GL_TRUE; ctx->Extensions.ARB_sync = GL_TRUE;
#endif #endif
@@ -481,7 +466,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
#if FEATURE_ARB_framebuffer_object #if FEATURE_ARB_framebuffer_object
ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE; ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
#endif #endif
/*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE; ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
#if FEATURE_EXT_pixel_buffer_object #if FEATURE_EXT_pixel_buffer_object
ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE; ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
@@ -532,8 +516,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
#if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program #if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program
ctx->Extensions.NV_fragment_program_option = GL_TRUE; ctx->Extensions.NV_fragment_program_option = GL_TRUE;
#endif #endif
/*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE; ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
#endif #endif
@@ -556,10 +538,8 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
void void
_mesa_enable_1_3_extensions(struct gl_context *ctx) _mesa_enable_1_3_extensions(struct gl_context *ctx)
{ {
/*ctx->Extensions.ARB_multisample = GL_TRUE;*/
ctx->Extensions.ARB_multitexture = GL_TRUE; ctx->Extensions.ARB_multitexture = GL_TRUE;
ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
/*ctx->Extensions.ARB_texture_compression = GL_TRUE;*/
ctx->Extensions.ARB_texture_cube_map = GL_TRUE; ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
ctx->Extensions.ARB_texture_env_combine = GL_TRUE; ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE; ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
@@ -586,12 +566,10 @@ _mesa_enable_1_4_extensions(struct gl_context *ctx)
ctx->Extensions.EXT_blend_minmax = GL_TRUE; ctx->Extensions.EXT_blend_minmax = GL_TRUE;
ctx->Extensions.EXT_blend_subtract = GL_TRUE; ctx->Extensions.EXT_blend_subtract = GL_TRUE;
ctx->Extensions.EXT_fog_coord = GL_TRUE; ctx->Extensions.EXT_fog_coord = GL_TRUE;
/*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
ctx->Extensions.EXT_point_parameters = GL_TRUE; ctx->Extensions.EXT_point_parameters = GL_TRUE;
ctx->Extensions.EXT_secondary_color = GL_TRUE; ctx->Extensions.EXT_secondary_color = GL_TRUE;
ctx->Extensions.EXT_stencil_wrap = GL_TRUE; ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
ctx->Extensions.EXT_texture_lod_bias = GL_TRUE; ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
/*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
} }
@@ -603,7 +581,6 @@ void
_mesa_enable_1_5_extensions(struct gl_context *ctx) _mesa_enable_1_5_extensions(struct gl_context *ctx)
{ {
ctx->Extensions.ARB_occlusion_query = GL_TRUE; ctx->Extensions.ARB_occlusion_query = GL_TRUE;
/*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
ctx->Extensions.EXT_shadow_funcs = GL_TRUE; ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
} }

8
src/mesa/main/get.c
View File

@@ -295,7 +295,6 @@ EXTRA_EXT(EXT_texture_lod_bias);
EXTRA_EXT(EXT_texture_filter_anisotropic); EXTRA_EXT(EXT_texture_filter_anisotropic);
EXTRA_EXT(IBM_rasterpos_clip); EXTRA_EXT(IBM_rasterpos_clip);
EXTRA_EXT(NV_point_sprite); EXTRA_EXT(NV_point_sprite);
EXTRA_EXT(SGIS_generate_mipmap);
EXTRA_EXT(NV_vertex_program); EXTRA_EXT(NV_vertex_program);
EXTRA_EXT(NV_fragment_program); EXTRA_EXT(NV_fragment_program);
EXTRA_EXT(NV_texture_rectangle); EXTRA_EXT(NV_texture_rectangle);
@@ -324,7 +323,6 @@ EXTRA_EXT2(NV_point_sprite, ARB_point_sprite);
EXTRA_EXT2(ARB_fragment_program, NV_fragment_program); EXTRA_EXT2(ARB_fragment_program, NV_fragment_program);
EXTRA_EXT2(ARB_vertex_program, NV_vertex_program); EXTRA_EXT2(ARB_vertex_program, NV_vertex_program);
EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program); EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program);
EXTRA_EXT(ARB_vertex_buffer_object);
EXTRA_EXT(ARB_geometry_shader4); EXTRA_EXT(ARB_geometry_shader4);
EXTRA_EXT(ARB_copy_buffer); EXTRA_EXT(ARB_copy_buffer);
EXTRA_EXT(EXT_framebuffer_sRGB); EXTRA_EXT(EXT_framebuffer_sRGB);
@@ -473,16 +471,14 @@ static const struct value_desc values[] = {
{ GL_SAMPLES_ARB, BUFFER_INT(Visual.samples), NO_EXTRA }, { GL_SAMPLES_ARB, BUFFER_INT(Visual.samples), NO_EXTRA },
/* GL_SGIS_generate_mipmap */ /* GL_SGIS_generate_mipmap */
{ GL_GENERATE_MIPMAP_HINT_SGIS, CONTEXT_ENUM(Hint.GenerateMipmap), { GL_GENERATE_MIPMAP_HINT_SGIS, CONTEXT_ENUM(Hint.GenerateMipmap), NO_EXTRA },
extra_SGIS_generate_mipmap },
/* GL_ARB_vertex_buffer_object */ /* GL_ARB_vertex_buffer_object */
{ GL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA }, { GL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
/* GL_ARB_vertex_buffer_object */ /* GL_ARB_vertex_buffer_object */
/* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB - not supported */ /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB - not supported */
{ GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0, { GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA },
extra_ARB_vertex_buffer_object },
/* GL_ARB_copy_buffer */ /* GL_ARB_copy_buffer */
{ GL_COPY_READ_BUFFER, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_copy_buffer }, { GL_COPY_READ_BUFFER, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_copy_buffer },

12
src/mesa/main/mtypes.h
View File

@@ -2766,7 +2766,6 @@ struct gl_extensions
GLboolean ARB_half_float_vertex; GLboolean ARB_half_float_vertex;
GLboolean ARB_instanced_arrays; GLboolean ARB_instanced_arrays;
GLboolean ARB_map_buffer_range; GLboolean ARB_map_buffer_range;
GLboolean ARB_multisample;
GLboolean ARB_multitexture; GLboolean ARB_multitexture;
GLboolean ARB_occlusion_query; GLboolean ARB_occlusion_query;
GLboolean ARB_occlusion_query2; GLboolean ARB_occlusion_query2;
@@ -2782,7 +2781,6 @@ struct gl_extensions
GLboolean ARB_sync; GLboolean ARB_sync;
GLboolean ARB_texture_border_clamp; GLboolean ARB_texture_border_clamp;
GLboolean ARB_texture_buffer_object; GLboolean ARB_texture_buffer_object;
GLboolean ARB_texture_compression;
GLboolean ARB_texture_compression_rgtc; GLboolean ARB_texture_compression_rgtc;
GLboolean ARB_texture_cube_map; GLboolean ARB_texture_cube_map;
GLboolean ARB_texture_env_combine; GLboolean ARB_texture_env_combine;
@@ -2799,7 +2797,6 @@ struct gl_extensions
GLboolean ARB_transpose_matrix; GLboolean ARB_transpose_matrix;
GLboolean ARB_uniform_buffer_object; GLboolean ARB_uniform_buffer_object;
GLboolean ARB_vertex_array_object; GLboolean ARB_vertex_array_object;
GLboolean ARB_vertex_buffer_object;
GLboolean ARB_vertex_program; GLboolean ARB_vertex_program;
GLboolean ARB_vertex_shader; GLboolean ARB_vertex_shader;
GLboolean ARB_vertex_type_2_10_10_10_rev; GLboolean ARB_vertex_type_2_10_10_10_rev;
@@ -2813,7 +2810,6 @@ struct gl_extensions
GLboolean EXT_blend_subtract; GLboolean EXT_blend_subtract;
GLboolean EXT_clip_volume_hint; GLboolean EXT_clip_volume_hint;
GLboolean EXT_compiled_vertex_array; GLboolean EXT_compiled_vertex_array;
GLboolean EXT_copy_texture;
GLboolean EXT_depth_bounds_test; GLboolean EXT_depth_bounds_test;
GLboolean EXT_draw_buffers2; GLboolean EXT_draw_buffers2;
GLboolean EXT_draw_range_elements; GLboolean EXT_draw_range_elements;
@@ -2824,13 +2820,11 @@ struct gl_extensions
GLboolean EXT_framebuffer_sRGB; GLboolean EXT_framebuffer_sRGB;
GLboolean EXT_gpu_program_parameters; GLboolean EXT_gpu_program_parameters;
GLboolean EXT_gpu_shader4; GLboolean EXT_gpu_shader4;
GLboolean EXT_multi_draw_arrays;
GLboolean EXT_packed_depth_stencil; GLboolean EXT_packed_depth_stencil;
GLboolean EXT_packed_float; GLboolean EXT_packed_float;
GLboolean EXT_packed_pixels; GLboolean EXT_packed_pixels;
GLboolean EXT_pixel_buffer_object; GLboolean EXT_pixel_buffer_object;
GLboolean EXT_point_parameters; GLboolean EXT_point_parameters;
GLboolean EXT_polygon_offset;
GLboolean EXT_provoking_vertex; GLboolean EXT_provoking_vertex;
GLboolean EXT_rescale_normal; GLboolean EXT_rescale_normal;
GLboolean EXT_shadow_funcs; GLboolean EXT_shadow_funcs;
@@ -2839,9 +2833,6 @@ struct gl_extensions
GLboolean EXT_separate_specular_color; GLboolean EXT_separate_specular_color;
GLboolean EXT_stencil_wrap; GLboolean EXT_stencil_wrap;
GLboolean EXT_stencil_two_side; GLboolean EXT_stencil_two_side;
GLboolean EXT_subtexture;
GLboolean EXT_texture;
GLboolean EXT_texture_object;
GLboolean EXT_texture3D; GLboolean EXT_texture3D;
GLboolean EXT_texture_array; GLboolean EXT_texture_array;
GLboolean EXT_texture_compression_latc; GLboolean EXT_texture_compression_latc;
@@ -2860,7 +2851,6 @@ struct gl_extensions
GLboolean EXT_texture_swizzle; GLboolean EXT_texture_swizzle;
GLboolean EXT_transform_feedback; GLboolean EXT_transform_feedback;
GLboolean EXT_timer_query; GLboolean EXT_timer_query;
GLboolean EXT_vertex_array;
GLboolean EXT_vertex_array_bgra; GLboolean EXT_vertex_array_bgra;
GLboolean EXT_vertex_array_set; GLboolean EXT_vertex_array_set;
GLboolean OES_standard_derivatives; GLboolean OES_standard_derivatives;
@@ -2896,8 +2886,6 @@ struct gl_extensions
GLboolean NV_vertex_program; GLboolean NV_vertex_program;
GLboolean NV_vertex_program1_1; GLboolean NV_vertex_program1_1;
GLboolean OES_read_format; GLboolean OES_read_format;
GLboolean SGIS_generate_mipmap;
GLboolean SGIS_texture_edge_clamp;
GLboolean SGIS_texture_lod; GLboolean SGIS_texture_lod;
GLboolean TDFX_texture_compression_FXT1; GLboolean TDFX_texture_compression_FXT1;
GLboolean S3_s3tc; GLboolean S3_s3tc;

22
src/mesa/main/version.c
View File

@@ -39,10 +39,8 @@ compute_version(struct gl_context *ctx)
GLuint major, minor; GLuint major, minor;
static const int max = 100; static const int max = 100;
const GLboolean ver_1_3 = (ctx->Extensions.ARB_multisample && const GLboolean ver_1_3 = (ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_texture_border_clamp && ctx->Extensions.ARB_texture_border_clamp &&
ctx->Extensions.ARB_texture_compression &&
ctx->Extensions.ARB_texture_cube_map && ctx->Extensions.ARB_texture_cube_map &&
ctx->Extensions.EXT_texture_env_add && ctx->Extensions.EXT_texture_env_add &&
ctx->Extensions.ARB_texture_env_combine && ctx->Extensions.ARB_texture_env_combine &&
@@ -58,15 +56,12 @@ compute_version(struct gl_context *ctx)
ctx->Extensions.EXT_blend_minmax && ctx->Extensions.EXT_blend_minmax &&
ctx->Extensions.EXT_blend_subtract && ctx->Extensions.EXT_blend_subtract &&
ctx->Extensions.EXT_fog_coord && ctx->Extensions.EXT_fog_coord &&
ctx->Extensions.EXT_multi_draw_arrays &&
ctx->Extensions.EXT_point_parameters && ctx->Extensions.EXT_point_parameters &&
ctx->Extensions.EXT_secondary_color && ctx->Extensions.EXT_secondary_color &&
ctx->Extensions.EXT_stencil_wrap && ctx->Extensions.EXT_stencil_wrap &&
ctx->Extensions.EXT_texture_lod_bias && ctx->Extensions.EXT_texture_lod_bias);
ctx->Extensions.SGIS_generate_mipmap);
const GLboolean ver_1_5 = (ver_1_4 && const GLboolean ver_1_5 = (ver_1_4 &&
ctx->Extensions.ARB_occlusion_query && ctx->Extensions.ARB_occlusion_query &&
ctx->Extensions.ARB_vertex_buffer_object &&
ctx->Extensions.EXT_shadow_funcs); ctx->Extensions.EXT_shadow_funcs);
const GLboolean ver_2_0 = (ver_1_5 && const GLboolean ver_2_0 = (ver_1_5 &&
ctx->Extensions.ARB_draw_buffers && ctx->Extensions.ARB_draw_buffers &&
@@ -201,17 +196,13 @@ compute_version_es1(struct gl_context *ctx)
static const int max = 100; static const int max = 100;
/* OpenGL ES 1.0 is derived from OpenGL 1.3 */ /* OpenGL ES 1.0 is derived from OpenGL 1.3 */
const GLboolean ver_1_0 = (ctx->Extensions.ARB_multisample && const GLboolean ver_1_0 = (ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_texture_compression &&
ctx->Extensions.EXT_texture_env_add && ctx->Extensions.EXT_texture_env_add &&
ctx->Extensions.ARB_texture_env_combine && ctx->Extensions.ARB_texture_env_combine &&
ctx->Extensions.ARB_texture_env_dot3); ctx->Extensions.ARB_texture_env_dot3);
/* OpenGL ES 1.1 is derived from OpenGL 1.5 */ /* OpenGL ES 1.1 is derived from OpenGL 1.5 */
const GLboolean ver_1_1 = (ver_1_0 && const GLboolean ver_1_1 = (ver_1_0 &&
ctx->Extensions.EXT_point_parameters && ctx->Extensions.EXT_point_parameters);
ctx->Extensions.SGIS_generate_mipmap &&
ctx->Extensions.ARB_vertex_buffer_object);
if (ver_1_1) { if (ver_1_1) {
ctx->VersionMajor = 1; ctx->VersionMajor = 1;
@@ -237,9 +228,7 @@ compute_version_es2(struct gl_context *ctx)
static const int max = 100; static const int max = 100;
/* OpenGL ES 2.0 is derived from OpenGL 2.0 */ /* OpenGL ES 2.0 is derived from OpenGL 2.0 */
const GLboolean ver_2_0 = (ctx->Extensions.ARB_multisample && const GLboolean ver_2_0 = (ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_multitexture &&
ctx->Extensions.ARB_texture_compression &&
ctx->Extensions.ARB_texture_cube_map && ctx->Extensions.ARB_texture_cube_map &&
ctx->Extensions.ARB_texture_mirrored_repeat && ctx->Extensions.ARB_texture_mirrored_repeat &&
ctx->Extensions.EXT_blend_color && ctx->Extensions.EXT_blend_color &&
@@ -247,7 +236,6 @@ compute_version_es2(struct gl_context *ctx)
ctx->Extensions.EXT_blend_minmax && ctx->Extensions.EXT_blend_minmax &&
ctx->Extensions.EXT_blend_subtract && ctx->Extensions.EXT_blend_subtract &&
ctx->Extensions.EXT_stencil_wrap && ctx->Extensions.EXT_stencil_wrap &&
ctx->Extensions.ARB_vertex_buffer_object &&
ctx->Extensions.ARB_shader_objects && ctx->Extensions.ARB_shader_objects &&
ctx->Extensions.ARB_vertex_shader && ctx->Extensions.ARB_vertex_shader &&
ctx->Extensions.ARB_fragment_shader && ctx->Extensions.ARB_fragment_shader &&

6
src/mesa/state_tracker/st_extensions.c
View File

@@ -252,16 +252,13 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.ARB_fragment_program = GL_TRUE; ctx->Extensions.ARB_fragment_program = GL_TRUE;
ctx->Extensions.ARB_half_float_pixel = GL_TRUE; ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
ctx->Extensions.ARB_map_buffer_range = GL_TRUE; ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
ctx->Extensions.ARB_multisample = GL_TRUE;
ctx->Extensions.ARB_sampler_objects = GL_TRUE; ctx->Extensions.ARB_sampler_objects = GL_TRUE;
ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */ ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; /* XXX temp */
ctx->Extensions.ARB_texture_compression = GL_TRUE;
ctx->Extensions.ARB_texture_cube_map = GL_TRUE; ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
ctx->Extensions.ARB_texture_env_combine = GL_TRUE; ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE; ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE; ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
ctx->Extensions.ARB_vertex_array_object = GL_TRUE; ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
ctx->Extensions.ARB_vertex_program = GL_TRUE; ctx->Extensions.ARB_vertex_program = GL_TRUE;
ctx->Extensions.ARB_window_pos = GL_TRUE; ctx->Extensions.ARB_window_pos = GL_TRUE;
@@ -274,7 +271,6 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE; ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
ctx->Extensions.EXT_fog_coord = GL_TRUE; ctx->Extensions.EXT_fog_coord = GL_TRUE;
ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE; ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;
ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE; ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
ctx->Extensions.EXT_point_parameters = GL_TRUE; ctx->Extensions.EXT_point_parameters = GL_TRUE;
ctx->Extensions.EXT_provoking_vertex = GL_TRUE; ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
@@ -311,8 +307,6 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.OES_draw_texture = GL_TRUE; ctx->Extensions.OES_draw_texture = GL_TRUE;
#endif #endif
ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
/* /*
* Extensions that depend on the driver/hardware: * Extensions that depend on the driver/hardware:
*/ */