From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Thu, 20 Oct 2016 05:19:34 +0000 (+1100)
Subject: st/mesa: use common patch inputs read field
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d2a5039987b7182e775949ee1a4a63ea70ab289;p=mesa.git

st/mesa: use common patch inputs read field

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index dba0e9c8bc4..fb8c4e3fe7b 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -6507,7 +6507,7 @@ get_mesa_program_tgsi(struct gl_context *ctx,
    shrink_array_declarations(v->inputs, v->num_inputs,
                              &prog->info.inputs_read,
                              prog->info.double_inputs_read,
-                             &prog->PatchInputsRead);
+                             &prog->info.patch_inputs_read);
    shrink_array_declarations(v->outputs, v->num_outputs,
                              &prog->info.outputs_written, 0ULL,
                              &prog->PatchOutputsWritten);
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index b1ca0c6d6a2..eef99e6ea6e 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1303,7 +1303,7 @@ st_translate_program_common(struct st_context *st,
 
    /* Also add patch inputs. */
    for (attr = 0; attr < 32; attr++) {
-      if (prog->PatchInputsRead & (1u << attr)) {
+      if (prog->info.patch_inputs_read & (1u << attr)) {
          GLuint slot = num_inputs++;
          GLuint patch_attr = VARYING_SLOT_PATCH0 + attr;