summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2015-06-18 17:48:27 -0700
committerJason Ekstrand <[email protected]>2015-06-30 15:58:16 -0700
commit12bc22ef58377191508af91a918efd18e2da7500 (patch)
tree37fc3c0f32f6ea2906518f6c24b3ef976c5e3264
parentaca5228011e7b9e96f3bd3a621c88e63ba47a4f3 (diff)
i965/fs: Report the right value in fs_inst::regs_read() for PIXEL_X/Y
Reviewed-by: Iago Toral Quiroga <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]> Acked-by: Francisco Jerez <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index e83a0923e80..d91ad0a0650 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -701,6 +701,7 @@ fs_inst::is_partial_write() const
int
fs_inst::regs_read(int arg) const
{
+ unsigned components = 1;
switch (opcode) {
case FS_OPCODE_FB_WRITE:
case SHADER_OPCODE_URB_WRITE_SIMD8:
@@ -726,6 +727,12 @@ fs_inst::regs_read(int arg) const
return exec_size / 4;
break;
+ case FS_OPCODE_PIXEL_X:
+ case FS_OPCODE_PIXEL_Y:
+ if (arg == 0)
+ components = 1;
+ break;
+
default:
if (is_tex() && arg == 0 && src[0].file == GRF)
return mlen;
@@ -742,8 +749,8 @@ fs_inst::regs_read(int arg) const
if (src[arg].stride == 0) {
return 1;
} else {
- int size = src[arg].width * src[arg].stride * type_sz(src[arg].type);
- return (size + 31) / 32;
+ int size = components * src[arg].width * type_sz(src[arg].type);
+ return DIV_ROUND_UP(size * src[arg].stride, 32);
}
case MRF:
unreachable("MRF registers are not allowed as sources");