aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_wm.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-12-20 21:37:23 +1100
committerTimothy Arceri <[email protected]>2017-01-03 12:20:10 +1100
commit6643da6d7f3c3b9bdafb4bb9b01109e482c0b083 (patch)
tree3b5872df9ebcb427347537de5c7ce6be2a06aa7a /src/mesa/drivers/dri/i965/brw_wm.c
parentcb6f49a902cae1b4df795c0e611526dca467a042 (diff)
i965: update brw_get_shader_time_index() not to take gl_shader_program
This removes another dependency on gl_shader_program in the codegen functions which will help allow us to use gl_program in the CurrentProgram array rather than gl_shader_program. Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_wm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 08b8b302de5..844c912ed15 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -134,8 +134,11 @@ brw_codegen_wm_prog(struct brw_context *brw,
int st_index8 = -1, st_index16 = -1;
if (INTEL_DEBUG & DEBUG_SHADER_TIME) {
- st_index8 = brw_get_shader_time_index(brw, prog, &fp->program, ST_FS8);
- st_index16 = brw_get_shader_time_index(brw, prog, &fp->program, ST_FS16);
+ bool is_glsl_sh = prog != NULL;
+ st_index8 = brw_get_shader_time_index(brw, &fp->program, ST_FS8,
+ is_glsl_sh);
+ st_index16 = brw_get_shader_time_index(brw, &fp->program, ST_FS16,
+ is_glsl_sh);
}
char *error_str = NULL;