Skip to content

Commit

Permalink
re transpile
Browse files Browse the repository at this point in the history
  • Loading branch information
wraikny committed Aug 19, 2023
1 parent 49db265 commit 7bb2932
Show file tree
Hide file tree
Showing 29 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/GLSL_VULKAN/bitonicSort.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions examples/Fluid2D/Shaders/GLSL_VULKAN/buildGrid.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions examples/Fluid2D/Shaders/GLSL_VULKAN/buildGridIndices.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions examples/Fluid2D/Shaders/GLSL_VULKAN/buildVBIB.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions examples/Fluid2D/Shaders/GLSL_VULKAN/calcCorrectPosition.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions examples/Fluid2D/Shaders/GLSL_VULKAN/calcScalingFactor.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/GLSL_VULKAN/clearGridIndices.comp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/GLSL_VULKAN/integrate.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/bitonicSort.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/buildGrid.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/buildGridIndices.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/buildVBIB.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/calcCorrectPosition.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/calcExternalForce.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/calcScalingFactor.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/clearGridIndices.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion examples/Fluid2D/Shaders/Metal/integrate.comp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file modified examples/Fluid2D/Shaders/SPIRV/bitonicSort.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/buildGrid.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/buildGridIndices.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/buildVBIB.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/calcCorrectPosition.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/calcExternalForce.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/calcScalingFactor.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/clearGridIndices.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/integrate.comp.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/render.frag.spv
Binary file not shown.
Binary file modified examples/Fluid2D/Shaders/SPIRV/render.vert.spv
Binary file not shown.

0 comments on commit 7bb2932

Please sign in to comment.