Include Vulkan version of debug support in vulkan files Bug: b/73656151 Change-Id: I93a4ad7c28f2177224ba3b3ae39c9eaba6c72f39 Reviewed-on: https://swiftshader-review.googlesource.com/c/23690 Tested-by: Chris Forbes <chrisforbes@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Device/Blitter.cpp b/src/Device/Blitter.cpp index a082020..b86e4f9 100644 --- a/src/Device/Blitter.cpp +++ b/src/Device/Blitter.cpp
@@ -17,7 +17,7 @@ #include "Pipeline/ShaderCore.hpp" #include "Reactor/Reactor.hpp" #include "System/Memory.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" namespace sw {
diff --git a/src/Device/Clipper.cpp b/src/Device/Clipper.cpp index 029b93b..e20b041 100644 --- a/src/Device/Clipper.cpp +++ b/src/Device/Clipper.cpp
@@ -16,7 +16,7 @@ #include "Polygon.hpp" #include "Renderer.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" namespace sw {
diff --git a/src/Device/Context.cpp b/src/Device/Context.cpp index 7ed22b2..9e5835a 100644 --- a/src/Device/Context.cpp +++ b/src/Device/Context.cpp
@@ -19,7 +19,7 @@ #include "Pipeline/PixelShader.hpp" #include "Pipeline/VertexShader.hpp" #include "System/Memory.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" #include <string.h>
diff --git a/src/Device/PixelProcessor.cpp b/src/Device/PixelProcessor.cpp index b606a78..13168b8 100644 --- a/src/Device/PixelProcessor.cpp +++ b/src/Device/PixelProcessor.cpp
@@ -19,7 +19,7 @@ #include "Pipeline/PixelProgram.hpp" #include "Pipeline/PixelShader.hpp" #include "Pipeline/Constants.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" #include <string.h>
diff --git a/src/Device/QuadRasterizer.cpp b/src/Device/QuadRasterizer.cpp index 6251018..90d560d 100644 --- a/src/Device/QuadRasterizer.cpp +++ b/src/Device/QuadRasterizer.cpp
@@ -18,7 +18,7 @@ #include "Renderer.hpp" #include "Pipeline/Constants.hpp" #include "System/Math.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" namespace sw {
diff --git a/src/Device/Renderer.cpp b/src/Device/Renderer.cpp index a6fbaf4..bee130a 100644 --- a/src/Device/Renderer.cpp +++ b/src/Device/Renderer.cpp
@@ -29,7 +29,7 @@ #include "System/Half.hpp" #include "System/Math.hpp" #include "System/Timer.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" #undef max
diff --git a/src/Device/Sampler.cpp b/src/Device/Sampler.cpp index e310c62..841a15f 100644 --- a/src/Device/Sampler.cpp +++ b/src/Device/Sampler.cpp
@@ -17,7 +17,7 @@ #include "Context.hpp" #include "Surface.hpp" #include "Pipeline/PixelRoutine.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" #include <cstring>
diff --git a/src/Device/SetupProcessor.cpp b/src/Device/SetupProcessor.cpp index 029fb1a..a638a0d 100644 --- a/src/Device/SetupProcessor.cpp +++ b/src/Device/SetupProcessor.cpp
@@ -20,7 +20,7 @@ #include "Renderer.hpp" #include "Pipeline/SetupRoutine.hpp" #include "Pipeline/Constants.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" namespace sw {
diff --git a/src/Device/Surface.cpp b/src/Device/Surface.cpp index b367ec5..db8aec0 100644 --- a/src/Device/Surface.cpp +++ b/src/Device/Surface.cpp
@@ -22,7 +22,7 @@ #include "System/Memory.hpp" #include "System/CPUID.hpp" #include "System/Resource.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" #include "Reactor/Reactor.hpp" #if defined(__i386__) || defined(__x86_64__)
diff --git a/src/Device/SwiftConfig.cpp b/src/Device/SwiftConfig.cpp index e691c1b..db3a97d 100644 --- a/src/Device/SwiftConfig.cpp +++ b/src/Device/SwiftConfig.cpp
@@ -16,7 +16,7 @@ #include "Config.hpp" #include "System/Configurator.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" #include "Vulkan/Version.h" #include <sstream>
diff --git a/src/Device/VertexProcessor.cpp b/src/Device/VertexProcessor.cpp index c6cc68a..deacc28 100644 --- a/src/Device/VertexProcessor.cpp +++ b/src/Device/VertexProcessor.cpp
@@ -19,7 +19,7 @@ #include "Pipeline/PixelShader.hpp" #include "Pipeline/Constants.hpp" #include "System/Math.hpp" -#include "System/Debug.hpp" +#include "Vulkan/VkDebug.hpp" #include <string.h>