Module: Mesa
Branch: master
Commit: 2c7f5fe2960362b266aeb8e1ed0ebea762131df5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c7f5fe2960362b266aeb8e1ed0ebea762131df5
Author: Ilia Mirkin <imir...@alum.mit.edu>
Date: Tue Feb 16 01:27:27 2016 -0500
st/mesa: add ES sample-shading support
We require the full ARB_gpu_shader5 for now, but in the future some
other CAP could get exposed to indicate that only the multisample-related
behavior of ARB_gpu_shader5 is available.
Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
Reviewed-by: Dave Airlie <airl...@redhat.com>
---
docs/GL3.txt | 6 +++---
src/mesa/state_tracker/st_extensions.c | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/docs/GL3.txt b/docs/GL3.txt
index f6248da..489b821 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -262,11 +262,11 @@ GLES3.2, GLSL ES 3.2
GL_OES_geometry_shader started (Marta)
GL_OES_gpu_shader5 DONE (all drivers that
support GL_ARB_gpu_shader5)
GL_OES_primitive_bounding box not started
- GL_OES_sample_shading not started (based on
parts of GL_ARB_sample_shading, which is done for some drivers)
- GL_OES_sample_variables not started (based on
parts of GL_ARB_sample_shading, which is done for some drivers)
+ GL_OES_sample_shading DONE (nvc0, r600,
radeonsi)
+ GL_OES_sample_variables DONE (nvc0, r600,
radeonsi)
GL_OES_shader_image_atomic DONE (all drivers that
support GL_ARB_shader_image_load_store)
GL_OES_shader_io_blocks not started (based on
parts of GLSL 1.50, which is done)
- GL_OES_shader_multisample_interpolation not started (based on
parts of GL_ARB_gpu_shader5, which is done)
+ GL_OES_shader_multisample_interpolation DONE (nvc0, r600,
radeonsi)
GL_OES_tessellation_shader not started (based on
GL_ARB_tessellation_shader, which is done for some drivers)
GL_OES_texture_border_clamp DONE (all drivers)
GL_OES_texture_buffer DONE (core only)
diff --git a/src/mesa/state_tracker/st_extensions.c
b/src/mesa/state_tracker/st_extensions.c
index 36a1201..0a25770 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -921,6 +921,12 @@ void st_init_extensions(struct pipe_screen *screen,
extensions->ARB_sync = GL_TRUE;
}
+ /* Needs PIPE_CAP_SAMPLE_SHADING + all the sample-related bits of
+ * ARB_gpu_shader5. This enables all the per-sample shading ES extensions.
+ */
+ extensions->OES_sample_variables = extensions->ARB_sample_shading &&
+ extensions->ARB_gpu_shader5;
+
/* Maximum sample count. */
{
enum pipe_format color_formats[] = {
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
