Merge branch 'master' into stateStackPointer

Author: robertosfield

cmake/cppcheck-suppression-list.txt

@@ -115,6 +115,7 @@ unusedStructMember:*/include/vsg/state/BufferInfo.h
 unusedStructMember:*/include/vsg/utils/Instrumentation.h
 unusedStructMember:*/include/vsg/utils/ShaderSet.h
 unusedStructMember:*/include/vsg/utils/LoadPagedLOD.h
+unusedStructMember:*/include/vsg/utils/Profiler.h
 
 // suppress warnings about unused variables
 unusedVariable:*/src/vsg/io/FileSystem.cpp

include/vsg/utils/Profiler.h

@@ -130,7 +130,6 @@ namespace vsg
         struct FrameStatsCollection
         {
             FrameStatsCollection() {}
-
             std::vector<ref_ptr<GPUStatsCollection>> gpuStats;
         };
 

src/vsg/utils/Profiler.cpp

@@ -253,12 +253,8 @@ void Profiler::enterCommandBuffer(const SourceLocation* sl, uint64_t& reference,
 {
     if (settings->gpu_instrumentation_level >= sl->level)
     {
-        auto& frameStats = perFrameGPUStats[frameIndex];
-
         uint32_t numQueries = settings->gpu_timestamp_size;
-
         auto& gpuStats = commandBuffer.gpuStats;
-
         if (!gpuStats)
         {
             auto physicalDevice = commandBuffer.getDevice()->getPhysicalDevice();
@@ -277,6 +273,7 @@ void Profiler::enterCommandBuffer(const SourceLocation* sl, uint64_t& reference,
                 gpuStats->references.resize(numQueries);
                 gpuStats->timestamps.resize(numQueries);
 
+                auto& frameStats = perFrameGPUStats[frameIndex];
                 frameStats.gpuStats.push_back(gpuStats);
             }
             else