Skip to content

S
swiftshader
Commit 6636f143 by Antonio Maiorano
Options

CMake: clean up cppdap usage

Remove unused and useless variables. Also fix the build when SWIFTSHADER_ENABLE_VULKAN_DEBUGGER is enabled. Bug: b/145758253 Change-Id: Ie49dd88d6716b24fe31baa8f8d162e7dacfa5a3c Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43268Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent fa8f48d8
Showing with 3 additions and 5 deletions
CMakeLists.txt
...@@ -312,9 +312,6 @@ set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler) ...@@ -312,9 +312,6 @@ set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler)
set(VULKAN_DIR ${SOURCE_DIR}/Vulkan) set(VULKAN_DIR ${SOURCE_DIR}/Vulkan)
set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party) set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
set(ASTC_DIR ${THIRD_PARTY_DIR}/astc-encoder) set(ASTC_DIR ${THIRD_PARTY_DIR}/astc-encoder)
set(CPPDAP_DIR ${THIRD_PARTY_DIR}/cppdap)
set(CPPDAP_INCLUDE_DIR ${CPPDAP_DIR}/include)
set(JSON_INCLUDE_DIR ${THIRD_PARTY_DIR}/json/include)
set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests) set(TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests)
set(HELLO2_DIR ${THIRD_PARTY_DIR}/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2) set(HELLO2_DIR ${THIRD_PARTY_DIR}/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2)
...@@ -609,7 +606,7 @@ endif() ...@@ -609,7 +606,7 @@ endif()
########################################################### ###########################################################
if(SWIFTSHADER_BUILD_CPPDAP) if(SWIFTSHADER_BUILD_CPPDAP)
set(CPPDAP_THIRD_PARTY_DIR ${THIRD_PARTY_DIR}) set(CPPDAP_THIRD_PARTY_DIR ${THIRD_PARTY_DIR})
add_subdirectory(${CPPDAP_DIR}) add_subdirectory(third_party/cppdap)
endif() endif()
...@@ -628,7 +625,6 @@ set(OPENGL_INCLUDE_DIR ...@@ -628,7 +625,6 @@ set(OPENGL_INCLUDE_DIR
set(VULKAN_INCLUDE_DIR set(VULKAN_INCLUDE_DIR
${COMMON_INCLUDE_DIR} ${COMMON_INCLUDE_DIR}
${CPPDAP_INCLUDE_DIR}
) )
########################################################### ###########################################################
......
src/Vulkan/Debug/Variable.hpp
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "Type.hpp" #include "Type.hpp"
#include "Value.hpp" #include "Value.hpp"
#include <algorithm>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <string> #include <string>
......
src/Vulkan/VkCommandBuffer.cpp
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "VkCommandBuffer.hpp" #include "VkCommandBuffer.hpp"
#include "VkBuffer.hpp" #include "VkBuffer.hpp"
#include "VkDevice.hpp"
#include "VkEvent.hpp" #include "VkEvent.hpp"
#include "VkFence.hpp" #include "VkFence.hpp"
#include "VkFramebuffer.hpp" #include "VkFramebuffer.hpp"
......
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