Mesa (master): nv50/ir/nir: remove image uniform hack
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jun 18 15:39:52 UTC 2020
Module: Mesa
Branch: master
Commit: 4bc5110eea2fbed10badf0ea70b1787f24499288
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bc5110eea2fbed10badf0ea70b1787f24499288
Author: Karol Herbst <kherbst at redhat.com>
Date: Tue Jun 16 01:08:39 2020 +0200
nv50/ir/nir: remove image uniform hack
Signed-off-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5480>
---
src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp | 12 +-----------
1 file changed, 1 insertion(+), 11 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 548acc642c1..90ce9ebd2eb 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -921,18 +921,8 @@ bool Converter::assignSlots() {
info->io.viewportId = -1;
info->numInputs = 0;
info->numOutputs = 0;
-
- // we have to fixup the uniform locations for arrays
- unsigned numImages = 0;
- nir_foreach_variable(var, &nir->uniforms) {
- const glsl_type *type = var->type;
- if (!type->without_array()->is_image())
- continue;
- var->data.driver_location = numImages;
- numImages += type->is_array() ? type->arrays_of_arrays_size() : 1;
- }
-
info->numSysVals = 0;
+
for (uint8_t i = 0; i < SYSTEM_VALUE_MAX; ++i) {
if (!(nir->info.system_values_read & 1ull << i))
continue;
More information about the mesa-commit
mailing list