Remove amber
Not supported on Fuchsia yet.
Change-Id: Iae91861e580d0e87e456ae3193b0836447b4314c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25ab9f2..d207927 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,8 +96,8 @@
include_directories(${SPIRV_INCLUDE_PATH})
# Amber
-add_subdirectory(external/amber)
-include_directories(external/amber)
+#add_subdirectory(external/amber)
+#include_directories(external/amber)
# RenderDoc API
include_directories(external/renderdoc/src)
diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index 8317884..d67cada 100644
--- a/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -33,7 +33,7 @@
add_subdirectory(protected_memory)
add_subdirectory(memory_model)
add_subdirectory(util)
-add_subdirectory(amber)
+#add_subdirectory(amber)
include_directories(
api
@@ -69,7 +69,7 @@
protected_memory
memory_model
util
- amber
+ #amber
)
set(DEQP_VK_SRCS
@@ -124,7 +124,7 @@
deqp-vk-ycbcr
deqp-vk-protected-memory
deqp-vk-memory-model
- deqp-vk-amber
+ #deqp-vk-amber
)
if (DE_COMPILER_IS_MSC AND (DE_PTR_SIZE EQUAL 4))
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt b/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
index 4c6f9ea..cdf6d81 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
@@ -56,10 +56,10 @@
)
set(DEQP_VK_SPIRV_ASSEMBLY_LIBS
- libamber
+ #libamber
tcutil
vkutil
- deqp-vk-amber
+ #deqp-vk-amber
)
PCH(DEQP_VK_SPIRV_ASSEMBLY_SRCS ../pch.cpp)
@@ -69,8 +69,8 @@
elseif (DE_COMPILER_IS_MSC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4068")
endif()
-include_directories("../../../../amber/src/include")
-include_directories("../amber")
+#include_directories("../../../../amber/src/include")
+#include_directories("../amber")
add_library(deqp-vk-spirv-assembly STATIC ${DEQP_VK_SPIRV_ASSEMBLY_SRCS})
target_link_libraries(deqp-vk-spirv-assembly ${DEQP_VK_SPIRV_ASSEMBLY_LIBS})
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp
index 3a0509b..d1b2be5 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp
@@ -23,11 +23,17 @@
*//*--------------------------------------------------------------------*/
#include <string>
+
+#ifdef USE_AMBER
#include <amber/amber.h>
+#endif
#include "tcuDefs.hpp"
+#ifdef USE_AMBER
#include "vktAmberTestCase.hpp"
+#endif
+
#include "vktSpvAsmSignedIntCompareTests.hpp"
#include "vktTestGroupUtil.hpp"
@@ -40,6 +46,7 @@
void createSignedIntCompareTests (tcu::TestCaseGroup* tests, const char* data_dir)
{
+#ifdef USE_AMBER
tcu::TestContext& testCtx = tests->getTestContext();
// Shader test files are saved in <path>/external/vulkancts/data/vulkan/amber/<data_dir>/<basename>.amber
@@ -74,6 +81,7 @@
TCU_THROW(Exception, message.c_str());
}
}
+#endif
}
} // anonymous
diff --git a/external/vulkancts/modules/vulkan/vktTestPackage.cpp b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
index 5d0fbfb..f5d73e9 100644
--- a/external/vulkancts/modules/vulkan/vktTestPackage.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
@@ -88,8 +88,10 @@
#include "vktProtectedMemTests.hpp"
#include "vktDeviceGroupTests.hpp"
#include "vktMemoryModelTests.hpp"
+#ifdef USE_AMBER
#include "vktAmberExampleTests.hpp"
#include "vktAmberGraphicsFuzzTests.hpp"
+#endif
#include <vector>
#include <sstream>
@@ -498,8 +500,10 @@
addChild(DeviceGroup::createTests (m_testCtx));
addChild(MemoryModel::createTests (m_testCtx));
addChild(conditional::createTests (m_testCtx));
+#ifdef USE_AMBER
addChild(cts_amber::createExampleTests (m_testCtx));
addChild(cts_amber::createGraphicsFuzzTests (m_testCtx));
+#endif
}
} // vkt
