AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nv50/ir/nir: remove image uniform hack

Browse Source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5480>
This commit is contained in:
Karol Herbst
2020-06-16 01:08:39 +02:00
committed by Marge Bot
parent c0bbca5c23
commit 4bc5110eea
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
View File

@@ -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;