NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mesa: remove OES_shader_io_blocks enable

Browse source 
This extension should just be available whenever ES 3.1 is available.
With the new extension verification infrastructure, it will only be
enable-able on a #version 310 es shader, rendering the original reason
for having a separate enable moot.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ilia Mirkin 2016-08-27 17:18:55 -04:00
parent 89e95d15f9
commit 4ec1c2bb7f
4 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -399,7 +399,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_gpu_shader_fp64 = true;
ctx->Extensions.ARB_vertex_attrib_64bit = true;
ctx->Extensions.OES_geometry_shader = true;
ctx->Extensions.OES_shader_io_blocks = true;
ctx->Extensions.OES_texture_cube_map_array = true;
}

4
src/mesa/main/extensions_table.h
View file

@ -231,7 +231,7 @@ EXT(EXT_separate_shader_objects , dummy_true
EXT(EXT_separate_specular_color , dummy_true , GLL, x , x , x , 1997)
EXT(EXT_shader_framebuffer_fetch , MESA_shader_framebuffer_fetch , x , x , x , ES2, 2013)
EXT(EXT_shader_integer_mix , EXT_shader_integer_mix , GLL, GLC, x , 30, 2013)
EXT(EXT_shader_io_blocks , OES_shader_io_blocks , x , x , x , 31, 2014)
EXT(EXT_shader_io_blocks , dummy_true , x , x , x , 31, 2014)
EXT(EXT_shader_samples_identical , EXT_shader_samples_identical , GLL, GLC, x , 31, 2015)
EXT(EXT_shadow_funcs , ARB_shadow , GLL, x , x , x , 2002)
EXT(EXT_stencil_two_side , EXT_stencil_two_side , GLL, x , x , x , 2001)
@ -357,7 +357,7 @@ EXT(OES_rgb8_rgba8 , dummy_true
EXT(OES_sample_shading , OES_sample_variables , x , x , x , 30, 2014)
EXT(OES_sample_variables , OES_sample_variables , x , x , x , 30, 2014)
EXT(OES_shader_image_atomic , ARB_shader_image_load_store , x , x , x , 31, 2015)
EXT(OES_shader_io_blocks , OES_shader_io_blocks , x , x , x , 31, 2014)
EXT(OES_shader_io_blocks , dummy_true , x , x , x , 31, 2014)
EXT(OES_shader_multisample_interpolation , OES_sample_variables , x , x , x , 30, 2014)
EXT(OES_single_precision , dummy_true , x , x , ES1, x , 2003)
EXT(OES_standard_derivatives , OES_standard_derivatives , x , x , x , ES2, 2005)

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

@ -3941,7 +3941,6 @@ struct gl_extensions
GLboolean EXT_window_rectangles;
GLboolean OES_copy_image;
GLboolean OES_sample_variables;
GLboolean OES_shader_io_blocks;
GLboolean OES_standard_derivatives;
GLboolean OES_texture_buffer;
GLboolean OES_texture_cube_map_array;

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

@ -1210,10 +1210,4 @@ void st_init_extensions(struct pipe_screen *screen,
extensions->ARB_texture_multisample &&
extensions->ARB_gpu_shader5 &&
extensions->EXT_shader_integer_mix;
/* And if we have enough for ES 3.1, we can also expose
* OES_shader_io_blocks, which is only hidden due to the compiler not being
* able to version-restrict things.
*/
extensions->OES_shader_io_blocks = extensions->ARB_ES3_1_compatibility;
}