Mesa (master): pan/midgard: Use a signed value for checking inline constants

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jun 5 23:41:53 UTC 2020


Module: Mesa
Branch: master
Commit: d97aaad1555ad25fd13af588aa02f9ff3e081e34
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d97aaad1555ad25fd13af588aa02f9ff3e081e34

Author: Icecream95 <ixn at keemail.me>
Date:   Fri Jun  5 20:17:27 2020 +1200

pan/midgard: Use a signed value for checking inline constants

Inline constants are sign extended, so we should use a int16_t instead
of an unsigned type.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5351>

---

 .gitlab-ci/deqp-panfrost-t860-fails.txt | 8 --------
 src/panfrost/midgard/midgard_compile.c  | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.gitlab-ci/deqp-panfrost-t860-fails.txt b/.gitlab-ci/deqp-panfrost-t860-fails.txt
index 567c275a33b..6e48aa2885e 100644
--- a/.gitlab-ci/deqp-panfrost-t860-fails.txt
+++ b/.gitlab-ci/deqp-panfrost-t860-fails.txt
@@ -335,14 +335,6 @@ dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines_wide
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.points
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.triangles
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_highp_fragment
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_highp_vertex
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_lowp_fragment
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_lowp_vertex
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_mediump_fragment
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packsnorm2x16_mediump_vertex
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.unpackunorm2x16_fragment
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.unpackunorm2x16_vertex
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_highp
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 4cce9102c68..3ccff63c5b4 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -2221,7 +2221,7 @@ embedded_to_inline_constant(compiler_context *ctx, midgard_block *block)
                         unsigned component = ins->swizzle[1][first_comp];
 
                         /* Scale constant appropriately, if we can legally */
-                        uint16_t scaled_constant = 0;
+                        int16_t scaled_constant = 0;
 
                         if (is_16) {
                                 scaled_constant = ins->constants.u16[component];



More information about the mesa-commit mailing list