Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
---
dEQP tests mostly pass... they reveal some pre-existing issues with packed
varyings and interpolateAt* - the interpolants become temporaries, which breaks
everything. However fixing this should be unrelated to enabling this extension.
docs/GL3.txt | 2 +-
src/compiler/glsl/builtin_functions.cpp | 12 +++++++-----
src/compiler/glsl/glcpp/glcpp-parse.y | 4 +++-
src/compiler/glsl/glsl_lexer.ll | 2 +-
src/compiler/glsl/glsl_parser_extras.cpp | 1 +
src/compiler/glsl/glsl_parser_extras.h | 2 ++
src/mesa/main/extensions_table.h | 1 +
src/mesa/main/get.c | 5 +++++
src/mesa/main/get_hash_params.py | 14 ++++++++------
9 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/docs/GL3.txt b/docs/GL3.txt
index e7d40de..437c296 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -251,7 +251,7 @@ GLES3.2, GLSL ES 3.2
GL_OES_sample_variables DONE (nvc0, r600,
radeonsi)
GL_OES_shader_image_atomic not started (based on
parts of GL_ARB_shader_image_load_store, which is done for some drivers)
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 not started (based on
GL_ARB_texture_buffer_object, GL_ARB_texture_buffer_range, and
GL_ARB_texture_buffer_object_rgb32 that are all done)
diff --git a/src/compiler/glsl/builtin_functions.cpp
b/src/compiler/glsl/builtin_functions.cpp
index d4dc271..60a7293 100644
--- a/src/compiler/glsl/builtin_functions.cpp
+++ b/src/compiler/glsl/builtin_functions.cpp
@@ -269,10 +269,12 @@ shader_packing_or_es31_or_gpu_shader5(const
_mesa_glsl_parse_state *state)
}
static bool
-fs_gpu_shader5(const _mesa_glsl_parse_state *state)
+fs_interpolate_at(const _mesa_glsl_parse_state *state)
{
return state->stage == MESA_SHADER_FRAGMENT &&
- (state->is_version(400, 0) || state->ARB_gpu_shader5_enable);
+ (state->is_version(400, 320) ||
+ state->ARB_gpu_shader5_enable ||
+ state->OES_shader_multisample_interpolation_enable);
}
@@ -5221,7 +5223,7 @@ builtin_builder::_interpolateAtCentroid(const glsl_type
*type)
{
ir_variable *interpolant = in_var(type, "interpolant");
interpolant->data.must_be_shader_input = 1;
- MAKE_SIG(type, fs_gpu_shader5, 1, interpolant);
+ MAKE_SIG(type, fs_interpolate_at, 1, interpolant);
body.emit(ret(interpolate_at_centroid(interpolant)));
@@ -5234,7 +5236,7 @@ builtin_builder::_interpolateAtOffset(const glsl_type
*type)
ir_variable *interpolant = in_var(type, "interpolant");
interpolant->data.must_be_shader_input = 1;
ir_variable *offset = in_var(glsl_type::vec2_type, "offset");
- MAKE_SIG(type, fs_gpu_shader5, 2, interpolant, offset);
+ MAKE_SIG(type, fs_interpolate_at, 2, interpolant, offset);
body.emit(ret(interpolate_at_offset(interpolant, offset)));
@@ -5247,7 +5249,7 @@ builtin_builder::_interpolateAtSample(const glsl_type
*type)
ir_variable *interpolant = in_var(type, "interpolant");
interpolant->data.must_be_shader_input = 1;
ir_variable *sample_num = in_var(glsl_type::int_type, "sample_num");
- MAKE_SIG(type, fs_gpu_shader5, 2, interpolant, sample_num);
+ MAKE_SIG(type, fs_interpolate_at, 2, interpolant, sample_num);
body.emit(ret(interpolate_at_sample(interpolant, sample_num)));
diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y
b/src/compiler/glsl/glcpp/glcpp-parse.y
index e4c003a..aeccfc2 100644
--- a/src/compiler/glsl/glcpp/glcpp-parse.y
+++ b/src/compiler/glsl/glcpp/glcpp-parse.y
@@ -2383,8 +2383,10 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t
*parser, intmax_t versio
if (extensions != NULL) {
if (extensions->OES_EGL_image_external)
add_builtin_define(parser, "GL_OES_EGL_image_external", 1);
- if (extensions->OES_sample_variables)
+ if (extensions->OES_sample_variables) {
add_builtin_define(parser, "GL_OES_sample_variables", 1);
+ add_builtin_define(parser,
"GL_OES_shader_multisample_interpolation", 1);
+ }
if (extensions->OES_standard_derivatives)
add_builtin_define(parser, "GL_OES_standard_derivatives", 1);
if (extensions->ARB_texture_multisample)
diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 1f12265..2256dbe 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -577,7 +577,7 @@ usamplerBuffer KEYWORD(140, 300, 140, 0,
USAMPLERBUFFER);
/* Additional reserved words in GLSL ES 3.00 */
resource KEYWORD(0, 300, 0, 0, RESOURCE);
-sample KEYWORD_WITH_ALT(400, 300, 400, 0,
yyextra->ARB_gpu_shader5_enable, SAMPLE);
+sample KEYWORD_WITH_ALT(400, 300, 400, 320,
yyextra->ARB_gpu_shader5_enable ||
yyextra->OES_shader_multisample_interpolation_enable, SAMPLE);
subroutine KEYWORD_WITH_ALT(400, 300, 400, 0,
yyextra->ARB_shader_subroutine_enable, SUBROUTINE);
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp
b/src/compiler/glsl/glsl_parser_extras.cpp
index 02af433..bcdf51a 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -613,6 +613,7 @@ static const _mesa_glsl_extension
_mesa_glsl_supported_extensions[] = {
EXT(OES_geometry_shader, false, true, OES_geometry_shader),
EXT(OES_gpu_shader5, false, true, ARB_gpu_shader5),
EXT(OES_sample_variables, false, true, OES_sample_variables),
+ EXT(OES_shader_multisample_interpolation, false, true,
OES_sample_variables),
EXT(OES_standard_derivatives, false, true,
OES_standard_derivatives),
EXT(OES_texture_3D, false, true, dummy_true),
EXT(OES_texture_storage_multisample_2d_array, false, true,
ARB_texture_multisample),
diff --git a/src/compiler/glsl/glsl_parser_extras.h
b/src/compiler/glsl/glsl_parser_extras.h
index 5d76cb7..28e9b20 100644
--- a/src/compiler/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
@@ -604,6 +604,8 @@ struct _mesa_glsl_parse_state {
bool OES_gpu_shader5_warn;
bool OES_sample_variables_enable;
bool OES_sample_variables_warn;
+ bool OES_shader_multisample_interpolation_enable;
+ bool OES_shader_multisample_interpolation_warn;
bool OES_standard_derivatives_enable;
bool OES_standard_derivatives_warn;
bool OES_texture_3D_enable;
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 7368983..e4ca2b6 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -335,6 +335,7 @@ EXT(OES_read_format , dummy_true
EXT(OES_rgb8_rgba8 , dummy_true
, x , x , ES1, ES2, 2005)
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_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)
EXT(OES_stencil1 , dummy_false
, x , x , x , x , 2005)
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index f40c570..1cbd692 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -401,6 +401,11 @@ static const int
extra_ARB_gpu_shader5_or_oes_geometry_shader[] = {
EXTRA_END
};
+static const int extra_ARB_gpu_shader5_or_OES_sample_variables[] = {
+ EXT(ARB_gpu_shader5),
+ EXT(OES_sample_variables),
+};
+
EXTRA_EXT(ARB_texture_cube_map);
EXTRA_EXT(EXT_texture_array);
EXTRA_EXT(NV_fog_distance);
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 07d2d20..0142285 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -498,6 +498,14 @@ descriptor=[
[ "SHADER_STORAGE_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0,
extra_ARB_shader_storage_buffer_object_es31" ],
]},
+# Enums in OpenGL Core profile and ES 3.0
+{ "apis": ["GL_CORE", "GLES3"], "params": [
+ # GL_ARB_gpu_shader5 / GL_OES_shader_multisample_interpolation
+ [ "MIN_FRAGMENT_INTERPOLATION_OFFSET",
"CONTEXT_FLOAT(Const.MinFragmentInterpolationOffset),
extra_ARB_gpu_shader5_or_OES_sample_variables" ],
+ [ "MAX_FRAGMENT_INTERPOLATION_OFFSET",
"CONTEXT_FLOAT(Const.MaxFragmentInterpolationOffset),
extra_ARB_gpu_shader5_or_OES_sample_variables" ],
+ [ "FRAGMENT_INTERPOLATION_OFFSET_BITS",
"CONST(FRAGMENT_INTERPOLATION_OFFSET_BITS),
extra_ARB_gpu_shader5_or_OES_sample_variables" ],
+]},
+
# Enums in OpenGL Core profile and ES 3.1
{ "apis": ["GL_CORE", "GLES31"], "params": [
# GL_ARB_draw_indirect / GLES 3.1
@@ -875,12 +883,6 @@ descriptor=[
[ "VIEWPORT_BOUNDS_RANGE", "CONTEXT_FLOAT2(Const.ViewportBounds),
extra_ARB_viewport_array" ],
[ "VIEWPORT_INDEX_PROVOKING_VERTEX",
"CONTEXT_ENUM(Const.LayerAndVPIndexProvokingVertex), extra_ARB_viewport_array"
],
-# GL_ARB_gpu_shader5
- [ "MAX_GEOMETRY_SHADER_INVOCATIONS",
"CONST(MAX_GEOMETRY_SHADER_INVOCATIONS), extra_ARB_gpu_shader5" ],
- [ "MIN_FRAGMENT_INTERPOLATION_OFFSET",
"CONTEXT_FLOAT(Const.MinFragmentInterpolationOffset), extra_ARB_gpu_shader5" ],
- [ "MAX_FRAGMENT_INTERPOLATION_OFFSET",
"CONTEXT_FLOAT(Const.MaxFragmentInterpolationOffset), extra_ARB_gpu_shader5" ],
- [ "FRAGMENT_INTERPOLATION_OFFSET_BITS",
"CONST(FRAGMENT_INTERPOLATION_OFFSET_BITS), extra_ARB_gpu_shader5" ],
-
# GL_ARB_tessellation_shader
[ "PATCH_VERTICES", "CONTEXT_INT(TessCtrlProgram.patch_vertices),
extra_ARB_tessellation_shader" ],
[ "PATCH_DEFAULT_OUTER_LEVEL",
"CONTEXT_FLOAT4(TessCtrlProgram.patch_default_outer_level),
extra_ARB_tessellation_shader" ],
--
2.4.10
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
