diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/bitonicSort.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/bitonicSort.comp index 3eef971..c5ce564 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/bitonicSort.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/bitonicSort.comp @@ -7,7 +7,7 @@ layout(set = 0, binding = 0, std140) uniform CB float Dir; } _19; -layout(set = 0, binding = 1, std430) buffer gridTable +layout(set = 2, binding = 0, std430) buffer gridTable { ivec2 _data[]; } gridTable_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGrid.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGrid.comp index 7964108..f2d6fbe 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGrid.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGrid.comp @@ -17,12 +17,12 @@ layout(set = 0, binding = 0, std140) uniform CB int ParticlesCount; } _52; -layout(set = 0, binding = 2, std430) buffer gridTable +layout(set = 2, binding = 1, std430) buffer gridTable { ivec2 _data[]; } gridTable_1; -layout(set = 0, binding = 1, std430) buffer particles +layout(set = 2, binding = 0, std430) buffer particles { Particle _data[]; } particles_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGridIndices.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGridIndices.comp index 8920fad..6416368 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGridIndices.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/buildGridIndices.comp @@ -6,12 +6,12 @@ layout(set = 0, binding = 0, std140) uniform CB int ParticlesCount; } _22; -layout(set = 0, binding = 1, std430) buffer gridTable +layout(set = 2, binding = 0, std430) buffer gridTable { ivec2 _data[]; } gridTable_1; -layout(set = 0, binding = 2, std430) buffer gridIndicesTable +layout(set = 2, binding = 1, std430) buffer gridIndicesTable { ivec2 _data[]; } gridIndicesTable_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/buildVBIB.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/buildVBIB.comp index 32d0d47..fe26b15 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/buildVBIB.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/buildVBIB.comp @@ -25,17 +25,17 @@ layout(set = 0, binding = 0, std140) uniform CB vec4 FixedColor; } _67; -layout(set = 0, binding = 1, std430) buffer particles +layout(set = 2, binding = 0, std430) buffer particles { Particle _data[]; } particles_1; -layout(set = 0, binding = 2, std430) buffer vertex_ +layout(set = 2, binding = 1, std430) buffer vertex_ { Vertex _data[]; } vertex_1; -layout(set = 0, binding = 3, std430) buffer index +layout(set = 2, binding = 2, std430) buffer index { int _data[]; } index_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/calcCorrectPosition.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/calcCorrectPosition.comp index 257d97a..a023e3c 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/calcCorrectPosition.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/calcCorrectPosition.comp @@ -22,17 +22,17 @@ layout(set = 0, binding = 0, std140) uniform CB float GWspiky; } _60; -layout(set = 0, binding = 3, std430) buffer gridIndicesTable +layout(set = 2, binding = 2, std430) buffer gridIndicesTable { ivec2 _data[]; } gridIndicesTable_1; -layout(set = 0, binding = 1, std430) buffer particles +layout(set = 2, binding = 0, std430) buffer particles { Particle _data[]; } particles_1; -layout(set = 0, binding = 2, std430) buffer gridTable +layout(set = 2, binding = 1, std430) buffer gridTable { ivec2 _data[]; } gridTable_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/calcExternalForce.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/calcExternalForce.comp index e87384b..2acb5fe 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/calcExternalForce.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/calcExternalForce.comp @@ -10,7 +10,7 @@ struct Particle uint IsFix; }; -layout(set = 0, binding = 1, std430) buffer particles +layout(set = 2, binding = 0, std430) buffer particles { Particle _data[]; } particles_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/calcScalingFactor.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/calcScalingFactor.comp index 840cfe4..4fc481b 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/calcScalingFactor.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/calcScalingFactor.comp @@ -22,17 +22,17 @@ layout(set = 0, binding = 0, std140) uniform CB float GWspiky; } _66; -layout(set = 0, binding = 3, std430) buffer gridIndicesTable +layout(set = 2, binding = 2, std430) buffer gridIndicesTable { ivec2 _data[]; } gridIndicesTable_1; -layout(set = 0, binding = 1, std430) buffer particles +layout(set = 2, binding = 0, std430) buffer particles { Particle _data[]; } particles_1; -layout(set = 0, binding = 2, std430) buffer gridTable +layout(set = 2, binding = 1, std430) buffer gridTable { ivec2 _data[]; } gridTable_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/clearGridIndices.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/clearGridIndices.comp index b6892fb..96f27da 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/clearGridIndices.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/clearGridIndices.comp @@ -1,7 +1,7 @@ #version 430 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -layout(set = 0, binding = 1, std430) buffer gridIndicesTable +layout(set = 2, binding = 0, std430) buffer gridIndicesTable { ivec2 _data[]; } gridIndicesTable_1; diff --git a/examples/Fluid2D/Shaders/GLSL_VULKAN/integrate.comp b/examples/Fluid2D/Shaders/GLSL_VULKAN/integrate.comp index abb90bb..ab74f5e 100644 --- a/examples/Fluid2D/Shaders/GLSL_VULKAN/integrate.comp +++ b/examples/Fluid2D/Shaders/GLSL_VULKAN/integrate.comp @@ -10,7 +10,7 @@ struct Particle uint IsFix; }; -layout(set = 0, binding = 1, std430) buffer particles +layout(set = 2, binding = 0, std430) buffer particles { Particle _data[]; } particles_1; diff --git a/examples/Fluid2D/Shaders/Metal/bitonicSort.comp b/examples/Fluid2D/Shaders/Metal/bitonicSort.comp index 246fef7..2c7711d 100644 --- a/examples/Fluid2D/Shaders/Metal/bitonicSort.comp +++ b/examples/Fluid2D/Shaders/Metal/bitonicSort.comp @@ -38,7 +38,7 @@ void _main(thread const uint3& dtid, constant CB& _19, device gridTable& gridTab gridTable_1._data[inc + i] = x1; } -kernel void main0(constant CB& _19 [[buffer(0)]], device gridTable& gridTable_1 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _19 [[buffer(0)]], device gridTable& gridTable_1 [[buffer(10)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/buildGrid.comp b/examples/Fluid2D/Shaders/Metal/buildGrid.comp index 459799f..28b79d9 100644 --- a/examples/Fluid2D/Shaders/Metal/buildGrid.comp +++ b/examples/Fluid2D/Shaders/Metal/buildGrid.comp @@ -62,7 +62,7 @@ void _main(thread const uint3& dtid, constant CB& _52, device gridTable& gridTab } } -kernel void main0(constant CB& _52 [[buffer(0)]], device particles& particles_1 [[buffer(1)]], device gridTable& gridTable_1 [[buffer(2)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _52 [[buffer(0)]], device particles& particles_1 [[buffer(10)]], device gridTable& gridTable_1 [[buffer(11)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/buildGridIndices.comp b/examples/Fluid2D/Shaders/Metal/buildGridIndices.comp index 479e1c1..8f29df8 100644 --- a/examples/Fluid2D/Shaders/Metal/buildGridIndices.comp +++ b/examples/Fluid2D/Shaders/Metal/buildGridIndices.comp @@ -49,7 +49,7 @@ void _main(thread const uint3& dtid, constant CB& _22, device gridTable& gridTab } } -kernel void main0(constant CB& _22 [[buffer(0)]], device gridTable& gridTable_1 [[buffer(1)]], device gridTable& gridIndicesTable [[buffer(2)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _22 [[buffer(0)]], device gridTable& gridTable_1 [[buffer(10)]], device gridTable& gridIndicesTable [[buffer(11)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/buildVBIB.comp b/examples/Fluid2D/Shaders/Metal/buildVBIB.comp index 1fde583..52a02e7 100644 --- a/examples/Fluid2D/Shaders/Metal/buildVBIB.comp +++ b/examples/Fluid2D/Shaders/Metal/buildVBIB.comp @@ -84,7 +84,7 @@ void _main(thread const uint3& dtid, constant CB& _67, device particles& particl index_1._data[(dtid.x * 6u) + 5u] = int((dtid.x * 4u) + 3u); } -kernel void main0(constant CB& _67 [[buffer(0)]], device particles& particles_1 [[buffer(1)]], device vertex_& vertex_1 [[buffer(2)]], device index& index_1 [[buffer(3)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _67 [[buffer(0)]], device particles& particles_1 [[buffer(10)]], device vertex_& vertex_1 [[buffer(11)]], device index& index_1 [[buffer(12)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/calcCorrectPosition.comp b/examples/Fluid2D/Shaders/Metal/calcCorrectPosition.comp index 1dea653..3efbc2b 100644 --- a/examples/Fluid2D/Shaders/Metal/calcCorrectPosition.comp +++ b/examples/Fluid2D/Shaders/Metal/calcCorrectPosition.comp @@ -127,7 +127,7 @@ void _main(thread const uint3& dtid, constant CB& _60, device gridIndicesTable& particles_1._data[id].Next += CalcPositionCorrection(param, _60, gridIndicesTable_1, particles_1, gridTable); } -kernel void main0(constant CB& _60 [[buffer(0)]], device particles& particles_1 [[buffer(1)]], device gridIndicesTable& gridTable [[buffer(2)]], device gridIndicesTable& gridIndicesTable_1 [[buffer(3)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _60 [[buffer(0)]], device particles& particles_1 [[buffer(10)]], device gridIndicesTable& gridTable [[buffer(11)]], device gridIndicesTable& gridIndicesTable_1 [[buffer(12)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/calcExternalForce.comp b/examples/Fluid2D/Shaders/Metal/calcExternalForce.comp index dbda0c9..28b0408 100644 --- a/examples/Fluid2D/Shaders/Metal/calcExternalForce.comp +++ b/examples/Fluid2D/Shaders/Metal/calcExternalForce.comp @@ -42,7 +42,7 @@ void _main(thread const uint3& dtid, device particles& particles_1, constant CB& particles_1._data[dtid.x].Next = pos; } -kernel void main0(constant CB& _41 [[buffer(0)]], device particles& particles_1 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _41 [[buffer(0)]], device particles& particles_1 [[buffer(10)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/calcScalingFactor.comp b/examples/Fluid2D/Shaders/Metal/calcScalingFactor.comp index fe82782..3d7f579 100644 --- a/examples/Fluid2D/Shaders/Metal/calcScalingFactor.comp +++ b/examples/Fluid2D/Shaders/Metal/calcScalingFactor.comp @@ -147,7 +147,7 @@ void _main(thread const uint3& dtid, constant CB& _66, device gridIndicesTable& CalcScalingFactor(param, _66, gridIndicesTable_1, particles_1, gridTable); } -kernel void main0(constant CB& _66 [[buffer(0)]], device particles& particles_1 [[buffer(1)]], device gridIndicesTable& gridTable [[buffer(2)]], device gridIndicesTable& gridIndicesTable_1 [[buffer(3)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _66 [[buffer(0)]], device particles& particles_1 [[buffer(10)]], device gridIndicesTable& gridTable [[buffer(11)]], device gridIndicesTable& gridIndicesTable_1 [[buffer(12)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/clearGridIndices.comp b/examples/Fluid2D/Shaders/Metal/clearGridIndices.comp index 1fa10db..4d23d2d 100644 --- a/examples/Fluid2D/Shaders/Metal/clearGridIndices.comp +++ b/examples/Fluid2D/Shaders/Metal/clearGridIndices.comp @@ -16,7 +16,7 @@ void _main(thread const uint3& dtid, device gridIndicesTable& gridIndicesTable_1 gridIndicesTable_1._data[dtid.x] = int2(2147483647); } -kernel void main0(device gridIndicesTable& gridIndicesTable_1 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(device gridIndicesTable& gridIndicesTable_1 [[buffer(10)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/Metal/integrate.comp b/examples/Fluid2D/Shaders/Metal/integrate.comp index 6cfd416..626907d 100644 --- a/examples/Fluid2D/Shaders/Metal/integrate.comp +++ b/examples/Fluid2D/Shaders/Metal/integrate.comp @@ -31,7 +31,7 @@ void _main(thread const uint3& dtid, device particles& particles_1, constant CB& particles_1._data[dtid.x].Current = particles_1._data[dtid.x].Next; } -kernel void main0(constant CB& _40 [[buffer(0)]], device particles& particles_1 [[buffer(1)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) +kernel void main0(constant CB& _40 [[buffer(0)]], device particles& particles_1 [[buffer(10)]], uint3 gl_GlobalInvocationID [[thread_position_in_grid]]) { uint3 dtid = gl_GlobalInvocationID; uint3 param = dtid; diff --git a/examples/Fluid2D/Shaders/SPIRV/bitonicSort.comp.spv b/examples/Fluid2D/Shaders/SPIRV/bitonicSort.comp.spv index 5943305..886fe47 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/bitonicSort.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/bitonicSort.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/buildGrid.comp.spv b/examples/Fluid2D/Shaders/SPIRV/buildGrid.comp.spv index 91ee3df..f1a2357 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/buildGrid.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/buildGrid.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/buildGridIndices.comp.spv b/examples/Fluid2D/Shaders/SPIRV/buildGridIndices.comp.spv index 074b45f..4ed858f 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/buildGridIndices.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/buildGridIndices.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/buildVBIB.comp.spv b/examples/Fluid2D/Shaders/SPIRV/buildVBIB.comp.spv index 520b65e..26bec3d 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/buildVBIB.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/buildVBIB.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/calcCorrectPosition.comp.spv b/examples/Fluid2D/Shaders/SPIRV/calcCorrectPosition.comp.spv index 1116712..b0e838b 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/calcCorrectPosition.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/calcCorrectPosition.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/calcExternalForce.comp.spv b/examples/Fluid2D/Shaders/SPIRV/calcExternalForce.comp.spv index b2a9f27..7e2d983 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/calcExternalForce.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/calcExternalForce.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/calcScalingFactor.comp.spv b/examples/Fluid2D/Shaders/SPIRV/calcScalingFactor.comp.spv index 71e5e22..e68ed00 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/calcScalingFactor.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/calcScalingFactor.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/clearGridIndices.comp.spv b/examples/Fluid2D/Shaders/SPIRV/clearGridIndices.comp.spv index d6051d5..e31c1ee 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/clearGridIndices.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/clearGridIndices.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/integrate.comp.spv b/examples/Fluid2D/Shaders/SPIRV/integrate.comp.spv index 5d2a966..bc42d78 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/integrate.comp.spv and b/examples/Fluid2D/Shaders/SPIRV/integrate.comp.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/render.frag.spv b/examples/Fluid2D/Shaders/SPIRV/render.frag.spv index 275e7ec..f7db3c1 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/render.frag.spv and b/examples/Fluid2D/Shaders/SPIRV/render.frag.spv differ diff --git a/examples/Fluid2D/Shaders/SPIRV/render.vert.spv b/examples/Fluid2D/Shaders/SPIRV/render.vert.spv index fe8e5d8..804af04 100644 Binary files a/examples/Fluid2D/Shaders/SPIRV/render.vert.spv and b/examples/Fluid2D/Shaders/SPIRV/render.vert.spv differ