Mesa (master): util: fix missing swizzle components in the SINT <-> UINT conversion string
Roland Scheidegger
sroland at kemper.freedesktop.org
Wed Nov 23 00:56:15 UTC 2016
Module: Mesa
Branch: master
Commit: 5d2b5996e1e85e3b4c167570f1eecb5a131d5837
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d2b5996e1e85e3b4c167570f1eecb5a131d5837
Author: Charmaine Lee <charmainel at vmware.com>
Date: Tue Nov 22 13:33:37 2016 -0800
util: fix missing swizzle components in the SINT <-> UINT conversion string
Fixes tgsi error introduced in commit 3817a7a. The error complains missing
swizzle component in the conversion string "UMIN TEMP[0], TEMP[0], IMM[0].x".
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
---
src/gallium/auxiliary/util/u_simple_shaders.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index 8be31be..7342b3d 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -633,14 +633,14 @@ util_make_fs_blit_msaa_color(struct pipe_context *pipe,
if (dtype == TGSI_RETURN_TYPE_SINT) {
conversion_decl = "IMM[0] UINT32 {2147483647, 0, 0, 0}\n";
- conversion = "UMIN TEMP[0], TEMP[0], IMM[0].x\n";
+ conversion = "UMIN TEMP[0], TEMP[0], IMM[0].xxxx\n";
}
} else if (stype == TGSI_RETURN_TYPE_SINT) {
samp_type = "SINT";
if (dtype == TGSI_RETURN_TYPE_UINT) {
conversion_decl = "IMM[0] INT32 {0, 0, 0, 0}\n";
- conversion = "IMAX TEMP[0], TEMP[0], IMM[0].x\n";
+ conversion = "IMAX TEMP[0], TEMP[0], IMM[0].xxxx\n";
}
} else {
assert(dtype == TGSI_RETURN_TYPE_FLOAT);
More information about the mesa-commit
mailing list