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

mesa: remove ARB_copy_buffer extension enable flag

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Marek Olšák
2012-10-28 14:24:53 +01:00
parent c9f2af3df7
commit 3bba7c5ab4
6 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_base_instance", o(ARB_base_instance), GL, 2011 }, { "GL_ARB_base_instance", o(ARB_base_instance), GL, 2011 },
{ "GL_ARB_blend_func_extended", o(ARB_blend_func_extended), GL, 2009 }, { "GL_ARB_blend_func_extended", o(ARB_blend_func_extended), GL, 2009 },
{ "GL_ARB_color_buffer_float", o(ARB_color_buffer_float), GL, 2004 }, { "GL_ARB_color_buffer_float", o(ARB_color_buffer_float), GL, 2004 },
{ "GL_ARB_copy_buffer", o(ARB_copy_buffer), GL, 2008 }, { "GL_ARB_copy_buffer", o(dummy_true), GL, 2008 },
{ "GL_ARB_conservative_depth", o(ARB_conservative_depth), GL, 2011 }, { "GL_ARB_conservative_depth", o(ARB_conservative_depth), GL, 2011 },
{ "GL_ARB_debug_output", o(dummy_true), GL, 2009 }, { "GL_ARB_debug_output", o(dummy_true), GL, 2009 },
{ "GL_ARB_depth_buffer_float", o(ARB_depth_buffer_float), GL, 2008 }, { "GL_ARB_depth_buffer_float", o(ARB_depth_buffer_float), GL, 2008 },
@@ -357,7 +357,6 @@ name_to_offset(const char* name)
* XXX: Should these defaults also apply to GLES? * XXX: Should these defaults also apply to GLES?
*/ */
static const size_t default_extensions[] = { static const size_t default_extensions[] = {
o(ARB_copy_buffer),
o(ARB_transpose_matrix), o(ARB_transpose_matrix),
o(ARB_window_pos), o(ARB_window_pos),
@@ -389,7 +388,6 @@ static const size_t default_extensions[] = {
void void
_mesa_enable_sw_extensions(struct gl_context *ctx) _mesa_enable_sw_extensions(struct gl_context *ctx)
{ {
/*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/
ctx->Extensions.ARB_depth_clamp = GL_TRUE; ctx->Extensions.ARB_depth_clamp = GL_TRUE;
ctx->Extensions.ARB_depth_texture = GL_TRUE; ctx->Extensions.ARB_depth_texture = GL_TRUE;
ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE; ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;

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

@@ -331,7 +331,6 @@ EXTRA_EXT2(NV_point_sprite, ARB_point_sprite);
EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program); EXTRA_EXT2(ARB_vertex_program, ARB_fragment_program);
EXTRA_EXT(ARB_geometry_shader4); EXTRA_EXT(ARB_geometry_shader4);
EXTRA_EXT(ARB_color_buffer_float); EXTRA_EXT(ARB_color_buffer_float);
EXTRA_EXT(ARB_copy_buffer);
EXTRA_EXT(EXT_framebuffer_sRGB); EXTRA_EXT(EXT_framebuffer_sRGB);
EXTRA_EXT(ARB_texture_buffer_object); EXTRA_EXT(ARB_texture_buffer_object);
EXTRA_EXT(OES_EGL_image_external); EXTRA_EXT(OES_EGL_image_external);

4
src/mesa/main/get_hash_params.py
View File

@@ -99,8 +99,8 @@ descriptor=[
[ "CLAMP_READ_COLOR", "CONTEXT_ENUM(Color.ClampReadColor), extra_ARB_color_buffer_float" ], [ "CLAMP_READ_COLOR", "CONTEXT_ENUM(Color.ClampReadColor), extra_ARB_color_buffer_float" ],
# GL_ARB_copy_buffer # GL_ARB_copy_buffer
[ "COPY_READ_BUFFER", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_copy_buffer" ], [ "COPY_READ_BUFFER", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
[ "COPY_WRITE_BUFFER", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_copy_buffer" ], [ "COPY_WRITE_BUFFER", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
# GL_OES_read_format # GL_OES_read_format
[ "IMPLEMENTATION_COLOR_READ_TYPE_OES", "LOC_CUSTOM, TYPE_INT, 0, extra_new_buffers" ], [ "IMPLEMENTATION_COLOR_READ_TYPE_OES", "LOC_CUSTOM, TYPE_INT, 0, extra_new_buffers" ],

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

@@ -2940,7 +2940,6 @@ struct gl_extensions
GLboolean ARB_blend_func_extended; GLboolean ARB_blend_func_extended;
GLboolean ARB_color_buffer_float; GLboolean ARB_color_buffer_float;
GLboolean ARB_conservative_depth; GLboolean ARB_conservative_depth;
GLboolean ARB_copy_buffer;
GLboolean ARB_depth_buffer_float; GLboolean ARB_depth_buffer_float;
GLboolean ARB_depth_clamp; GLboolean ARB_depth_clamp;
GLboolean ARB_depth_texture; GLboolean ARB_depth_texture;

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

@@ -213,7 +213,6 @@ compute_version(struct gl_context *ctx)
ctx->Extensions.NV_conditional_render); ctx->Extensions.NV_conditional_render);
const GLboolean ver_3_1 = (ver_3_0 && const GLboolean ver_3_1 = (ver_3_0 &&
ctx->Const.GLSLVersion >= 140 && ctx->Const.GLSLVersion >= 140 &&
ctx->Extensions.ARB_copy_buffer &&
ctx->Extensions.ARB_draw_instanced && ctx->Extensions.ARB_draw_instanced &&
ctx->Extensions.ARB_texture_buffer_object && ctx->Extensions.ARB_texture_buffer_object &&
ctx->Extensions.ARB_uniform_buffer_object && ctx->Extensions.ARB_uniform_buffer_object &&

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

@@ -479,7 +479,6 @@ void st_init_extensions(struct st_context *st)
* Extensions that are supported by all Gallium drivers: * Extensions that are supported by all Gallium drivers:
*/ */
ctx->Extensions.ARB_ES2_compatibility = GL_TRUE; ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;
ctx->Extensions.ARB_copy_buffer = GL_TRUE;
ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE; ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE; ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;
ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE; ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;