Revert "Add nodup attribute for barrier."
This reverts commit 30b7f5cd4d
.
This commit is contained in:
Родитель
524697bf66
Коммит
e435f63b02
|
@ -155,7 +155,7 @@ const OP::OpCodeProperty OP::m_OpCodeProps[(unsigned)OP::OpCode::NumOpCodes] = {
|
|||
// Synchronization void, h, f, d, i1, i8, i16, i32, i64 function attribute
|
||||
{ OC::AtomicBinOp, "AtomicBinOp", OCC::AtomicBinOp, "atomicBinOp", false, false, false, false, false, false, false, true, false, Attribute::None, },
|
||||
{ OC::AtomicCompareExchange, "AtomicCompareExchange", OCC::AtomicCompareExchange, "atomicCompareExchange", false, false, false, false, false, false, false, true, false, Attribute::None, },
|
||||
{ OC::Barrier, "Barrier", OCC::Barrier, "barrier", true, false, false, false, false, false, false, false, false, Attribute::NoDuplicate, },
|
||||
{ OC::Barrier, "Barrier", OCC::Barrier, "barrier", true, false, false, false, false, false, false, false, false, Attribute::None, },
|
||||
|
||||
// Pixel shader void, h, f, d, i1, i8, i16, i32, i64 function attribute
|
||||
{ OC::CalculateLOD, "CalculateLOD", OCC::CalculateLOD, "calculateLOD", false, false, true, false, false, false, false, false, false, Attribute::ReadOnly, },
|
||||
|
|
|
@ -53,7 +53,6 @@
|
|||
// CHECK: i32 2
|
||||
// CHECK: barrier
|
||||
// CHECK: i32 4
|
||||
// CHECK: noduplicate
|
||||
|
||||
groupshared column_major float2x2 dataC[8*8];
|
||||
|
||||
|
|
|
@ -761,7 +761,7 @@ class db_dxil(object):
|
|||
next_op_idx += 1
|
||||
|
||||
# Synchronization.
|
||||
self.add_dxil_op("Barrier", next_op_idx, "Barrier", "inserts a memory barrier in the shader", "v", "nd", [
|
||||
self.add_dxil_op("Barrier", next_op_idx, "Barrier", "inserts a memory barrier in the shader", "v", "", [
|
||||
retvoid_param,
|
||||
db_dxil_param(2, "i32", "barrierMode", "a mask of DXIL::BarrierMode values", is_const=True)])
|
||||
next_op_idx += 1
|
||||
|
|
|
@ -361,7 +361,7 @@ class db_oload_gen:
|
|||
f = lambda i,c : "true," if i.oload_types.find(c) >= 0 else "false,"
|
||||
lower_exceptions = { "CBufferLoad" : "cbufferLoad", "CBufferLoadLegacy" : "cbufferLoadLegacy", "GSInstanceID" : "gsInstanceID" }
|
||||
lower_fn = lambda t: lower_exceptions[t] if t in lower_exceptions else t[:1].lower() + t[1:]
|
||||
attr_dict = { "": "None", "ro": "ReadOnly", "rn": "ReadNone", "nd": "NoDuplicate" }
|
||||
attr_dict = { "": "None", "ro": "ReadOnly", "rn": "ReadNone" }
|
||||
attr_fn = lambda i : "Attribute::" + attr_dict[i.fn_attr] + ","
|
||||
for i in self.instrs:
|
||||
if last_category != i.category:
|
||||
|
|
Загрузка…
Ссылка в новой задаче