Skip to content

Commit 4491cba

Browse files
committed
Clean-up
1 parent f0f5c70 commit 4491cba

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
@@ -665,7 +665,6 @@ DynamicArray<ExecutionGraphNode> ParseExecutionGraph( std::string& src ) {
665665
nodesToSPIRV[token] = id;
666666

667667
uint32 nodeDeps;
668-
uint32 nodeDepsTypes;
669668

670669
switch ( spirv.type ) {
671670
case SPIRV_COMPUTE:
@@ -834,7 +833,6 @@ DynamicArray<ExecutionGraphNode> ParseExecutionGraph( std::string& src ) {
834833

835834
if ( o == "present" ) {
836835
uint32 nodeDeps;
837-
uint32 nodeDepsTypes;
838836

839837
ParseNodeDeps( v, nodesToSPIRV, &nodeDeps );
840838

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

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

4141
#include "Buffers.glsl"
4242

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

45-
layout ( scalar, push_constant ) uniform Push {
45+
Push {
4646
const uint* msgStreamRead;
4747
uint* msgStreamWrite;
4848
uint* buf2;
4949
uint* buf3;
5050
uint* buf4;
51-
} push;
51+
};
5252

5353
void PushMsg( inout uint id, const uint msg ) {
5454
msgStreamWrite[id + 1] = msg;
@@ -82,12 +82,7 @@ void PushMsg( inout uint id, const bool msg ) {
8282
// Image2D testImg2 { rgba16f rel 1.0f };
8383
Image2D testImg3 { rgba16f 1 1 };
8484
Image3D testImg4 { rgba16f 1 1 5 };
85-
ImageCube testImg5 { rgba16f 1 1 5 };
86-
87-
Buffer buf1 { 566 3 };
88-
Buffer buf2 { 5667 30 };
89-
Buffer buf3 { 5664545 0 };
90-
Buffer buf5 { 5664545 };
85+
ImageCube testImg5 { rgba16f 1 1 };
9186

9287
void main() [[maximally_reconverges]] {
9388
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
@@ -35,14 +35,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3535

3636
#include "Resources.glsl"
3737

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

40-
layout ( scalar, push_constant ) uniform Push {
40+
Push {
4141
EntityMsg* entityRingBuffer;
4242
LightMsg* lightRingBuffer;
4343
Entity* entities;
4444
Light* lights;
45-
} push;
45+
};
4646

4747
void main() {
4848
const uint globalGroupID = GLOBAL_GROUP_ID;

0 commit comments

Comments
 (0)