Initialize buffer and texture handles with VRHI_INVALID_HANDLE in vhState struct

Author: hypernewbie

test/test_state.cpp

@@ -95,6 +95,10 @@ UTEST_F( State, MultipleSlots )
 
     EXPECT_EQ( r1.viewRect, state1.viewRect );
     EXPECT_EQ( r2.viewRect, state2.viewRect );
+
+    vhState s;
+    vhGetState( id1, s.DirtyAll() );
+    vhGetState( id2, s.DirtyAll() );
 }
 
 UTEST_F( State, InvalidId )
@@ -129,6 +133,9 @@ UTEST_F( State, BasicSetGet )
     EXPECT_EQ( retrieved.projMatrix, state.projMatrix );
     ASSERT_GT( retrieved.worldMatrix.size(), 0 );
     EXPECT_EQ( retrieved.worldMatrix[0], state.worldMatrix[0] );
+
+    vhState s;
+    vhSetState( id, s.DirtyAll() );
 }
 
 UTEST_F( State, Attachments )
@@ -155,6 +162,9 @@ UTEST_F( State, Attachments )
     EXPECT_EQ( retrieved.colourAttachment[0].texture, 101u );
     EXPECT_EQ( retrieved.colourAttachment[0].mipLevel, 1u );
     EXPECT_EQ( retrieved.depthAttachment.texture, 201u );
+
+    vhState s;
+    vhSetState( id, s.DirtyAll() );
 }
 
 UTEST_F( State, Extensions )
@@ -251,6 +261,9 @@ UTEST_F( State, BackendPropagation )
     // Verify it doesn't bleed to other states
     vhState otherState;
     EXPECT_FALSE( vhGetState( 999, otherState ) );
+
+    vhState s;
+    vhSetState( id, s.DirtyAll() );
 }
 
 UTEST_F( State, IndividualAccessors )
@@ -353,6 +366,9 @@ UTEST_F( State, DebugFlags )
     vhState retrieved = {};
     ASSERT_TRUE( vhGetState( id, retrieved ) );
     EXPECT_EQ( retrieved.debugFlags, VRHI_STATE_DEBUG_LOG_MISSING_BINDINGS );
+
+    vhState s;
+    vhSetState( id, s.DirtyAll() );
 }
 
 UTEST_F( State, Hashing_GraphicsPipeline )
@@ -859,4 +875,7 @@ UTEST_F( State, MissingFieldsCheck )
     // Indirect Params
     EXPECT_EQ( ret.indirectParams.buffer, dummyBuf );
     EXPECT_EQ( ret.indirectParams.byteOffset, 128u );
+
+    vhState s;
+    vhSetState( id, s.DirtyAll() );
 }

vrhi.h

@@ -730,7 +730,6 @@ struct vhState
     glm::u8vec4 clearColorUInt = glm::u8vec4( 0 );
     float clearDepth = 1.0f;
     uint8_t clearStencil = 0;
-
     uint64_t stencilState = 0;
 
     glm::vec4 pushConstants = glm::vec4( 0.0f, 0.0f, 0.0f, 0.0f );
@@ -760,7 +759,7 @@ struct vhState
 
     struct VertexBinding
     {
-        vhBuffer buffer;
+        vhBuffer buffer = VRHI_INVALID_HANDLE;
         uint8_t stream = 0;
         uint32_t startVertex = 0;
         uint32_t numVertices = UINT32_MAX;
@@ -770,7 +769,7 @@ struct vhState
 
     struct IndexBinding
     {
-        vhBuffer buffer;
+        vhBuffer buffer = VRHI_INVALID_HANDLE;
         uint32_t firstIndex = 0;
         uint32_t numIndices = UINT32_MAX;
         uint64_t byteOffset = 0;
@@ -781,7 +780,7 @@ struct vhState
     {
         const char* name = nullptr; // Setting this will autofill slot and computeUAV.
         int32_t slot = -1;
-        vhTexture texture;
+        vhTexture texture = VRHI_INVALID_HANDLE;
         nvrhi::Format formatOverride = nvrhi::Format::UNKNOWN;
         nvrhi::TextureSubresourceSet subresources = nvrhi::TextureSubresourceSet( 0, 1, 0, nvrhi::TextureSubresourceSet::AllArraySlices );
         nvrhi::TextureDimension dimensionOverride = nvrhi::TextureDimension::Unknown;
@@ -793,7 +792,7 @@ struct vhState
     {
         const char* name = nullptr; // Setting this will autofill slot and computeUAV.
         int32_t slot = -1;
-        vhBuffer buffer;
+        vhBuffer buffer = VRHI_INVALID_HANDLE;
         uint64_t byteOffset = 0;
         uint64_t byteSize = 0;
         bool computeUAV = false;