Reactor: Rename Blend() to Shuffle()
Based on the discussions on: b/145746360#comment2
Bug: b/145746360
Change-Id: I4b390ebf448a8015d39dfe832ea5d5066637342e
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39050
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Pipeline/SpirvShaderGroup.cpp b/src/Pipeline/SpirvShaderGroup.cpp
index ee6df3f..2ef7db6 100644
--- a/src/Pipeline/SpirvShaderGroup.cpp
+++ b/src/Pipeline/SpirvShaderGroup.cpp
@@ -53,16 +53,16 @@
}
case spv::GroupOperationInclusiveScan:
{
- TYPE v2 = apply(v, Blend(v, identity, 0x4012) /* [id, v.y, v.z, v.w] */); // [x] [xy] [yz] [zw]
- TYPE v3 = apply(v2, Blend(v2, identity, 0x4401) /* [id, id, v2.x, v2.y] */); // [x] [xy] [xyz] [xyzw]
+ TYPE v2 = apply(v, Shuffle(v, identity, 0x4012) /* [id, v.y, v.z, v.w] */); // [x] [xy] [yz] [zw]
+ TYPE v3 = apply(v2, Shuffle(v2, identity, 0x4401) /* [id, id, v2.x, v2.y] */); // [x] [xy] [xyz] [xyzw]
dst.move(i, v3);
break;
}
case spv::GroupOperationExclusiveScan:
{
- TYPE v2 = apply(v, Blend(v, identity, 0x4012) /* [id, v.y, v.z, v.w] */); // [x] [xy] [yz] [zw]
- TYPE v3 = apply(v2, Blend(v2, identity, 0x4401) /* [id, id, v2.x, v2.y] */); // [x] [xy] [xyz] [xyzw]
- auto v4 = Blend(v3, identity, 0x4012 /* [id, v3.x, v3.y, v3.z] */); // [i] [x] [xy] [xyz]
+ TYPE v2 = apply(v, Shuffle(v, identity, 0x4012) /* [id, v.y, v.z, v.w] */); // [x] [xy] [yz] [zw]
+ TYPE v3 = apply(v2, Shuffle(v2, identity, 0x4401) /* [id, id, v2.x, v2.y] */); // [x] [xy] [xyz] [xyzw]
+ auto v4 = Shuffle(v3, identity, 0x4012 /* [id, v3.x, v3.y, v3.z] */); // [i] [x] [xy] [xyz]
dst.move(i, v4);
break;
}
diff --git a/src/Reactor/Reactor.cpp b/src/Reactor/Reactor.cpp
index a90f967..29e1292 100644
--- a/src/Reactor/Reactor.cpp
+++ b/src/Reactor/Reactor.cpp
@@ -3523,7 +3523,7 @@
return RValue<Int4>(createSwizzle4(x.value, select));
}
- RValue<Int4> Blend(RValue<Int4> x, RValue<Int4> y, unsigned short select)
+ RValue<Int4> Shuffle(RValue<Int4> x, RValue<Int4> y, unsigned short select)
{
return RValue<Int4>(createBlend4(x.value, y.value, select));
}
@@ -3763,7 +3763,7 @@
return RValue<UInt4>(createSwizzle4(x.value, select));
}
- RValue<UInt4> Blend(RValue<UInt4> x, RValue<UInt4> y, unsigned short select)
+ RValue<UInt4> Shuffle(RValue<UInt4> x, RValue<UInt4> y, unsigned short select)
{
return RValue<UInt4>(createBlend4(x.value, y.value, select));
}
@@ -4263,7 +4263,7 @@
return RValue<Float4>(createSwizzle4(x.value, select));
}
- RValue<Float4> Blend(RValue<Float4> x, RValue<Float4> y, uint16_t select)
+ RValue<Float4> Shuffle(RValue<Float4> x, RValue<Float4> y, uint16_t select)
{
return RValue<Float4>(createBlend4(x.value, y.value, select));
}
diff --git a/src/Reactor/Reactor.hpp b/src/Reactor/Reactor.hpp
index 8dc3a2f..168764a 100644
--- a/src/Reactor/Reactor.hpp
+++ b/src/Reactor/Reactor.hpp
@@ -1946,7 +1946,7 @@
RValue<Int4> Insert(RValue<Int4> val, RValue<Int> element, int i);
RValue<Int> SignMask(RValue<Int4> x);
RValue<Int4> Swizzle(RValue<Int4> x, uint16_t select);
- RValue<Int4> Blend(RValue<Int4> x, RValue<Int4> y, uint16_t select);
+ RValue<Int4> Shuffle(RValue<Int4> x, RValue<Int4> y, uint16_t select);
RValue<Int4> MulHigh(RValue<Int4> x, RValue<Int4> y);
class UInt4 : public LValue<UInt4>, public XYZW<UInt4>
@@ -2031,7 +2031,7 @@
RValue<UInt4> Insert(RValue<UInt4> val, RValue<UInt> element, int i);
// RValue<UInt4> RoundInt(RValue<Float4> cast);
RValue<UInt4> Swizzle(RValue<UInt4> x, uint16_t select);
- RValue<UInt4> Blend(RValue<UInt4> x, RValue<UInt4> y, uint16_t select);
+ RValue<UInt4> Shuffle(RValue<UInt4> x, RValue<UInt4> y, uint16_t select);
class Half : public LValue<Half>
{
@@ -2258,7 +2258,7 @@
RValue<Float4> Insert(RValue<Float4> val, RValue<Float> element, int i);
RValue<Float> Extract(RValue<Float4> x, int i);
RValue<Float4> Swizzle(RValue<Float4> x, uint16_t select);
- RValue<Float4> Blend(RValue<Float4> x, RValue<Float4> y, uint16_t select);
+ RValue<Float4> Shuffle(RValue<Float4> x, RValue<Float4> y, uint16_t select);
RValue<Float4> ShuffleLowHigh(RValue<Float4> x, RValue<Float4> y, uint16_t imm);
RValue<Float4> UnpackLow(RValue<Float4> x, RValue<Float4> y);
RValue<Float4> UnpackHigh(RValue<Float4> x, RValue<Float4> y);
diff --git a/src/Reactor/ReactorUnitTests.cpp b/src/Reactor/ReactorUnitTests.cpp
index d76622f..62249a6 100644
--- a/src/Reactor/ReactorUnitTests.cpp
+++ b/src/Reactor/ReactorUnitTests.cpp
@@ -520,17 +520,17 @@
{
unsigned short select = rangeIndexToSelect(i);
- *Pointer<Float4>(out + 16 * i) = Blend(Float4(1.0f, 2.0f, 3.0f, 4.0f),
- Float4(5.0f, 6.0f, 7.0f, 8.0f),
- select);
+ *Pointer<Float4>(out + 16 * i) = Shuffle(Float4(1.0f, 2.0f, 3.0f, 4.0f),
+ Float4(5.0f, 6.0f, 7.0f, 8.0f),
+ select);
- *Pointer<Int4>(out + (kSelectRange + i) * 16) = Blend(Int4(10, 11, 12, 13),
- Int4(14, 15, 16, 17),
- select);
+ *Pointer<Int4>(out + (kSelectRange + i) * 16) = Shuffle(Int4(10, 11, 12, 13),
+ Int4(14, 15, 16, 17),
+ select);
- *Pointer<UInt4>(out + (2 * kSelectRange + i) * 16) = Blend(UInt4(100, 101, 102, 103),
- UInt4(104, 105, 106, 107),
- select);
+ *Pointer<UInt4>(out + (2 * kSelectRange + i) * 16) = Shuffle(UInt4(100, 101, 102, 103),
+ UInt4(104, 105, 106, 107),
+ select);
}
Return(0);
