From 8fcf8e7fd401346ff32f0179ab96ee6b7739e0bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 1 Jul 2020 13:11:33 -0400 Subject: [PATCH] glsl: lower builtins to mediump that ignore precision of certain parameters Reviewed-by: Alyssa Rosenzweig Part-of: --- src/compiler/glsl/lower_precision.cpp | 18 +++++ .../glsl/tests/lower_precision_test.py | 79 +++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/src/compiler/glsl/lower_precision.cpp b/src/compiler/glsl/lower_precision.cpp index e9975322e84..f1ac00b2aaf 100644 --- a/src/compiler/glsl/lower_precision.cpp +++ b/src/compiler/glsl/lower_precision.cpp @@ -499,10 +499,28 @@ is_lowerable_builtin(ir_call *ir, assert(ir->callee->return_precision == GLSL_PRECISION_NONE); + /* Number of parameters to check if they are lowerable. */ + unsigned check_parameters = ir->actual_parameters.length(); + + /* Interpolation functions only consider the precision of the interpolant. */ + /* Bitfield functions ignore the precision of "offset" and "bits". */ + if (!strcmp(ir->callee_name(), "interpolateAtOffset") || + !strcmp(ir->callee_name(), "interpolateAtSample") || + !strcmp(ir->callee_name(), "bitfieldExtract")) { + check_parameters = 1; + } else if (!strcmp(ir->callee_name(), "bitfieldInsert")) { + check_parameters = 2; + } + foreach_in_list(ir_rvalue, param, &ir->actual_parameters) { + if (!check_parameters) + break; + if (!param->as_constant() && _mesa_set_search(lowerable_rvalues, param) == NULL) return false; + + --check_parameters; } return true; diff --git a/src/compiler/glsl/tests/lower_precision_test.py b/src/compiler/glsl/tests/lower_precision_test.py index 3fa74050ed8..2fc8f1922e7 100644 --- a/src/compiler/glsl/tests/lower_precision_test.py +++ b/src/compiler/glsl/tests/lower_precision_test.py @@ -1459,6 +1459,85 @@ TESTS = [ } """, r'expression uint packSnorm4x8 \(expression vec4'), + Test("interpolateAtCentroid", + """ + #version 320 es + precision mediump float; + precision mediump int; + + in float val; + out float color; + + void main() + { + color = interpolateAtCentroid(val) + 1.0; + } + """, + r'expression float16_t interpolate_at_centroid \(expression float16_t'), + Test("interpolateAtOffset", + """ + #version 320 es + precision mediump float; + precision mediump int; + + uniform highp vec2 offset; + in float val; + out float color; + + void main() + { + color = interpolateAtOffset(val, offset) + 1.0; + } + """, + r'expression float16_t interpolate_at_offset \(expression float16_t'), + Test("interpolateAtSample", + """ + #version 320 es + precision mediump float; + precision mediump int; + + uniform highp int sample_index; + in float val; + out float color; + + void main() + { + color = interpolateAtSample(val, sample_index) + 1.0; + } + """, + r'expression float16_t interpolate_at_sample \(expression float16_t'), + Test("bitfieldExtract", + """ + #version 310 es + precision mediump float; + precision mediump int; + + uniform highp int offset, bits; + uniform int val; + out int color; + + void main() + { + color = bitfieldExtract(val, offset, bits) + 1; + } + """, + r'expression int16_t bitfield_extract \(expression int16_t'), + Test("bitfieldInsert", + """ + #version 310 es + precision mediump float; + precision mediump int; + + uniform highp int offset, bits; + uniform int val, val2; + out int color; + + void main() + { + color = bitfieldInsert(val, val2, offset, bits) + 1; + } + """, + r'expression int16_t bitfield_insert \(expression int16_t'), ] -- 2.30.2