Include Vulkan version of debug support in vulkan files

chrisforbes · chrisforbes · commit ebe5f7fad064 · 2019-01-31T18:00:48.000Z
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
 
diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
@@ -20,7 +20,7 @@
 #include "Device/QuadRasterizer.hpp"
 #include "Device/Surface.hpp"
 #include "Device/Primitive.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 namespace sw
 {
diff --git a/src/Pipeline/PixelShader.cpp b/src/Pipeline/PixelShader.cpp
@@ -14,7 +14,7 @@
 
 #include "PixelShader.hpp"
 
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 #include <string.h>
 
diff --git a/src/Pipeline/SamplerCore.cpp b/src/Pipeline/SamplerCore.cpp
@@ -15,7 +15,7 @@
 #include "SamplerCore.hpp"
 
 #include "Constants.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 namespace
 {
diff --git a/src/Pipeline/Shader.cpp b/src/Pipeline/Shader.cpp
@@ -17,7 +17,7 @@
 #include "VertexShader.hpp"
 #include "PixelShader.hpp"
 #include "System/Math.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 #include <set>
 #include <fstream>
diff --git a/src/Pipeline/ShaderCore.cpp b/src/Pipeline/ShaderCore.cpp
@@ -15,7 +15,7 @@
 #include "ShaderCore.hpp"
 
 #include "Device/Renderer.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 #include <limits.h>
 
diff --git a/src/Pipeline/ShaderCore.hpp b/src/Pipeline/ShaderCore.hpp
@@ -17,7 +17,7 @@
 
 #include "Shader.hpp"
 #include "Reactor/Reactor.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 namespace sw
 {
diff --git a/src/Pipeline/SpirvShader.cpp b/src/Pipeline/SpirvShader.cpp
@@ -15,7 +15,7 @@
 #include <spirv/unified1/spirv.hpp>
 #include "SpirvShader.hpp"
 #include "System/Math.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 #include "Device/Config.hpp"
 
 namespace sw
diff --git a/src/Pipeline/VertexProgram.cpp b/src/Pipeline/VertexProgram.cpp
@@ -19,7 +19,7 @@
 #include "Device/Renderer.hpp"
 #include "Device/Vertex.hpp"
 #include "System/Half.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 namespace sw
 {
diff --git a/src/Pipeline/VertexRoutine.cpp b/src/Pipeline/VertexRoutine.cpp
@@ -19,7 +19,7 @@
 #include "Device/Vertex.hpp"
 #include "Device/Renderer.hpp"
 #include "System/Half.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 namespace sw
 {
diff --git a/src/Pipeline/VertexShader.cpp b/src/Pipeline/VertexShader.cpp
@@ -15,7 +15,7 @@
 #include "VertexShader.hpp"
 
 #include "Device/Vertex.hpp"
-#include "System/Debug.hpp"
+#include "Vulkan/VkDebug.hpp"
 
 #include <string.h>
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#include "Pipeline/ShaderCore.hpp"`
`18`	`18`	`#include "Reactor/Reactor.hpp"`
`19`	`19`	`#include "System/Memory.hpp"`
`20`		`-#include "System/Debug.hpp"`
	`20`	`+#include "Vulkan/VkDebug.hpp"`
`21`	`21`
`22`	`22`	`namespace sw`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`#include "Polygon.hpp"`
`18`	`18`	`#include "Renderer.hpp"`
`19`		`-#include "System/Debug.hpp"`
	`19`	`+#include "Vulkan/VkDebug.hpp"`
`20`	`20`
`21`	`21`	`namespace sw`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`#include "Renderer.hpp"`
`19`	`19`	`#include "Pipeline/Constants.hpp"`
`20`	`20`	`#include "System/Math.hpp"`
`21`		`-#include "System/Debug.hpp"`
	`21`	`+#include "Vulkan/VkDebug.hpp"`
`22`	`22`
`23`	`23`	`namespace sw`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include "Renderer.hpp"`
`21`	`21`	`#include "Pipeline/SetupRoutine.hpp"`
`22`	`22`	`#include "Pipeline/Constants.hpp"`
`23`		`-#include "System/Debug.hpp"`
	`23`	`+#include "Vulkan/VkDebug.hpp"`
`24`	`24`
`25`	`25`	`namespace sw`
`26`	`26`	`{`