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

mesa: GL_ARB_shading_language_100 is not optional

Browse Source 
This extension just provides some of the most basic software framework
for GLSL.  Without GL_ARB_vertex_shader or GL_ARB_fragment_shader,
applications still cannot use GLSL.  There's no value in
conditionalizing support for this extension.

NOTE: This has the side effect of enabling the extension in the radeon,
r200, and nouveau drivers.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Ian Romanick
2013-06-27 18:20:31 -07:00
committed by Kenneth Graunke
parent e6ec425d6e
commit 70966570f3
5 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/i915/intel_extensions.c
View File

@@ -51,7 +51,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_internalformat_query = true; ctx->Extensions.ARB_internalformat_query = true;
ctx->Extensions.ARB_map_buffer_range = true; ctx->Extensions.ARB_map_buffer_range = true;
ctx->Extensions.ARB_point_sprite = true; ctx->Extensions.ARB_point_sprite = true;
ctx->Extensions.ARB_shading_language_100 = true;
ctx->Extensions.ARB_sync = true; ctx->Extensions.ARB_sync = true;
ctx->Extensions.ARB_texture_border_clamp = true; ctx->Extensions.ARB_texture_border_clamp = true;
ctx->Extensions.ARB_texture_cube_map = true; ctx->Extensions.ARB_texture_cube_map = true;

1
src/mesa/drivers/dri/i965/intel_extensions.c
View File

@@ -67,7 +67,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_seamless_cube_map = true; ctx->Extensions.ARB_seamless_cube_map = true;
ctx->Extensions.ARB_shader_bit_encoding = true; ctx->Extensions.ARB_shader_bit_encoding = true;
ctx->Extensions.ARB_shader_texture_lod = true; ctx->Extensions.ARB_shader_texture_lod = true;
ctx->Extensions.ARB_shading_language_100 = true;
ctx->Extensions.ARB_shadow = true; ctx->Extensions.ARB_shadow = true;
ctx->Extensions.ARB_sync = true; ctx->Extensions.ARB_sync = true;
ctx->Extensions.ARB_texture_border_clamp = true; ctx->Extensions.ARB_texture_border_clamp = true;

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

@@ -124,7 +124,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_shader_objects", o(dummy_true), GL, 2002 }, { "GL_ARB_shader_objects", o(dummy_true), GL, 2002 },
{ "GL_ARB_shader_stencil_export", o(ARB_shader_stencil_export), GL, 2009 }, { "GL_ARB_shader_stencil_export", o(ARB_shader_stencil_export), GL, 2009 },
{ "GL_ARB_shader_texture_lod", o(ARB_shader_texture_lod), GL, 2009 }, { "GL_ARB_shader_texture_lod", o(ARB_shader_texture_lod), GL, 2009 },
{ "GL_ARB_shading_language_100", o(ARB_shading_language_100), GLL, 2003 }, { "GL_ARB_shading_language_100", o(dummy_true), GLL, 2003 },
{ "GL_ARB_shading_language_packing", o(ARB_shading_language_packing), GL, 2011 }, { "GL_ARB_shading_language_packing", o(ARB_shading_language_packing), GL, 2011 },
{ "GL_ARB_shading_language_420pack", o(ARB_shading_language_420pack), GL, 2011 }, { "GL_ARB_shading_language_420pack", o(ARB_shading_language_420pack), GL, 2011 },
{ "GL_ARB_shadow", o(ARB_shadow), GLL, 2001 }, { "GL_ARB_shadow", o(ARB_shadow), GLL, 2001 },
@@ -391,7 +391,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_occlusion_query2 = GL_TRUE; ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
ctx->Extensions.ARB_point_sprite = GL_TRUE; ctx->Extensions.ARB_point_sprite = GL_TRUE;
ctx->Extensions.EXT_separate_shader_objects = GL_TRUE; ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;
ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
ctx->Extensions.ARB_shadow = GL_TRUE; ctx->Extensions.ARB_shadow = GL_TRUE;
ctx->Extensions.ARB_texture_border_clamp = GL_TRUE; ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
ctx->Extensions.ARB_texture_cube_map = GL_TRUE; ctx->Extensions.ARB_texture_cube_map = GL_TRUE;

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

@@ -3016,7 +3016,6 @@ struct gl_extensions
GLboolean ARB_shader_bit_encoding; GLboolean ARB_shader_bit_encoding;
GLboolean ARB_shader_stencil_export; GLboolean ARB_shader_stencil_export;
GLboolean ARB_shader_texture_lod; GLboolean ARB_shader_texture_lod;
GLboolean ARB_shading_language_100;
GLboolean ARB_shading_language_packing; GLboolean ARB_shading_language_packing;
GLboolean ARB_shading_language_420pack; GLboolean ARB_shading_language_420pack;
GLboolean ARB_shadow; GLboolean ARB_shadow;

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

@@ -537,7 +537,6 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.ARB_half_float_vertex = GL_TRUE; ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
ctx->Extensions.ARB_internalformat_query = GL_TRUE; ctx->Extensions.ARB_internalformat_query = GL_TRUE;
ctx->Extensions.ARB_map_buffer_range = GL_TRUE; ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
ctx->Extensions.ARB_shading_language_100 = 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_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;