diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/barrier.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/extensions_table.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 7 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/src/mesa/main/barrier.c b/src/mesa/main/barrier.c index 2c8194e6eba..0f0b0a210d1 100644 --- a/src/mesa/main/barrier.c +++ b/src/mesa/main/barrier.c @@ -127,7 +127,7 @@ _mesa_BlendBarrier(void) { GET_CURRENT_CONTEXT(ctx); - if (!ctx->Extensions.MESA_shader_framebuffer_fetch_non_coherent && + if (!ctx->Extensions.EXT_shader_framebuffer_fetch_non_coherent && !ctx->Extensions.KHR_blend_equation_advanced) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBlendBarrier(not supported)"); diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 71c9a575694..6be16c4407f 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -252,7 +252,7 @@ EXT(EXT_semaphore , EXT_semaphore EXT(EXT_semaphore_fd , EXT_semaphore_fd , GLL, GLC, x , ES2, 2017) EXT(EXT_separate_shader_objects , dummy_true , x , x , x , ES2, 2013) 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_framebuffer_fetch , EXT_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 , dummy_true , x , x , x , 31, 2014) EXT(EXT_shader_samples_identical , EXT_shader_samples_identical , GLL, GLC, x , 31, 2015) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 7c3b9dd22cb..90ab7ca60f8 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -575,7 +575,7 @@ static const int extra_core_ARB_color_buffer_float_and_new_buffers[] = { static const int extra_EXT_shader_framebuffer_fetch[] = { EXTRA_API_ES2, EXTRA_API_ES3, - EXT(MESA_shader_framebuffer_fetch), + EXT(EXT_shader_framebuffer_fetch), EXTRA_END }; diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 5d2afedc437..f38a87df88b 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -441,10 +441,9 @@ descriptor=[ ]}, { "apis": ["GLES", "GLES2"], "params": [ -# GL_EXT_shader_framebuffer_fetch. Should be true if the MESA framebuffer -# fetch extension is supported since the latter imposes no restrictions on -# non-uniform per-sample discard. - [ "FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT", "CONTEXT_BOOL(Extensions.MESA_shader_framebuffer_fetch), extra_EXT_shader_framebuffer_fetch" ], +# GL_EXT_shader_framebuffer_fetch. Should be true for most modern hardware +# supporting sample shading. + [ "FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT", "CONTEXT_BOOL(Extensions.EXT_shader_framebuffer_fetch), extra_EXT_shader_framebuffer_fetch" ], # GL_OES_EGL_image_external [ "TEXTURE_BINDING_EXTERNAL_OES", "LOC_CUSTOM, TYPE_INT, TEXTURE_EXTERNAL_INDEX, extra_OES_EGL_image_external" ], [ "TEXTURE_EXTERNAL_OES", "LOC_CUSTOM, TYPE_BOOLEAN, 0, extra_OES_EGL_image_external" ], diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 62b58cea991..2df2288899d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4351,8 +4351,8 @@ struct gl_extensions GLboolean KHR_texture_compression_astc_sliced_3d; GLboolean MESA_tile_raster_order; GLboolean MESA_pack_invert; - GLboolean MESA_shader_framebuffer_fetch; - GLboolean MESA_shader_framebuffer_fetch_non_coherent; + GLboolean EXT_shader_framebuffer_fetch; + GLboolean EXT_shader_framebuffer_fetch_non_coherent; GLboolean MESA_shader_integer_functions; GLboolean MESA_ycbcr_texture; GLboolean NV_conditional_render; |