diff options
| author | Yong He <yonghe@outlook.com> | 2022-08-17 23:08:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-17 23:08:34 -0700 |
| commit | adaea0e993fd8db351b5dad92802e47ed6d0ec77 (patch) | |
| tree | dfad5201677b0202b0b890cbae066b5b2f3f033b /tests/compute | |
| parent | d65c6183c0d8b365aa182c3d9026ba85522531f2 (diff) | |
Warning on lossy implicit casts. (#2367)
* Warning on bool to float conversion.
* Fix test cases.
* Improve.
* LanguageServer: don't show constant value for non constant variables.
* Fix tests.
* Fix warnings in tests.
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'tests/compute')
45 files changed, 70 insertions, 70 deletions
diff --git a/tests/compute/array-existential-parameter.slang b/tests/compute/array-existential-parameter.slang index 2775c2add..813c5a40b 100644 --- a/tests/compute/array-existential-parameter.slang +++ b/tests/compute/array-existential-parameter.slang @@ -28,7 +28,7 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) { let tid = dispatchThreadID.x; - let inputVal : int = tid; + let inputVal : int = int(tid); let outputVal = gCb.values[0].run(inputVal) + gCb2.values[0].run(inputVal); gOutputBuffer[tid] = outputVal; diff --git a/tests/compute/array-param.slang b/tests/compute/array-param.slang index 3545dd75f..1ef913a8f 100644 --- a/tests/compute/array-param.slang +++ b/tests/compute/array-param.slang @@ -17,9 +17,9 @@ void writeArray(inout float3 a[4]) } [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { float3 b[4]; writeArray(b); - outputBuffer[dispatchThreadID.x] = b[0].x; + outputBuffer[dispatchThreadID.x] = int(b[0].x); }
\ No newline at end of file diff --git a/tests/compute/assoctype-lookup.slang b/tests/compute/assoctype-lookup.slang index e94c5471e..348391e21 100644 --- a/tests/compute/assoctype-lookup.slang +++ b/tests/compute/assoctype-lookup.slang @@ -42,7 +42,7 @@ int test(int val) {
OutputType rs;
rs.field.boneIds = 256;
- return rs.field.boneIds;
+ return int(rs.field.boneIds);
}
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=gOutputBuffer
@@ -52,7 +52,7 @@ RWStructuredBuffer<int> gOutputBuffer; void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
{
uint tid = dispatchThreadID.x;
- int inputVal = tid;
+ int inputVal = int(tid);
int outputVal = test(inputVal);
gOutputBuffer[tid] = outputVal;
}
\ No newline at end of file diff --git a/tests/compute/assoctype-nested.slang b/tests/compute/assoctype-nested.slang index 7bb251a26..a4a994e10 100644 --- a/tests/compute/assoctype-nested.slang +++ b/tests/compute/assoctype-nested.slang @@ -53,9 +53,9 @@ int test(int val) RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int inputVal = tid; int outputVal = test(inputVal); gOutputBuffer[tid] = outputVal; diff --git a/tests/compute/bound-check-zero-index.slang b/tests/compute/bound-check-zero-index.slang index e8244886e..61cb2e52e 100644 --- a/tests/compute/bound-check-zero-index.slang +++ b/tests/compute/bound-check-zero-index.slang @@ -25,7 +25,7 @@ RWStructuredBuffer<int> outputBuffer; RWStructuredBuffer<int> outputBuffer2; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int tid = dispatchThreadID.x; diff --git a/tests/compute/buffer-layout.slang b/tests/compute/buffer-layout.slang index 5caacff31..8c71904c6 100644 --- a/tests/compute/buffer-layout.slang +++ b/tests/compute/buffer-layout.slang @@ -121,9 +121,9 @@ int test(int val) [numthreads(4, 1, 1)] void computeMain( - uint3 dispatchThreadID : SV_DispatchThreadID) + int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int inVal = tid; int outVal = test(inVal); diff --git a/tests/compute/buffer-type-splitting.slang b/tests/compute/buffer-type-splitting.slang index d9fee4254..0ccad15de 100644 --- a/tests/compute/buffer-type-splitting.slang +++ b/tests/compute/buffer-type-splitting.slang @@ -17,15 +17,15 @@ struct S S s[2]; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint i = dispatchThreadID.x; + int i = dispatchThreadID.x; - int val = + int val = int( s[0].a.Load(i * 4) + s[1].a.Load(i * 4)*16 + s[0].b.Load(i * 4)*256 - + s[1].b.Load(i * 4)*4096; + + s[1].b.Load(i * 4)*4096); outputBuffer[i] = val; }
\ No newline at end of file diff --git a/tests/compute/byte-address-buffer.slang b/tests/compute/byte-address-buffer.slang index 462002edf..9bba63a1f 100644 --- a/tests/compute/byte-address-buffer.slang +++ b/tests/compute/byte-address-buffer.slang @@ -20,12 +20,12 @@ void test(int val) { uint tmp = val; - tmp = inputBuffer.Load(tmp * 4); + tmp = inputBuffer.Load(int(tmp * 4)); - uint2 pair = inputBuffer.Load2(tmp * 4); + uint2 pair = inputBuffer.Load2(int(tmp * 4)); tmp = (pair.x + pair.y) & 0xF; - uint4 quad = inputBuffer.Load4(tmp * 4); + uint4 quad = inputBuffer.Load4(int(tmp * 4)); tmp = (quad.x + quad.y + quad.z + quad.w) & 0xF; outputBuffer.Store(val * 4, tmp); diff --git a/tests/compute/cast-zero-to-struct.slang b/tests/compute/cast-zero-to-struct.slang index 383662420..13bd4bf68 100644 --- a/tests/compute/cast-zero-to-struct.slang +++ b/tests/compute/cast-zero-to-struct.slang @@ -29,7 +29,7 @@ int test(int val) RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 tid : SV_DispatchThreadID) +void computeMain(int3 tid : SV_DispatchThreadID) { int inVal = tid.x; int outVal = test(inVal); diff --git a/tests/compute/constexpr.slang b/tests/compute/constexpr.slang index 0d46d81a5..cf308e7d5 100644 --- a/tests/compute/constexpr.slang +++ b/tests/compute/constexpr.slang @@ -100,7 +100,7 @@ FragmentStageOutput fragmentMain(FragmentStageInput input) output.fragment.color = float4(color, 1.0); float4 val = float4(color, 1.0); - val = val - 16*tex.Sample(samp, uv, ab); + val = val - 16*tex.Sample(samp, uv, int2(ab)); outputBuffer[0] = 1; diff --git a/tests/compute/dynamic-dispatch-13.slang b/tests/compute/dynamic-dispatch-13.slang index d44029c23..f9ad9683b 100644 --- a/tests/compute/dynamic-dispatch-13.slang +++ b/tests/compute/dynamic-dispatch-13.slang @@ -22,7 +22,7 @@ RWStructuredBuffer<IInterface> gCb; RWStructuredBuffer<IInterface> gCb1; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { let tid = dispatchThreadID.x; diff --git a/tests/compute/dynamic-dispatch-14.slang b/tests/compute/dynamic-dispatch-14.slang index 7abb302f0..e605132c6 100644 --- a/tests/compute/dynamic-dispatch-14.slang +++ b/tests/compute/dynamic-dispatch-14.slang @@ -33,7 +33,7 @@ RWStructuredBuffer<IInterface> gCb; RWStructuredBuffer<IInterface> gCb1; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { let tid = dispatchThreadID.x; diff --git a/tests/compute/dynamic-dispatch-bindless-texture.slang b/tests/compute/dynamic-dispatch-bindless-texture.slang index 8a9d0c128..4611fbd48 100644 --- a/tests/compute/dynamic-dispatch-bindless-texture.slang +++ b/tests/compute/dynamic-dispatch-bindless-texture.slang @@ -14,7 +14,7 @@ RWStructuredBuffer<uint> gOutputBuffer; StructuredBuffer<IInterface> gCb; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { let tid = dispatchThreadID.x; @@ -22,7 +22,7 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) IInterface v0 = gCb.Load(0); SamplerState sampler; let outputVal = v0.run(); - gOutputBuffer[tid] = trunc(outputVal); + gOutputBuffer[tid] = uint(trunc(outputVal)); } //TEST_INPUT: globalExistentialType __Dynamic diff --git a/tests/compute/entry-point-uniform-params.slang b/tests/compute/entry-point-uniform-params.slang index f97874696..d150c4241 100644 --- a/tests/compute/entry-point-uniform-params.slang +++ b/tests/compute/entry-point-uniform-params.slang @@ -43,7 +43,7 @@ void computeMain( //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer uniform RWStructuredBuffer<int> outputBuffer, - uint3 dispatchThreadID : SV_DispatchThreadID) + int3 dispatchThreadID : SV_DispatchThreadID) { int tid = dispatchThreadID.x; diff --git a/tests/compute/enum.slang b/tests/compute/enum.slang index cae18404e..fe35f438c 100644 --- a/tests/compute/enum.slang +++ b/tests/compute/enum.slang @@ -24,7 +24,7 @@ int test(int val) if(c == Color.Red) { - if(val & 1) + if((val & 1) != 0) { c = Color.Blue; } @@ -56,9 +56,9 @@ int test(int val) RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int val = int(tid); val = test(val); diff --git a/tests/compute/frem.slang b/tests/compute/frem.slang index 75207a8d0..7890b9c9a 100644 --- a/tests/compute/frem.slang +++ b/tests/compute/frem.slang @@ -20,9 +20,9 @@ int test(int inVal) RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int inVal = tid; int outVal = test(inVal); outputBuffer[tid] = outVal; diff --git a/tests/compute/half-calc.slang b/tests/compute/half-calc.slang index 0f321ef98..bdb815eb2 100644 --- a/tests/compute/half-calc.slang +++ b/tests/compute/half-calc.slang @@ -22,9 +22,9 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) //half offset = v2.x + v2.y; - half offset = 0.0f; + half offset = half(0.0f); - half v = tid; + half v = half(tid); v *= half(3.0f); v += half(1.0f); v += offset; diff --git a/tests/compute/half-rw-texture-convert.slang b/tests/compute/half-rw-texture-convert.slang index f3d8eedb5..1d98dd770 100644 --- a/tests/compute/half-rw-texture-convert.slang +++ b/tests/compute/half-rw-texture-convert.slang @@ -27,7 +27,7 @@ RWTexture2D<float4> rwt2D_4; RWStructuredBuffer<float> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int idx = dispatchThreadID.x; diff --git a/tests/compute/half-rw-texture-convert2.slang b/tests/compute/half-rw-texture-convert2.slang index 1937b4c8e..8b9a329bc 100644 --- a/tests/compute/half-rw-texture-convert2.slang +++ b/tests/compute/half-rw-texture-convert2.slang @@ -24,7 +24,7 @@ RWTexture2D<float4> rwt2D_4; RWStructuredBuffer<float> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int idx = dispatchThreadID.x; diff --git a/tests/compute/half-structured-buffer.slang b/tests/compute/half-structured-buffer.slang index e701bb0fa..973e84e7b 100644 --- a/tests/compute/half-structured-buffer.slang +++ b/tests/compute/half-structured-buffer.slang @@ -25,7 +25,7 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) Thing thing; thing.pos = tid; - thing.color = half4(base, base + 1.0f, base + 2.0f, base + 3.0f); + thing.color = half4(float4(base, base + 1.0f, base + 2.0f, base + 3.0f)); thing.radius = v; outputBuffer[tid] = thing; diff --git a/tests/compute/half-vector-calc.slang b/tests/compute/half-vector-calc.slang index b145e27ec..6a888e263 100644 --- a/tests/compute/half-vector-calc.slang +++ b/tests/compute/half-vector-calc.slang @@ -8,16 +8,16 @@ RWStructuredBuffer<float> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int x = tid.x; half2 v3 = half2(float(x)); - half2 v0 = half2(x * 2.0f, x * 0.5f); - half3 v1 = half3(x * 2.0f, x * 0.5f, x - 1.0f); - half4 v2 = half4(x + 1, x - 1, x + 2 , x - 2); + half2 v0 = half2(float2(x * 2.0f, x * 0.5f)); + half3 v1 = half3(half(x * 2.0f), half(x * 0.5f), half(x - 1.0f)); + half4 v2 = half4(half(x + 1), half(x - 1), half(x + 2) , half(x - 2)); v1 += v0.yxy; v1 += v2.wzy; diff --git a/tests/compute/interface-local.slang b/tests/compute/interface-local.slang index 714a72cca..4c6e78cc2 100644 --- a/tests/compute/interface-local.slang +++ b/tests/compute/interface-local.slang @@ -44,7 +44,7 @@ RWStructuredBuffer<int> gOutputBuffer; void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) { uint tid = dispatchThreadID.x; - int inputVal = tid; + int inputVal = int(tid); int outputVal = test(inputVal); gOutputBuffer[tid] = outputVal; }
\ No newline at end of file diff --git a/tests/compute/interface-param.slang b/tests/compute/interface-param.slang index 3f557d8de..7d9307522 100644 --- a/tests/compute/interface-param.slang +++ b/tests/compute/interface-param.slang @@ -36,9 +36,9 @@ int test(int val) RWStructuredBuffer<int> gOutputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int inputVal = tid; int outputVal = test(inputVal); gOutputBuffer[tid] = outputVal; diff --git a/tests/compute/interface-shader-param-in-struct.slang b/tests/compute/interface-shader-param-in-struct.slang index 5080e4d57..1a4b12280 100644 --- a/tests/compute/interface-shader-param-in-struct.slang +++ b/tests/compute/interface-shader-param-in-struct.slang @@ -70,7 +70,7 @@ void computeMain( //TEST_INPUT: entryPointExistentialType MyModifier uniform Stuff stuff, - uint3 dispatchThreadID : SV_DispatchThreadID) + int3 dispatchThreadID : SV_DispatchThreadID) { let tid = dispatchThreadID.x; diff --git a/tests/compute/interface-shader-param.slang b/tests/compute/interface-shader-param.slang index e7c6ceb6a..a43b6f695 100644 --- a/tests/compute/interface-shader-param.slang +++ b/tests/compute/interface-shader-param.slang @@ -92,7 +92,7 @@ uniform IRandomNumberGenerationStrategy gStrategy; void computeMain( //TEST_INPUT:set modifier = new MyModifier{} uniform IModifier modifier, - uint3 dispatchThreadID : SV_DispatchThreadID) + int3 dispatchThreadID : SV_DispatchThreadID) { let tid = dispatchThreadID.x; diff --git a/tests/compute/interface-static-method.slang b/tests/compute/interface-static-method.slang index d526f7c47..05224bdea 100644 --- a/tests/compute/interface-static-method.slang +++ b/tests/compute/interface-static-method.slang @@ -50,7 +50,7 @@ int test(int val) RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int tid = dispatchThreadID.x; outputBuffer[tid] = test(tid); diff --git a/tests/compute/matrix-layout-structured-buffer.slang b/tests/compute/matrix-layout-structured-buffer.slang index bdc2e1ced..6893a5df9 100644 --- a/tests/compute/matrix-layout-structured-buffer.slang +++ b/tests/compute/matrix-layout-structured-buffer.slang @@ -30,9 +30,9 @@ int test(int val) RWStructuredBuffer<int> buffer; [numthreads(12, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int val = tid; val = test(val); diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl index c655d06c7..571003a10 100644 --- a/tests/compute/matrix-layout.hlsl +++ b/tests/compute/matrix-layout.hlsl @@ -64,9 +64,9 @@ int test(int val) RWStructuredBuffer<int> buffer; [numthreads(12, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int val = tid; val = test(val); diff --git a/tests/compute/modern-syntax.slang b/tests/compute/modern-syntax.slang index e1a9ad146..d6bdcd3bd 100644 --- a/tests/compute/modern-syntax.slang +++ b/tests/compute/modern-syntax.slang @@ -19,9 +19,9 @@ func test(val: MyInt) -> MyInt RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; int val = test(tid); outputBuffer[tid] = val; }
\ No newline at end of file diff --git a/tests/compute/multiple-continue-sites.slang b/tests/compute/multiple-continue-sites.slang index 0776bfbdb..cf5033c9e 100644 --- a/tests/compute/multiple-continue-sites.slang +++ b/tests/compute/multiple-continue-sites.slang @@ -13,7 +13,7 @@ int test(int inVal) { int ii = inVal; - for(;!(ii & 0x20); ii += 0x10) + for(;!bool(ii & 0x20); ii += 0x10) { if(ii == 2) { diff --git a/tests/compute/mutating-and-inout.slang b/tests/compute/mutating-and-inout.slang index a92be2025..37cc30870 100644 --- a/tests/compute/mutating-and-inout.slang +++ b/tests/compute/mutating-and-inout.slang @@ -41,7 +41,7 @@ int test(int val) } [numthreads(4, 1, 1)] -void computeMain(uint3 tid : SV_DispatchThreadID) +void computeMain(int3 tid : SV_DispatchThreadID) { int val = tid.x; val = test(val); diff --git a/tests/compute/mutating-methods.slang b/tests/compute/mutating-methods.slang index 73be4b604..6f561e9a6 100644 --- a/tests/compute/mutating-methods.slang +++ b/tests/compute/mutating-methods.slang @@ -45,7 +45,7 @@ int test(int x) RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int tid = dispatchThreadID.x; outputBuffer[tid] = test(tid); diff --git a/tests/compute/pack-any-value-16bit.slang b/tests/compute/pack-any-value-16bit.slang index 1a7c96a16..07ad0590e 100644 --- a/tests/compute/pack-any-value-16bit.slang +++ b/tests/compute/pack-any-value-16bit.slang @@ -52,8 +52,8 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) v.v0 = 1; v.f0 = 2; v.v1 = 3; - v.v2 = 4; - v.v3 = 5; + v.v2 = half(4); + v.v3 = half(5); v.v4 = 6; IInterface dynamicObj1 = createDynamicObject<IInterface, Val>(11, v);; gOutputBuffer[1] = dynamicObj1.run(); diff --git a/tests/compute/rw-texture-simple.slang b/tests/compute/rw-texture-simple.slang index 268337956..5113dc807 100644 --- a/tests/compute/rw-texture-simple.slang +++ b/tests/compute/rw-texture-simple.slang @@ -19,7 +19,7 @@ RWTexture3D<float> rwt3D; RWStructuredBuffer<float> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int idx = dispatchThreadID.x; diff --git a/tests/compute/scope-operator.slang b/tests/compute/scope-operator.slang index 9b5b3f229..0622adc4a 100644 --- a/tests/compute/scope-operator.slang +++ b/tests/compute/scope-operator.slang @@ -38,7 +38,7 @@ int test(int val) if(c == Color::Red) { - if(val & 1) + if((val & 1) != 0) { c = Color::Blue; } diff --git a/tests/compute/semantic.slang b/tests/compute/semantic.slang index 49e9ff948..c0411f572 100644 --- a/tests/compute/semantic.slang +++ b/tests/compute/semantic.slang @@ -9,5 +9,5 @@ RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID, uint3 groupID : SV_GroupID, uint3 groupThreadID : SV_GroupThreadId) { - outputBuffer[dispatchThreadID.x] = (dispatchThreadID.x << 8) | (groupID.x << 4) | (groupThreadID.x); + outputBuffer[dispatchThreadID.x] = int((dispatchThreadID.x << 8) | (groupID.x << 4) | (groupThreadID.x)); }
\ No newline at end of file diff --git a/tests/compute/static-const-array.slang b/tests/compute/static-const-array.slang index 2afa1f39e..f18f7cb15 100644 --- a/tests/compute/static-const-array.slang +++ b/tests/compute/static-const-array.slang @@ -15,7 +15,7 @@ int test(int val) } [numthreads(4, 1, 1)] -void computeMain(uint3 tid : SV_DispatchThreadID) +void computeMain(int3 tid : SV_DispatchThreadID) { int inVal = tid.x; int outVal = test(inVal); diff --git a/tests/compute/static-const-matrix-array.slang b/tests/compute/static-const-matrix-array.slang index 9a468b6ed..afe2468f2 100644 --- a/tests/compute/static-const-matrix-array.slang +++ b/tests/compute/static-const-matrix-array.slang @@ -28,7 +28,7 @@ float test(int inVal, int index) } [numthreads(8, 1, 1)] -void computeMain(uint3 tid : SV_DispatchThreadID) +void computeMain(int3 tid : SV_DispatchThreadID) { int inVal = tid.x; float outVal = test(inVal, inVal & 1); diff --git a/tests/compute/static-const-vector-array.slang b/tests/compute/static-const-vector-array.slang index edfe24028..e3611bcde 100644 --- a/tests/compute/static-const-vector-array.slang +++ b/tests/compute/static-const-vector-array.slang @@ -25,7 +25,7 @@ float test(int val) } [numthreads(8, 1, 1)] -void computeMain(uint3 tid : SV_DispatchThreadID) +void computeMain(int3 tid : SV_DispatchThreadID) { int inVal = tid.x; float outVal = test(inVal); diff --git a/tests/compute/struct-make.slang b/tests/compute/struct-make.slang index f42d76876..6cc3c48e5 100644 --- a/tests/compute/struct-make.slang +++ b/tests/compute/struct-make.slang @@ -20,9 +20,9 @@ struct Thing RWStructuredBuffer<int> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint tid = dispatchThreadID.x; + int tid = dispatchThreadID.x; Thing thing = Thing::make(tid); diff --git a/tests/compute/structured-buffer-of-matrices.slang b/tests/compute/structured-buffer-of-matrices.slang index b76061310..faa312fc2 100644 --- a/tests/compute/structured-buffer-of-matrices.slang +++ b/tests/compute/structured-buffer-of-matrices.slang @@ -33,7 +33,7 @@ int test(int val) } [numthreads(4, 1, 1)] -void computeMain(uint3 tid : SV_DispatchThreadID) +void computeMain(int3 tid : SV_DispatchThreadID) { int value = tid.x; value = test(value); diff --git a/tests/compute/texture-get-dimensions.slang b/tests/compute/texture-get-dimensions.slang index 91911f18a..526e9feb1 100644 --- a/tests/compute/texture-get-dimensions.slang +++ b/tests/compute/texture-get-dimensions.slang @@ -30,7 +30,7 @@ SamplerState samplerState; RWStructuredBuffer<float> outputBuffer; [numthreads(8, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int idx = dispatchThreadID.x; diff --git a/tests/compute/texture-simple.slang b/tests/compute/texture-simple.slang index f9acfe3f0..efa83edfb 100644 --- a/tests/compute/texture-simple.slang +++ b/tests/compute/texture-simple.slang @@ -32,7 +32,7 @@ SamplerState samplerState; RWStructuredBuffer<float> outputBuffer; [numthreads(4, 1, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { int idx = dispatchThreadID.x; float u = idx * (1.0f / 4); diff --git a/tests/compute/unbounded-array-of-array-syntax.slang b/tests/compute/unbounded-array-of-array-syntax.slang index 887b95d07..bba8605f2 100644 --- a/tests/compute/unbounded-array-of-array-syntax.slang +++ b/tests/compute/unbounded-array-of-array-syntax.slang @@ -29,7 +29,7 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) if (innerIndex >= bufferCount) { - innerIndex = bufferCount - 1; + innerIndex = int(bufferCount - 1); } outputBuffer[index] = buffer[innerIndex]; }
\ No newline at end of file diff --git a/tests/compute/vector-scalar-compare.slang b/tests/compute/vector-scalar-compare.slang index cd1088062..dab993a4c 100644 --- a/tests/compute/vector-scalar-compare.slang +++ b/tests/compute/vector-scalar-compare.slang @@ -7,9 +7,9 @@ RWStructuredBuffer<int> outputBuffer; [numthreads(4, 4, 1)] -void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +void computeMain(int3 dispatchThreadID : SV_DispatchThreadID) { - uint2 threadInGroup = dispatchThreadID.xy; + int2 threadInGroup = dispatchThreadID.xy; int r = 0; if(all((threadInGroup & 1) == 0)) |
