Skip to content

Commit 9bb8a97

Browse files
committed
Clean-up
1 parent 4c1a996 commit 9bb8a97

3 files changed

Lines changed: 7 additions & 14 deletions

File tree

src/engine/renderer-vulkan/GraphicsCore/ExecutionGraph/ExecutionGraph.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,6 @@ DynamicArray<ExecutionGraphNode> ParseExecutionGraph( std::string& src ) {
670670
nodesToSPIRV[token] = id;
671671

672672
uint32 nodeDeps;
673-
uint32 nodeDepsTypes;
674673

675674
switch ( spirv.type ) {
676675
case SPIRV_COMPUTE:
@@ -839,7 +838,6 @@ DynamicArray<ExecutionGraphNode> ParseExecutionGraph( std::string& src ) {
839838

840839
if ( o == "present" ) {
841840
uint32 nodeDeps;
842-
uint32 nodeDepsTypes;
843841

844842
ParseNodeDeps( v, nodesToSPIRV, &nodeDeps );
845843

src/engine/renderer-vulkan/GraphicsEngine/MsgStream.glsl

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4646

4747
#include "Buffers.glsl"
4848

49-
layout ( local_size_x = 64, local_size_y = 1, local_size_z = 1 ) in;
49+
WorkGroupSize { 64 };
5050

51-
layout ( scalar, push_constant ) uniform Push {
51+
Push {
5252
const uint* msgStreamRead;
5353
uint* msgStreamWrite;
5454
uint* buf2;
5555
uint* buf3;
5656
uint* buf4;
57-
} push;
57+
};
5858

5959
void PushMsg( inout uint id, const uint msg ) {
6060
msgStreamWrite[id + 1] = msg;
@@ -88,12 +88,7 @@ void PushMsg( inout uint id, const bool msg ) {
8888
// Image2D testImg2 { rgba16f rel 1.0f };
8989
Image2D testImg3 { rgba16f 1 1 };
9090
Image3D testImg4 { rgba16f 1 1 5 };
91-
ImageCube testImg5 { rgba16f 1 1 5 };
92-
93-
Buffer buf1 { 566 3 };
94-
Buffer buf2 { 5667 30 };
95-
Buffer buf3 { 5664545 0 };
96-
Buffer buf5 { 5664545 };
91+
ImageCube testImg5 { rgba16f 1 1 };
9792

9893
void main() [[maximally_reconverges]] {
9994
const uint globalGroupID = GLOBAL_GROUP_ID;

src/engine/renderer-vulkan/GraphicsEngine/SparseCopy.glsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4141

4242
#include "Resources.glsl"
4343

44-
layout ( local_size_x = 64, local_size_y = 1, local_size_z = 1 ) in;
44+
WorkGroupSize { 64 };
4545

46-
layout ( scalar, push_constant ) uniform Push {
46+
Push {
4747
EntityMsg* entityRingBuffer;
4848
LightMsg* lightRingBuffer;
4949
Entity* entities;
5050
Light* lights;
51-
} push;
51+
};
5252

5353
void main() {
5454
const uint globalGroupID = GLOBAL_GROUP_ID;

0 commit comments

Comments
 (0)