Module: Mesa
Branch: master
Commit: 55d1a77c29e2bf122e56d462aac255739b6f85e2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=55d1a77c29e2bf122e56d462aac255739b6f85e2
Author: Rob Clark <robdcl...@gmail.com>
Date: Thu Jun 7 15:44:28 2018 -0400
freedreno/ir3: use pipe_image_view's cpp
At least for PIPE_BUFFER, we could get the resource used as (for
example) R32F imageBuffer. So using cpp=1 from the rsc is wrong.
Signed-off-by: Rob Clark <robdcl...@gmail.com>
---
src/gallium/drivers/freedreno/ir3/ir3_shader.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_shader.c
b/src/gallium/drivers/freedreno/ir3/ir3_shader.c
index 8ed7f5673c..6ee732f991 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_shader.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_shader.c
@@ -660,9 +660,14 @@ emit_image_dims(struct fd_context *ctx, const struct
ir3_shader_variant *v,
img = &si->si[index];
rsc = fd_resource(img->resource);
- dims[off + 0] = rsc->cpp;
+ dims[off + 0] = util_format_get_blocksize(img->format);
if (img->resource->target != PIPE_BUFFER) {
unsigned lvl = img->u.tex.level;
+ /* note for 2d/cube/etc images, even if
re-interpreted
+ * as a different color format, the pixel size
should
+ * be the same, so use original dimensions for
y and z
+ * stride:
+ */
dims[off + 1] = rsc->slices[lvl].pitch *
rsc->cpp;
dims[off + 2] = rsc->slices[lvl].size0;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
