nir: Copy "patch" flag from ir_variable to nir_variable.
authorKenneth Graunke <kenneth@whitecape.org>
Fri, 2 Oct 2015 07:01:23 +0000 (00:01 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Thu, 29 Oct 2015 04:15:29 +0000 (21:15 -0700)
This was introduced in GLSL IR after NIR development had branched.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
src/glsl/nir/glsl_to_nir.cpp
src/glsl/nir/nir.h
src/glsl/nir/nir_print.c

index 01f16d70eb13aaf138a6cef253185d3f315dc0ae..7275b48eff07b17b04c5d7ce5be22e8b04a867bb 100644 (file)
@@ -303,6 +303,7 @@ nir_visitor::visit(ir_variable *ir)
    var->data.read_only = ir->data.read_only;
    var->data.centroid = ir->data.centroid;
    var->data.sample = ir->data.sample;
+   var->data.patch = ir->data.patch;
    var->data.invariant = ir->data.invariant;
    var->data.location = ir->data.location;
 
index 04a21a7ead6562f0a8e6a68bc8c6d8564b378517..ac422514d526d59dcb8bd0cf86745686b0e5f9ab 100644 (file)
@@ -171,6 +171,7 @@ typedef struct {
       unsigned read_only:1;
       unsigned centroid:1;
       unsigned sample:1;
+      unsigned patch:1;
       unsigned invariant:1;
 
       /**
index 09663996869784a323ece8a93530e3b1a1720e20..30220c5e48d8758b7593f56fee523e0ad74e5cf6 100644 (file)
@@ -228,12 +228,13 @@ print_var_decl(nir_variable *var, print_state *state)
 
    const char *const cent = (var->data.centroid) ? "centroid " : "";
    const char *const samp = (var->data.sample) ? "sample " : "";
+   const char *const patch = (var->data.patch) ? "patch " : "";
    const char *const inv = (var->data.invariant) ? "invariant " : "";
    const char *const mode[] = { "shader_in ", "shader_out ", "", "",
                                 "uniform ", "shader_storage", "system " };
 
-   fprintf(fp, "%s%s%s%s%s ",
-      cent, samp, inv, mode[var->data.mode],
+   fprintf(fp, "%s%s%s%s%s%s ",
+      cent, samp, patch, inv, mode[var->data.mode],
          glsl_interp_qualifier_name(var->data.interpolation));
 
    glsl_print_type(var->type, fp);