summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_cs.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-11-04 13:37:21 +1100
committerTimothy Arceri <[email protected]>2016-12-30 10:57:16 +1100
commit718a0cf49f88ff456582366db45c31f881561ebf (patch)
treec582dae6c39e1881d34d1de7d477bb8959217c5e /src/mesa/drivers/dri/i965/brw_cs.c
parent8417bf528eb155028d56acaa4cbe05eb3536093b (diff)
i965: move compiled_once flag to brw_program
This allows us to delete brw_shader and removes the last use of gl_linked_shader in the codegen paths. Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_cs.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_cs.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
index 4516f1f33a2..d039db9e27e 100644
--- a/src/mesa/drivers/dri/i965/brw_cs.c
+++ b/src/mesa/drivers/dri/i965/brw_cs.c
@@ -66,10 +66,6 @@ brw_codegen_cs_prog(struct brw_context *brw,
bool start_busy = false;
double start_time = 0;
- struct brw_shader *cs =
- (struct brw_shader *) prog->_LinkedShaders[MESA_SHADER_COMPUTE];
- assert (cs);
-
memset(&prog_data, 0, sizeof(prog_data));
if (prog->Comp.SharedSize > 64 * 1024) {
@@ -134,11 +130,11 @@ brw_codegen_cs_prog(struct brw_context *brw,
return false;
}
- if (unlikely(brw->perf_debug) && cs) {
- if (cs->compiled_once) {
+ if (unlikely(brw->perf_debug)) {
+ if (cp->compiled_once) {
_mesa_problem(&brw->ctx, "CS programs shouldn't need recompiles");
}
- cs->compiled_once = true;
+ cp->compiled_once = true;
if (start_busy && !drm_intel_bo_busy(brw->batch.last_bo)) {
perf_debug("CS compile took %.03f ms and stalled the GPU\n",