diff options
| author | Nicolai Hähnle <[email protected]> | 2017-07-27 14:06:59 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-08-03 00:19:07 +0100 |
| commit | 4e4f8479a8e3eee3b036576ef11dcece969d3c20 (patch) | |
| tree | 26e618db8fd377651f52bbc921622c186e874b45 | |
| parent | 4cb6acb62367de3291e75b706a8f57538037fbf2 (diff) | |
gallium/radeon: fix ARB_query_buffer_object conversion to boolean
The issue here is that the immediate is treated as a 64-bit value,
and fetching it does not work reliably with swizzles that are different
from xy and zw.
Cc: [email protected]
Reviewed-by: Marek Olšák <[email protected]>
(cherry picked from commit da83687c4ba7e9022f6f14176393a9e3c6391ed5)
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 0980eca7884..7764871aaa5 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -1283,6 +1283,7 @@ static void r600_create_query_result_shader(struct r600_common_context *rctx) "IMM[1] UINT32 {1, 2, 4, 8}\n" "IMM[2] UINT32 {16, 32, 64, 128}\n" "IMM[3] UINT32 {1000000, 0, %u, 0}\n" /* for timestamp conversion */ + "IMM[4] UINT32 {0, 0, 0, 0}\n" "AND TEMP[5], CONST[0].wwww, IMM[2].xxxx\n" "UIF TEMP[5]\n" @@ -1382,7 +1383,7 @@ static void r600_create_query_result_shader(struct r600_common_context *rctx) /* Convert to boolean */ "AND TEMP[4], CONST[0].wwww, IMM[1].wwww\n" "UIF TEMP[4]\n" - "U64SNE TEMP[0].x, TEMP[0].xyxy, IMM[0].xxxx\n" + "U64SNE TEMP[0].x, TEMP[0].xyxy, IMM[4].zwzw\n" "AND TEMP[0].x, TEMP[0].xxxx, IMM[1].xxxx\n" "MOV TEMP[0].y, IMM[0].xxxx\n" "ENDIF\n" |