summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nouveau/codegen
diff options
context:
space:
mode:
authorKarol Herbst <kherbst@redhat.com>2022-04-25 22:21:16 +0200
committerMarge Bot <emma+marge@anholt.net>2022-04-29 23:07:03 +0000
commitd1ff453a0dfdbcc9d23ad1992487530bcab9994d (patch)
tree534d4ce132d2f4287bda5189e4890600944521e9 /src/gallium/drivers/nouveau/codegen
parentc228cb388956ce3acd8cec71e4de25b6e0a738dd (diff)
nv50/nir: align tlsspace to 0x10
nvc0 aligns to 0x10 in setting up its rogram header, but nv50 TLS allocation expects the incoming value to be aligned already (like TGSI always did). Avoids regression in KHR-GL33.shaders.arrays.declaration.dynamic_expression_array_access_* with the nir backend. Reviewed-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15949>
Diffstat (limited to 'src/gallium/drivers/nouveau/codegen')
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
index 0cd0bfab8d5..2895c2bac4a 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -1301,7 +1301,7 @@ Converter::storeTo(nir_intrinsic_instr *insn, DataFile file, operation op,
bool
Converter::parseNIR()
{
- info_out->bin.tlsSpace = nir->scratch_size;
+ info_out->bin.tlsSpace = ALIGN(nir->scratch_size, 0x10);
info_out->io.clipDistances = nir->info.clip_distance_array_size;
info_out->io.cullDistances = nir->info.cull_distance_array_size;
info_out->io.layer_viewport_relative = nir->info.layer_viewport_relative;