summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTopi Pohjolainen <topi.pohjolainen@intel.com>2016-04-03 21:38:24 +0300
committerTopi Pohjolainen <topi.pohjolainen@intel.com>2016-04-21 10:20:02 +0300
commitc40b1efa700cb594e397fd9ab839aa89cbbb067a (patch)
treec5136bfbeeb9a7b2a7d428617a84b9007342c939 /src
parent0d062d79c39a6e9556411f58a7ea4126811f9ae4 (diff)
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 <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i965/brw_blorp.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp4
2 files changed, 5 insertions, 1 deletions
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);