Commit 2377845d by Ben Clayton

Reactor: Move print apis out of core reactor header.

This is considered non-core functionality. Fixes: b/144686205 Change-Id: I41b811d70db9c07d26a3e6cb2f8c36a2a9e34296 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38450Tested-by: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent 96f64045
...@@ -1538,16 +1538,17 @@ if(${REACTOR_BACKEND} STREQUAL "Subzero") ...@@ -1538,16 +1538,17 @@ if(${REACTOR_BACKEND} STREQUAL "Subzero")
) )
set(SUBZERO_REACTOR_LIST set(SUBZERO_REACTOR_LIST
${SOURCE_DIR}/Reactor/Reactor.cpp
${SOURCE_DIR}/Reactor/Reactor.hpp
${SOURCE_DIR}/Reactor/SubzeroReactor.cpp
${SOURCE_DIR}/Reactor/Optimizer.cpp
${SOURCE_DIR}/Reactor/Nucleus.hpp
${SOURCE_DIR}/Reactor/Routine.hpp
${SOURCE_DIR}/Reactor/Debug.cpp ${SOURCE_DIR}/Reactor/Debug.cpp
${SOURCE_DIR}/Reactor/Debug.hpp ${SOURCE_DIR}/Reactor/Debug.hpp
${SOURCE_DIR}/Reactor/ExecutableMemory.cpp ${SOURCE_DIR}/Reactor/ExecutableMemory.cpp
${SOURCE_DIR}/Reactor/ExecutableMemory.hpp ${SOURCE_DIR}/Reactor/ExecutableMemory.hpp
${SOURCE_DIR}/Reactor/Nucleus.hpp
${SOURCE_DIR}/Reactor/Optimizer.cpp
${SOURCE_DIR}/Reactor/Print.hpp
${SOURCE_DIR}/Reactor/Reactor.cpp
${SOURCE_DIR}/Reactor/Reactor.hpp
${SOURCE_DIR}/Reactor/Routine.hpp
${SOURCE_DIR}/Reactor/SubzeroReactor.cpp
) )
set(SUBZERO_INCLUDE_DIR set(SUBZERO_INCLUDE_DIR
...@@ -1670,20 +1671,21 @@ if(REACTOR_EMIT_DEBUG_INFO) ...@@ -1670,20 +1671,21 @@ if(REACTOR_EMIT_DEBUG_INFO)
endif(REACTOR_EMIT_DEBUG_INFO) endif(REACTOR_EMIT_DEBUG_INFO)
set(REACTOR_LLVM_LIST set(REACTOR_LLVM_LIST
${SOURCE_DIR}/Reactor/Reactor.cpp
${SOURCE_DIR}/Reactor/Reactor.hpp
${SOURCE_DIR}/Reactor/LLVMReactor.cpp
${SOURCE_DIR}/Reactor/LLVMReactor.hpp
${SOURCE_DIR}/Reactor/LLVMReactorDebugInfo.cpp
${SOURCE_DIR}/Reactor/LLVMReactorDebugInfo.hpp
${SOURCE_DIR}/Reactor/Nucleus.hpp
${SOURCE_DIR}/Reactor/Routine.hpp
${SOURCE_DIR}/Reactor/CPUID.cpp ${SOURCE_DIR}/Reactor/CPUID.cpp
${SOURCE_DIR}/Reactor/CPUID.hpp ${SOURCE_DIR}/Reactor/CPUID.hpp
${SOURCE_DIR}/Reactor/Debug.cpp ${SOURCE_DIR}/Reactor/Debug.cpp
${SOURCE_DIR}/Reactor/Debug.hpp ${SOURCE_DIR}/Reactor/Debug.hpp
${SOURCE_DIR}/Reactor/ExecutableMemory.cpp ${SOURCE_DIR}/Reactor/ExecutableMemory.cpp
${SOURCE_DIR}/Reactor/ExecutableMemory.hpp ${SOURCE_DIR}/Reactor/ExecutableMemory.hpp
${SOURCE_DIR}/Reactor/LLVMReactor.cpp
${SOURCE_DIR}/Reactor/LLVMReactor.hpp
${SOURCE_DIR}/Reactor/LLVMReactorDebugInfo.cpp
${SOURCE_DIR}/Reactor/LLVMReactorDebugInfo.hpp
${SOURCE_DIR}/Reactor/Nucleus.hpp
${SOURCE_DIR}/Reactor/Print.hpp
${SOURCE_DIR}/Reactor/Reactor.cpp
${SOURCE_DIR}/Reactor/Reactor.hpp
${SOURCE_DIR}/Reactor/Routine.hpp
) )
file(GLOB_RECURSE EGL_LIST file(GLOB_RECURSE EGL_LIST
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "ShaderCore.hpp" #include "ShaderCore.hpp"
#include "Device/Sampler.hpp" #include "Device/Sampler.hpp"
#include "Reactor/Print.hpp"
#include "Reactor/Reactor.hpp" #include "Reactor/Reactor.hpp"
#ifdef None #ifdef None
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#ifndef sw_ShaderCore_hpp #ifndef sw_ShaderCore_hpp
#define sw_ShaderCore_hpp #define sw_ShaderCore_hpp
#include "Reactor/Print.hpp"
#include "Reactor/Reactor.hpp" #include "Reactor/Reactor.hpp"
#include "Vulkan/VkDebug.hpp" #include "Vulkan/VkDebug.hpp"
......
...@@ -300,6 +300,7 @@ ...@@ -300,6 +300,7 @@
<ClInclude Include="ExecutableMemory.hpp" /> <ClInclude Include="ExecutableMemory.hpp" />
<ClInclude Include="MutexLock.hpp" /> <ClInclude Include="MutexLock.hpp" />
<ClInclude Include="Nucleus.hpp" /> <ClInclude Include="Nucleus.hpp" />
<ClInclude Include="Print.hpp" />
<ClInclude Include="Reactor.hpp" /> <ClInclude Include="Reactor.hpp" />
<ClInclude Include="Routine.hpp" /> <ClInclude Include="Routine.hpp" />
<ClInclude Include="Thread.hpp" /> <ClInclude Include="Thread.hpp" />
......
...@@ -41,6 +41,9 @@ ...@@ -41,6 +41,9 @@
<ClInclude Include="Nucleus.hpp"> <ClInclude Include="Nucleus.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Print.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Reactor.hpp"> <ClInclude Include="Reactor.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment