From c40b1efa700cb594e397fd9ab839aa89cbbb067a Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Sun, 3 Apr 2016 21:38:24 +0300 Subject: i965/blorp: Switch the order of render and texture targets On gen8 color resolving won't work anymore if the target isn't the first entry in the binding table. Signed-off-by: Topi Pohjolainen Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_blorp.h | 2 +- src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h index ef92fdc2459..c284fc8f340 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.h +++ b/src/mesa/drivers/dri/i965/brw_blorp.h @@ -56,8 +56,8 @@ brw_blorp_blit_miptrees(struct brw_context *brw, * Binding table indices used by BLORP. */ enum { - BRW_BLORP_TEXTURE_BINDING_TABLE_INDEX, BRW_BLORP_RENDERBUFFER_BINDING_TABLE_INDEX, + BRW_BLORP_TEXTURE_BINDING_TABLE_INDEX, BRW_BLORP_NUM_BINDING_TABLE_ENTRIES }; 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 7ec0b2a2f53..b09542158dc 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp @@ -43,6 +43,10 @@ brw_blorp_eu_emitter::get_program(struct brw_context *brw, bool debug_flag, cfg_t cfg(&insts); brw_stage_prog_data prog_data = { 0 }; brw_wm_prog_key prog_key = { 0 }; + + prog_data.binding_table.texture_start = + BRW_BLORP_TEXTURE_BINDING_TABLE_INDEX; + fs_generator generator(brw->intelScreen->compiler, brw, mem_ctx, &prog_key, &prog_data, 0, false, MESA_SHADER_FRAGMENT); -- cgit v1.2.3