From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 14 Apr 2016 17:24:33 +0000 (-0700)
Subject: nir: Remove some pointless delta between vulkan and master
X-Git-Tag: upstream/17.1.0~11012^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfa3a38280d27fe373cb78d666e926265ef80854;p=platform%2Fupstream%2Fmesa.git

nir: Remove some pointless delta between vulkan and master
---

diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp
index d4c58a9..fafa8bb 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 c3a3343..fede195 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 *));