diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2022-06-11 10:59:59 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-06-15 16:13:00 -0700 |
| commit | dfd2cd3ebcf9a463ea2268386cc6970711ec3502 (patch) | |
| tree | 28b145267366969caf66ff6494031c637435f48e | |
| parent | 3fb2d7b7a8b7e937a38b51ab5f817f2f9595149e (diff) | |
zink: fix cubemap lowering bit size
this isn't always 32
Fixes: 2d745904ca7 ("zink: add a gently mangled version of the d3d12 cubemap -> array compiler pass")
fixes:
dEQP-GL45-ES31.functional.program_uniform.by_pointer.render.struct_in_array.sampler2D_samplerCube_*
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17008>
(cherry picked from commit 87c7e757211b393f5b352ba346a927622c996abf)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_lower_cubemap_to_array.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 2325f9ff503..613a21ae10d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1102,7 +1102,7 @@ "description": "zink: fix cubemap lowering bit size", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2d745904ca7022afdc86cb66e294cedfafa0fcb1" }, diff --git a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c index 523ba186abd..2141385ccf3 100644 --- a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c +++ b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c @@ -176,7 +176,7 @@ create_array_tex_from_cube_tex(nir_builder *b, nir_tex_instr *tex, nir_ssa_def * } nir_ssa_dest_init(&array_tex->instr, &array_tex->dest, - nir_tex_instr_dest_size(array_tex), 32, NULL); + nir_tex_instr_dest_size(array_tex), nir_dest_bit_size(tex->dest), NULL); nir_builder_instr_insert(b, &array_tex->instr); return &array_tex->dest.ssa; } |