diff options
Diffstat (limited to 'src/mesa/drivers')
6 files changed, 5 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index e4d0cb75b02..a24f843b112 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -84,7 +84,6 @@ public: struct gl_shader_program *shader_prog, gl_shader_stage stage, void *mem_ctx, - bool debug_flag, bool no_spills, shader_time_shader_type st_base, shader_time_shader_type st_written, @@ -398,8 +397,6 @@ protected: virtual vec4_instruction *emit_urb_write_opcode(bool complete) = 0; virtual int compute_array_stride(ir_dereference_array *ir); - const bool debug_flag; - private: /** * If true, then register allocation should fail instead of spilling. diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp index 7a0ea3cdfdf..2002ffd6428 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs_visitor.cpp @@ -41,7 +41,7 @@ vec4_gs_visitor::vec4_gs_visitor(struct brw_context *brw, bool no_spills) : vec4_visitor(brw, &c->base, &c->gp->program.Base, &c->key.base, &c->prog_data.base, prog, MESA_SHADER_GEOMETRY, mem_ctx, - INTEL_DEBUG & DEBUG_GS, no_spills, + no_spills, ST_GS, ST_GS_WRITTEN, ST_GS_RESET), c(c) { diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index faae2c9bb69..4f66b626144 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -3588,7 +3588,6 @@ vec4_visitor::vec4_visitor(struct brw_context *brw, struct gl_shader_program *shader_prog, gl_shader_stage stage, void *mem_ctx, - bool debug_flag, bool no_spills, shader_time_shader_type st_base, shader_time_shader_type st_written, @@ -3601,7 +3600,6 @@ vec4_visitor::vec4_visitor(struct brw_context *brw, fail_msg(NULL), first_non_payload_grf(0), need_all_constants_in_pull_buffer(false), - debug_flag(debug_flag), no_spills(no_spills), st_base(st_base), st_written(st_written), @@ -3662,7 +3660,7 @@ vec4_visitor::fail(const char *format, ...) this->fail_msg = msg; - if (debug_flag) { + if (debug_enabled) { fprintf(stderr, "%s", msg); } } diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp index 72b6ef03b42..129c2db638b 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_vs_visitor.cpp @@ -220,7 +220,7 @@ vec4_vs_visitor::vec4_vs_visitor(struct brw_context *brw, : vec4_visitor(brw, &vs_compile->base, &vs_compile->vp->program.Base, &vs_compile->key.base, &vs_prog_data->base, prog, MESA_SHADER_VERTEX, - mem_ctx, INTEL_DEBUG & DEBUG_VS, false /* no_spills */, + mem_ctx, false /* no_spills */, ST_VS, ST_VS_WRITTEN, ST_VS_RESET), vs_compile(vs_compile), vs_prog_data(vs_prog_data) diff --git a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp index 992cb60f1fc..f9e4ce1dc42 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp @@ -47,7 +47,7 @@ public: struct gl_shader_program *shader_prog) : vec4_visitor(brw, NULL, NULL, NULL, NULL, shader_prog, MESA_SHADER_VERTEX, NULL, - false, false /* no_spills */, + false /* no_spills */, ST_NONE, ST_NONE, ST_NONE) { } diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp index 3c03f83fc26..0c271629c0e 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp @@ -50,7 +50,7 @@ public: struct gl_shader_program *shader_prog) : vec4_visitor(brw, NULL, NULL, NULL, NULL, shader_prog, MESA_SHADER_VERTEX, NULL, - false, false /* no_spills */, + false /* no_spills */, ST_NONE, ST_NONE, ST_NONE) { } |