gpu: More pre-work to combine Printf and GPUAV

BUILD.gn

@@ -161,8 +161,6 @@ vvl_sources = [
   "layers/gpu/cmd_validation/gpuav_trace_rays.h",
   "layers/gpu/core/gpu_settings.h",
   "layers/gpu/core/gpu_shader_cache_hash.h",
-  "layers/gpu/core/gpu_state_tracker.cpp",
-  "layers/gpu/core/gpu_state_tracker.h",
   "layers/gpu/core/gpuav.h",
   "layers/gpu/core/gpuav_constants.h",
   "layers/gpu/core/gpuav_record.cpp",

layers/CMakeLists.txt

@@ -239,8 +239,6 @@ target_sources(vvl PRIVATE
     gpu/descriptor_validation/gpuav_image_layout.h
     gpu/descriptor_validation/gpuav_image_layout.cpp
     gpu/core/gpuav.h
-    gpu/core/gpu_state_tracker.cpp
-    gpu/core/gpu_state_tracker.h
     gpu/core/gpuav_record.cpp
     gpu/core/gpuav_setup.cpp
     gpu/debug_printf/debug_printf.cpp

layers/gpu/core/gpuav.h

@@ -55,7 +55,10 @@ class Validator : public gpu::GpuShaderInstrumentor {
     using Field = vvl::Field;
 
   public:
-    Validator() { container_type = LayerObjectTypeGpuAssisted; }
+    Validator() {
+        container_type = LayerObjectTypeGpuAssisted;
+        gpuav_enabled = true;
+    }
 
     // gpuav_setup.cpp
     // -------------

layers/gpu/debug_printf/debug_printf.cpp

@@ -21,7 +21,6 @@
 #include "generated/layer_chassis_dispatch.h"
 #include "chassis/chassis_modification_state.h"
 #include "gpu/shaders/gpu_error_header.h"
-#include "vk_layer_config.h"
 
 #include <iostream>
 
@@ -40,13 +39,6 @@ void Validator::PostCreateDevice(const VkDeviceCreateInfo *pCreateInfo, const Lo
         return;
     }
 
-    // This option was published when DebugPrintf came out, leave to not break people's flow
-    // Deprecated right after the 1.3.280 SDK release
-    if (!GetEnvironment("DEBUG_PRINTF_TO_STDOUT").empty()) {
-        InternalWarning(device, loc, "DEBUG_PRINTF_TO_STDOUT was set, this is deprecated, please use VK_LAYER_PRINTF_TO_STDOUT");
-        gpuav_settings.debug_printf_to_stdout = true;
-    }
-
     debug_printf_binding_slot_ = (uint32_t)instrumentation_bindings_.size();  // get next free binding
     instrumentation_bindings_.emplace_back(
         VkDescriptorSetLayoutBinding{debug_printf_binding_slot_, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1,

layers/gpu/debug_printf/debug_printf.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gpu/core/gpu_state_tracker.h"
+#include "gpu/resources/gpuav_subclasses.h"
 #include "gpu/instrumentation/gpu_shader_instrumentor.h"
 #include "gpu/resources/gpu_resources.h"
 
@@ -65,7 +65,10 @@ namespace debug_printf {
 class Validator : public gpu::GpuShaderInstrumentor {
   public:
     using BaseClass = gpu::GpuShaderInstrumentor;
-    Validator() { container_type = LayerObjectTypeDebugPrintf; }
+    Validator() {
+        container_type = LayerObjectTypeDebugPrintf;
+        debug_printf_enabled = true;
+    }
 
     void PreCallRecordCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo,
                                    const VkAllocationCallbacks* pAllocator, VkDevice* pDevice, const RecordObject& record_obj,

layers/gpu/instrumentation/gpu_shader_instrumentor.cpp

@@ -17,14 +17,14 @@
 
 #include "gpu/instrumentation/gpu_shader_instrumentor.h"
 
-#include "gpu/core/gpu_state_tracker.h"
 #include "gpu/spirv/module.h"
 #include "chassis/chassis_modification_state.h"
 #include "gpu/shaders/gpu_error_codes.h"
 #include "spirv-tools/optimizer.hpp"
 #include "utils/vk_layer_utils.h"
 #include "state_tracker/descriptor_sets.h"
 #include "state_tracker/shader_object_state.h"
+#include "vk_layer_config.h"
 
 #include <cassert>
 #include <regex>
@@ -261,6 +261,13 @@ void GpuShaderInstrumentor::PostCreateDevice(const VkDeviceCreateInfo *pCreateIn
         return;
     }
 
+    // This option was published when DebugPrintf came out, leave to not break people's flow
+    // Deprecated right after the 1.3.280 SDK release
+    if (!GetEnvironment("DEBUG_PRINTF_TO_STDOUT").empty()) {
+        InternalWarning(device, loc, "DEBUG_PRINTF_TO_STDOUT was set, this is deprecated, please use VK_LAYER_PRINTF_TO_STDOUT");
+        gpuav_settings.debug_printf_to_stdout = true;
+    }
+
     // If api version 1.1 or later, SetDeviceLoaderData will be in the loader
     auto chain_info = GetChainInfo(pCreateInfo, VK_LOADER_DATA_CALLBACK);
     assert(chain_info->u.pfnSetDeviceLoaderData);
@@ -1362,7 +1369,7 @@ bool GpuShaderInstrumentor::InstrumentShader(const vvl::span<const uint32_t> &in
     gpu::spirv::Module module(input_spirv, debug_report, module_settings);
 
     // For now, we don't yet support (or have tested) combining GPU-AV and DebugPrintf, so have 2 paths here
-    const bool is_debug_printf = container_type == LayerObjectTypeDebugPrintf;
+    const bool is_debug_printf = debug_printf_enabled;
 
     bool modified = false;
     if (is_debug_printf) {
@@ -1486,9 +1493,8 @@ void GpuShaderInstrumentor::InternalError(LogObjectList objlist, const Location
         vmaFreeStatsString(vma_allocator_, stats_string);
     }
 
-    char const *layer_name = container_type == LayerObjectTypeDebugPrintf ? "DebugPrintf" : "GPU-AV";
-    char const *vuid =
-        container_type == LayerObjectTypeDebugPrintf ? "UNASSIGNED-DEBUG-PRINTF" : "UNASSIGNED-GPU-Assisted-Validation";
+    char const *layer_name = debug_printf_enabled ? "DebugPrintf" : "GPU-AV";
+    char const *vuid = debug_printf_enabled ? "UNASSIGNED-DEBUG-PRINTF" : "UNASSIGNED-GPU-Assisted-Validation";
 
     LogError(vuid, objlist, loc, "Internal Error, %s is being disabled. Details:\n%s", layer_name, error_message.c_str());
 
@@ -1499,7 +1505,7 @@ void GpuShaderInstrumentor::InternalError(LogObjectList objlist, const Location
 }
 
 void GpuShaderInstrumentor::InternalWarning(LogObjectList objlist, const Location &loc, const char *const specific_message) const {
-    char const *vuid = container_type == LayerObjectTypeDebugPrintf ? "WARNING-DEBUG-PRINTF" : "WARNING-GPU-Assisted-Validation";
+    char const *vuid = debug_printf_enabled ? "WARNING-DEBUG-PRINTF" : "WARNING-GPU-Assisted-Validation";
     LogWarning(vuid, objlist, loc, "Internal Warning: %s", specific_message);
 }
 
@@ -1750,7 +1756,7 @@ std::string GpuShaderInstrumentor::GenerateDebugInfoMessage(
     }
 
     std::string prefix;
-    if (container_type == LayerObjectTypeDebugPrintf) {
+    if (debug_printf_enabled) {
         prefix = "Debug shader printf message generated ";
     } else {
         prefix = "Shader validation error occurred ";