summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <[email protected]>2016-08-18 22:12:37 -0700
committerFrancisco Jerez <[email protected]>2016-08-25 18:36:09 -0700
commit4135fc22ff735a40c36fcf051c1735fe23d154f2 (patch)
tree9e8eccaa42b7c0a9e635111a66aee3c5d93f92a7
parentbe12a1f36efcdd4628f199d4e11b01cc06787e8a (diff)
i965/fs: Hook up coherent framebuffer reads to the NIR front-end.
Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_nir.cpp22
1 files changed, 20 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 7bb2d5259dc..d604a5d2cb6 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -3213,6 +3213,22 @@ fs_visitor::emit_non_coherent_fb_read(const fs_builder &bld, const fs_reg &dst,
return inst;
}
+/**
+ * Actual coherent framebuffer read implemented using the native render target
+ * read message. Requires SKL+.
+ */
+static fs_inst *
+emit_coherent_fb_read(const fs_builder &bld, const fs_reg &dst, unsigned target)
+{
+ assert(bld.shader->devinfo->gen >= 9);
+ fs_inst *inst = bld.emit(FS_OPCODE_FB_READ_LOGICAL, dst);
+ inst->target = target;
+ inst->regs_written = 4 * inst->dst.component_size(inst->exec_size) /
+ REG_SIZE;
+
+ return inst;
+}
+
static fs_reg
alloc_temporary(const fs_builder &bld, unsigned size, fs_reg *regs, unsigned n)
{
@@ -3324,8 +3340,10 @@ fs_visitor::nir_emit_fs_intrinsic(const fs_builder &bld,
const unsigned target = l - FRAG_RESULT_DATA0 + const_offset->u32[0];
const fs_reg tmp = bld.vgrf(dest.type, 4);
- assert(!reinterpret_cast<const brw_wm_prog_key *>(key)->coherent_fb_fetch);
- emit_non_coherent_fb_read(bld, tmp, target);
+ if (reinterpret_cast<const brw_wm_prog_key *>(key)->coherent_fb_fetch)
+ emit_coherent_fb_read(bld, tmp, target);
+ else
+ emit_non_coherent_fb_read(bld, tmp, target);
for (unsigned j = 0; j < instr->num_components; j++) {
bld.MOV(offset(dest, bld, j),