diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-10 16:58:24 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-10 18:29:36 -0800 |
| commit | d5c9955d3eaa7311e2b2350b6964bae516c7b7b2 (patch) | |
| tree | 401e4378dd9909f9010f076d026a77e515170be5 /src/glsl/lower_named_interface_blocks.cpp | |
| parent | 8beea9d45b5879ea3dbd9c0e48f0c0eb2451f380 (diff) | |
| parent | 78b81be627734ea7fa50ea246c07b0d4a3a1638a (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in nir_intrinsic_load/store changes and the switch of all
uniforms in i965 to bytes. This accounts for the Vulkan changes.
Diffstat (limited to 'src/glsl/lower_named_interface_blocks.cpp')
| -rw-r--r-- | src/glsl/lower_named_interface_blocks.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glsl/lower_named_interface_blocks.cpp b/src/glsl/lower_named_interface_blocks.cpp index 114bb5811b4..f29eba4f75f 100644 --- a/src/glsl/lower_named_interface_blocks.cpp +++ b/src/glsl/lower_named_interface_blocks.cpp @@ -187,6 +187,7 @@ flatten_named_interface_blocks_declarations::run(exec_list *instructions) new_var->data.sample = iface_t->fields.structure[i].sample; new_var->data.patch = iface_t->fields.structure[i].patch; new_var->data.stream = var->data.stream; + new_var->data.how_declared = var->data.how_declared; new_var->init_interface_type(iface_t); hash_table_insert(interface_namespace, new_var, |