diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-05 16:39:32 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-10-02 14:22:53 -0700 |
| commit | cd1ae6ebfac22f76d26a5b8659423969b2aeddce (patch) | |
| tree | 115fb6660580c59ad056306a1848310f2405e264 /src/mesa/drivers/dri | |
| parent | 30c63571133ed50907ec14172c2f3ef82ee8a34e (diff) | |
nir/glsl: Take a gl_shader_program and a stage rather than a gl_shader
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 2812fd72fd9..cc9430c83e6 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -103,13 +103,12 @@ brw_create_nir(struct brw_context *brw, static const nir_lower_tex_options tex_options = { .lower_txp = ~0, }; - struct gl_shader *shader = shader_prog ? shader_prog->_LinkedShaders[stage] : NULL; bool debug_enabled = INTEL_DEBUG & intel_debug_flag_for_shader_stage(stage); nir_shader *nir; /* First, lower the GLSL IR or Mesa IR to NIR */ if (shader_prog) { - nir = glsl_to_nir(shader, options); + nir = glsl_to_nir(shader_prog, stage, options); } else { nir = prog_to_nir(prog, options); nir_convert_to_ssa(nir); /* turn registers into SSA */ |