From 6bc021bc78903898f17fcdf328c544e13bb3cace Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 9 Oct 2012 10:19:16 -0700 Subject: [PATCH] i965/vs: Only do INTEL_DEBUG=perf when there's a GLSL shader. This will become necessary once we start supporting ARB programs and fixed function in this backend. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp index 479b0a607aa..ab9bc66c388 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp @@ -1048,7 +1048,7 @@ brw_vs_emit(struct gl_shader_program *prog, struct brw_vs_compile *c) printf("\n\n"); } - if (unlikely(INTEL_DEBUG & DEBUG_PERF)) { + if (unlikely(INTEL_DEBUG & DEBUG_PERF) && shader) { if (shader->compiled_once) { brw_vs_debug_recompile(brw, prog, &c->key); } @@ -1056,6 +1056,7 @@ brw_vs_emit(struct gl_shader_program *prog, struct brw_vs_compile *c) perf_debug("VS compile took %.03f ms and stalled the GPU\n", (get_time() - start_time) * 1000); } + shader->compiled_once = true; } vec4_visitor v(c, prog, shader); @@ -1065,8 +1066,6 @@ brw_vs_emit(struct gl_shader_program *prog, struct brw_vs_compile *c) return false; } - shader->compiled_once = true; - return true; } -- 2.30.2