This removes all stage specific data from the generator, and lets us create a generator for any stage.
Signed-off-by: Kristian Høgsberg <k...@bitplanet.net> --- src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp | 5 ++--- src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs.h | 7 +++---- src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 14 ++++++-------- 4 files changed, 12 insertions(+), 16 deletions(-) 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 7802c9f..86ed953 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp @@ -29,9 +29,8 @@ brw_blorp_eu_emitter::brw_blorp_eu_emitter(struct brw_context *brw, bool debug_flag) : mem_ctx(ralloc_context(NULL)), - generator(brw, mem_ctx, - rzalloc(mem_ctx, struct brw_wm_prog_key), - rzalloc(mem_ctx, struct brw_wm_prog_data), + generator(brw, mem_ctx, (void *) rzalloc(mem_ctx, struct brw_wm_prog_key), + (struct brw_stage_prog_data *) rzalloc(mem_ctx, struct brw_wm_prog_data), NULL, NULL, false, debug_flag) { } diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index c6cd73b..6cc508e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -3717,7 +3717,7 @@ brw_wm_fs_emit(struct brw_context *brw, prog_data->no_8 = false; } - fs_generator g(brw, mem_ctx, key, prog_data, prog, fp, + fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base, prog, &fp->Base, v.runtime_check_aads_emit, INTEL_DEBUG & DEBUG_WM); if (simd8_cfg) g.generate_code(simd8_cfg, 8); diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index b29b6b0..bba7f96 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -680,10 +680,10 @@ class fs_generator public: fs_generator(struct brw_context *brw, void *mem_ctx, - const struct brw_wm_prog_key *key, - struct brw_wm_prog_data *prog_data, + const void *key, + struct brw_stage_prog_data *prog_data, struct gl_shader_program *shader_prog, - struct gl_fragment_program *fp, + struct gl_program *fp, bool runtime_check_aads_emit, bool debug_flag); ~fs_generator(); @@ -785,7 +785,6 @@ private: struct gl_context *ctx; struct brw_compile *p; - gl_shader_stage stage; const void * const key; struct brw_stage_prog_data * const prog_data; diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index bbed4cc..9d20f40 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -38,16 +38,16 @@ extern "C" { fs_generator::fs_generator(struct brw_context *brw, void *mem_ctx, - const struct brw_wm_prog_key *key, - struct brw_wm_prog_data *prog_data, + const void *key, + struct brw_stage_prog_data *prog_data, struct gl_shader_program *shader_prog, - struct gl_fragment_program *fp, + struct gl_program *prog, bool runtime_check_aads_emit, bool debug_flag) - : brw(brw), stage(MESA_SHADER_FRAGMENT), key(key), - prog_data(&prog_data->base), shader_prog(shader_prog), - prog(&fp->Base), runtime_check_aads_emit(runtime_check_aads_emit), + : brw(brw), key(key), + prog_data(prog_data), shader_prog(shader_prog), + prog(prog), runtime_check_aads_emit(runtime_check_aads_emit), debug_flag(debug_flag), mem_ctx(mem_ctx) { ctx = &brw->ctx; @@ -117,7 +117,6 @@ fs_generator::fire_fb_write(fs_inst *inst, { uint32_t msg_control; - assert(stage == MESA_SHADER_FRAGMENT); brw_wm_prog_data *prog_data = (brw_wm_prog_data*) this->prog_data; if (brw->gen < 6) { @@ -158,7 +157,6 @@ fs_generator::fire_fb_write(fs_inst *inst, void fs_generator::generate_fb_write(fs_inst *inst, struct brw_reg payload) { - assert(stage == MESA_SHADER_FRAGMENT); brw_wm_prog_data *prog_data = (brw_wm_prog_data*) this->prog_data; const brw_wm_prog_key * const key = (brw_wm_prog_key * const) this->key; struct brw_reg implied_header; -- 2.2.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev