Mesa (master): i965/fs+blorp: Remove left over dump_file arguments.
Matt Turner
mattst88 at kemper.freedesktop.org
Sun May 25 06:02:28 UTC 2014
Module: Mesa
Branch: master
Commit: 59f4e80d5330299b390c8d92a7df7fe4494704cd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=59f4e80d5330299b390c8d92a7df7fe4494704cd
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat May 17 13:25:15 2014 -0700
i965/fs+blorp: Remove left over dump_file arguments.
Were used by the blorp unit test programs.
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
---
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 10 ++++------
src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp | 4 ++--
src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h | 2 +-
src/mesa/drivers/dri/i965/brw_fs.h | 5 ++---
src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 13 ++++++-------
5 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index c3280a8..118af27 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -519,8 +519,7 @@ public:
brw_blorp_blit_program(struct brw_context *brw,
const brw_blorp_blit_prog_key *key, bool debug_flag);
- const GLuint *compile(struct brw_context *brw, GLuint *program_size,
- FILE *dump_file = stderr);
+ const GLuint *compile(struct brw_context *brw, GLuint *program_size);
brw_blorp_prog_data prog_data;
@@ -634,8 +633,7 @@ brw_blorp_blit_program::brw_blorp_blit_program(
const GLuint *
brw_blorp_blit_program::compile(struct brw_context *brw,
- GLuint *program_size,
- FILE *dump_file)
+ GLuint *program_size)
{
/* Sanity checks */
if (key->dst_tiled_w && key->rt_samples > 0) {
@@ -790,7 +788,7 @@ brw_blorp_blit_program::compile(struct brw_context *brw,
*/
render_target_write();
- return get_program(program_size, dump_file);
+ return get_program(program_size);
}
void
@@ -2146,7 +2144,7 @@ brw_blorp_blit_params::get_wm_prog(struct brw_context *brw,
brw_blorp_blit_program prog(brw, &this->wm_prog_key,
INTEL_DEBUG & DEBUG_BLORP);
GLuint program_size;
- const GLuint *program = prog.compile(brw, &program_size, stderr);
+ const GLuint *program = prog.compile(brw, &program_size);
brw_upload_cache(&brw->cache, BRW_BLORP_BLIT_PROG,
&this->wm_prog_key, sizeof(this->wm_prog_key),
program, program_size,
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
index 4910b6c..33fa606 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
@@ -41,9 +41,9 @@ brw_blorp_eu_emitter::~brw_blorp_eu_emitter()
}
const unsigned *
-brw_blorp_eu_emitter::get_program(unsigned *program_size, FILE *dump_file)
+brw_blorp_eu_emitter::get_program(unsigned *program_size)
{
- return generator.generate_assembly(NULL, &insts, program_size, dump_file);
+ return generator.generate_assembly(NULL, &insts, program_size);
}
/**
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h
index 8a93f05..bc927fe 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h
@@ -33,7 +33,7 @@ protected:
explicit brw_blorp_eu_emitter(struct brw_context *brw, bool debug_flag);
~brw_blorp_eu_emitter();
- const unsigned *get_program(unsigned *program_size, FILE *dump_file);
+ const unsigned *get_program(unsigned *program_size);
void emit_kill_if_outside_rect(const struct brw_reg &x,
const struct brw_reg &y,
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 7a87aed..8acad2f 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -608,11 +608,10 @@ public:
const unsigned *generate_assembly(exec_list *simd8_instructions,
exec_list *simd16_instructions,
- unsigned *assembly_size,
- FILE *dump_file = NULL);
+ unsigned *assembly_size);
private:
- void generate_code(exec_list *instructions, FILE *dump_file);
+ void generate_code(exec_list *instructions);
void generate_fb_write(fs_inst *inst);
void generate_blorp_fb_write(fs_inst *inst);
void generate_pixel_xy(struct brw_reg dst, bool is_x);
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index 878b0e0..bf3f32c 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -1321,7 +1321,7 @@ fs_generator::generate_untyped_surface_read(fs_inst *inst, struct brw_reg dst,
}
void
-fs_generator::generate_code(exec_list *instructions, FILE *dump_file)
+fs_generator::generate_code(exec_list *instructions)
{
int last_native_insn_offset = p->next_insn_offset;
const char *last_annotation_string = NULL;
@@ -1838,22 +1838,21 @@ fs_generator::generate_code(exec_list *instructions, FILE *dump_file)
* which is often something we want to debug. So this is here in
* case you're doing that.
*/
- if (dump_file) {
- brw_disassemble(brw, p->store, 0, p->next_insn_offset, dump_file);
+ if (0) {
+ brw_disassemble(brw, p->store, 0, p->next_insn_offset, stderr);
}
}
const unsigned *
fs_generator::generate_assembly(exec_list *simd8_instructions,
exec_list *simd16_instructions,
- unsigned *assembly_size,
- FILE *dump_file)
+ unsigned *assembly_size)
{
assert(simd8_instructions || simd16_instructions);
if (simd8_instructions) {
dispatch_width = 8;
- generate_code(simd8_instructions, dump_file);
+ generate_code(simd8_instructions);
brw_compact_instructions(p, 0);
}
@@ -1869,7 +1868,7 @@ fs_generator::generate_assembly(exec_list *simd8_instructions,
brw_set_compression_control(p, BRW_COMPRESSION_COMPRESSED);
dispatch_width = 16;
- generate_code(simd16_instructions, dump_file);
+ generate_code(simd16_instructions);
brw_compact_instructions(p, prog_data->prog_offset_16);
}
More information about the mesa-commit
mailing list