Merge remote-tracking branch 'public/master' into vulkan

[mesa.git] / src / compiler / nir / glsl_to_nir.cpp

diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp
index fafa8bbe0130ae7e5686cecfd9239a67482220c9..d4c58a9ba2e84a2a31060c69015b2138691a40c7 100644 (file)
--- a/src/compiler/nir/glsl_to_nir.cpp
+++ b/src/compiler/nir/glsl_to_nir.cpp
@@ -391,6 +391,7 @@ nir_visitor::visit(ir_variable *ir)
    }
 
    var->data.index = ir->data.index;
+   var->data.descriptor_set = 0;
    var->data.binding = ir->data.binding;
    var->data.offset = ir->data.offset;
    var->data.image.read_only = ir->data.image_read_only;