diff options
author | Jason Ekstrand <[email protected]> | 2016-04-14 10:24:33 -0700 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2016-04-14 10:24:33 -0700 |
commit | bfa3a38280d27fe373cb78d666e926265ef80854 (patch) | |
tree | 93fee95cd6d339439d1f9c242d01fafeaca52bc0 /src/compiler/nir | |
parent | 12f88ba32a14ea79134f4e995a55149f078a2f27 (diff) |
nir: Remove some pointless delta between vulkan and master
Diffstat (limited to 'src/compiler/nir')
-rw-r--r-- | src/compiler/nir/glsl_to_nir.cpp | 1 | ||||
-rw-r--r-- | src/compiler/nir/nir.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index d4c58a9ba2e..fafa8bbe013 100644 --- a/src/compiler/nir/glsl_to_nir.cpp +++ b/src/compiler/nir/glsl_to_nir.cpp @@ -391,7 +391,6 @@ 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; diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index c3a33431239..fede1954cf0 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2217,8 +2217,6 @@ void nir_lower_outputs_to_temporaries(nir_shader *shader, nir_function *entrypoint); void nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint); -void nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint); - void nir_assign_var_locations(struct exec_list *var_list, unsigned *size, int (*type_size)(const struct glsl_type *)); |