From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Mon, 7 Nov 2016 00:43:47 +0000 (+1100)
Subject: i965: stop depending on gl_shader_program for brw_compute_vue_map() params
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=234211ec8ded86fbfc324068498629a9df769393;p=mesa.git

i965: stop depending on gl_shader_program for brw_compute_vue_map() params

This removes another dependency on gl_shader_program from the codegen functions,
this will help allow us to use gl_program for the CurrentProgram array rather
than gl_shader_program.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c
index 76ceb5b8522..7886737c7ab 100644
--- a/src/mesa/drivers/dri/i965/brw_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_gs.c
@@ -134,7 +134,7 @@ brw_codegen_gs_prog(struct brw_context *brw,
 
    brw_compute_vue_map(devinfo,
                        &prog_data.base.vue_map, outputs_written,
-                       prog->SeparateShader);
+                       gp->program.info.separate_shader);
 
    int st_index = -1;
    if (INTEL_DEBUG & DEBUG_SHADER_TIME)