Mesa (master): mesa: Rename MESA_shader_framebuffer_fetch gl_extensions bits to EXT.
Francisco Jerez
currojerez at kemper.freedesktop.org
Sun Feb 25 00:34:15 UTC 2018
Module: Mesa
Branch: master
Commit: 6a8ec78c2ab12d75f16e4a2f95e9be014dae021e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a8ec78c2ab12d75f16e4a2f95e9be014dae021e
Author: Francisco Jerez <currojerez at riseup.net>
Date: Mon Feb 12 14:31:32 2018 -0800
mesa: Rename MESA_shader_framebuffer_fetch gl_extensions bits to EXT.
The changes I had originally planned for the MESA_shader_framebuffer_fetch
extension have been merged into the EXT spec, there's no point in keeping
MESA_shader_framebuffer_fetch extension enables.
Reviewed-by: Plamena Manolova <plamena.manolova at intel.com>
---
src/mesa/drivers/dri/i965/brw_draw.c | 2 +-
src/mesa/drivers/dri/i965/brw_program.c | 2 +-
src/mesa/drivers/dri/i965/brw_wm.c | 4 ++--
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
src/mesa/drivers/dri/i965/intel_extensions.c | 4 ++--
src/mesa/main/barrier.c | 2 +-
src/mesa/main/extensions_table.h | 2 +-
src/mesa/main/get.c | 2 +-
src/mesa/main/get_hash_params.py | 7 +++----
src/mesa/main/mtypes.h | 4 ++--
10 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 50cf8b12c7..299e7f929e 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -513,7 +513,7 @@ brw_predraw_resolve_framebuffer(struct brw_context *brw,
}
/* Resolve color buffers for non-coherent framebuffer fetch. */
- if (!ctx->Extensions.MESA_shader_framebuffer_fetch &&
+ if (!ctx->Extensions.EXT_shader_framebuffer_fetch &&
ctx->FragmentProgram._Current &&
ctx->FragmentProgram._Current->info.outputs_read) {
const struct gl_framebuffer *fb = ctx->DrawBuffer;
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 684890e8ba..527f003977 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -318,7 +318,7 @@ brw_framebuffer_fetch_barrier(struct gl_context *ctx)
struct brw_context *brw = brw_context(ctx);
const struct gen_device_info *devinfo = &brw->screen->devinfo;
- if (!ctx->Extensions.MESA_shader_framebuffer_fetch) {
+ if (!ctx->Extensions.EXT_shader_framebuffer_fetch) {
if (devinfo->gen >= 6) {
brw_emit_pipe_control_flush(brw,
PIPE_CONTROL_RENDER_TARGET_FLUSH |
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index cfc2d47a67..68d4ab88d7 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -573,7 +573,7 @@ brw_wm_populate_key(struct brw_context *brw, struct brw_wm_prog_key *key)
key->program_string_id = fp->id;
/* Whether reads from the framebuffer should behave coherently. */
- key->coherent_fb_fetch = ctx->Extensions.MESA_shader_framebuffer_fetch;
+ key->coherent_fb_fetch = ctx->Extensions.EXT_shader_framebuffer_fetch;
}
void
@@ -645,7 +645,7 @@ brw_fs_precompile(struct gl_context *ctx, struct gl_program *prog)
key.program_string_id = bfp->id;
/* Whether reads from the framebuffer should behave coherently. */
- key.coherent_fb_fetch = ctx->Extensions.MESA_shader_framebuffer_fetch;
+ key.coherent_fb_fetch = ctx->Extensions.EXT_shader_framebuffer_fetch;
uint32_t old_prog_offset = brw->wm.base.prog_offset;
struct brw_stage_prog_data *old_prog_data = brw->wm.base.prog_data;
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 32d9e2c70f..23bf5a266c 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -1032,7 +1032,7 @@ update_renderbuffer_read_surfaces(struct brw_context *brw)
brw_wm_prog_data(brw->wm.base.prog_data);
if (wm_prog_data->has_render_target_reads &&
- !ctx->Extensions.MESA_shader_framebuffer_fetch) {
+ !ctx->Extensions.EXT_shader_framebuffer_fetch) {
/* _NEW_BUFFERS */
const struct gl_framebuffer *fb = ctx->DrawBuffer;
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 5a6b12e52a..127371c5b8 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -153,7 +153,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.MESA_shader_integer_functions = ctx->Const.GLSLVersion >= 130;
if (devinfo->is_g4x || devinfo->gen >= 5) {
- ctx->Extensions.MESA_shader_framebuffer_fetch_non_coherent = true;
+ ctx->Extensions.EXT_shader_framebuffer_fetch_non_coherent = true;
ctx->Extensions.KHR_blend_equation_advanced = true;
}
@@ -292,7 +292,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.KHR_texture_compression_astc_ldr = true;
ctx->Extensions.KHR_texture_compression_astc_sliced_3d = true;
ctx->Extensions.INTEL_conservative_rasterization = true;
- ctx->Extensions.MESA_shader_framebuffer_fetch = true;
+ ctx->Extensions.EXT_shader_framebuffer_fetch = true;
ctx->Extensions.ARB_post_depth_coverage = true;
}
diff --git a/src/mesa/main/barrier.c b/src/mesa/main/barrier.c
index 2c8194e6eb..0f0b0a210d 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 71c9a57569..6be16c4407 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 7c3b9dd22c..90ab7ca60f 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 5d2afedc43..f38a87df88 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 62b58cea99..2df2288899 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;
More information about the mesa-commit
mailing list