summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-04-17 18:47:38 -0700
committerKenneth Graunke <[email protected]>2014-05-01 00:24:08 -0700
commite9e89d5756a1bf886eb8a9330902de4bf1b8f710 (patch)
treeefc30d3b3d38b9556fae0ba96b73a051b52b7a8e /src/mesa
parent54a48984b30daf243613f58b2a982e7b44471ead (diff)
i965/fs: Port untyped atomic message support to Broadwell.
v2: Fix SIMD mode comment (caught by Eric Anholt). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77221 Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.h5
-rw-r--r--src/mesa/drivers/dri/i965/gen8_fs_generator.cpp34
2 files changed, 38 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 6405dbc1126..053046b7abf 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -750,6 +750,11 @@ private:
void generate_unpack_half_2x16_split(fs_inst *inst,
struct brw_reg dst,
struct brw_reg src);
+ void generate_untyped_atomic(fs_inst *inst,
+ struct brw_reg dst,
+ struct brw_reg atomic_op,
+ struct brw_reg surf_index);
+
void generate_untyped_surface_read(fs_inst *inst,
struct brw_reg dst,
struct brw_reg surf_index);
diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
index 454b8c85765..de06a97b2ec 100644
--- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
@@ -821,6 +821,38 @@ gen8_fs_generator::generate_unpack_half_2x16_split(fs_inst *inst,
}
void
+gen8_fs_generator::generate_untyped_atomic(fs_inst *ir,
+ struct brw_reg dst,
+ struct brw_reg atomic_op,
+ struct brw_reg surf_index)
+{
+ assert(atomic_op.file == BRW_IMMEDIATE_VALUE &&
+ atomic_op.type == BRW_REGISTER_TYPE_UD &&
+ surf_index.file == BRW_IMMEDIATE_VALUE &&
+ surf_index.type == BRW_REGISTER_TYPE_UD);
+ assert((atomic_op.dw1.ud & ~0xf) == 0);
+
+ unsigned msg_control =
+ atomic_op.dw1.ud | /* Atomic Operation Type: BRW_AOP_* */
+ ((dispatch_width == 16 ? 0 : 1) << 4) | /* SIMD Mode */
+ (1 << 5); /* Return data expected */
+
+ gen8_instruction *inst = next_inst(BRW_OPCODE_SEND);
+ gen8_set_dst(brw, inst, retype(dst, BRW_REGISTER_TYPE_UD));
+ gen8_set_src0(brw, inst, brw_message_reg(ir->base_mrf));
+ gen8_set_dp_message(brw, inst, HSW_SFID_DATAPORT_DATA_CACHE_1,
+ surf_index.dw1.ud,
+ HSW_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_OP,
+ msg_control,
+ ir->mlen,
+ dispatch_width / 8,
+ ir->header_present,
+ false);
+
+ brw_mark_surface_used(&c->prog_data.base, surf_index.dw1.ud);
+}
+
+void
gen8_fs_generator::generate_untyped_surface_read(fs_inst *ir,
struct brw_reg dst,
struct brw_reg surf_index)
@@ -1215,7 +1247,7 @@ gen8_fs_generator::generate_code(exec_list *instructions)
break;
case SHADER_OPCODE_UNTYPED_ATOMIC:
- assert(!"XXX: Missing Gen8 scalar support for untyped atomics");
+ generate_untyped_atomic(ir, dst, src[0], src[1]);
break;
case SHADER_OPCODE_UNTYPED_SURFACE_READ: