[Fuchsia] Enable amber.
Using my public github to pick up a Fuchsia build fix, and because
we can't add a third party repo that isn't referenced by the GN build.
Bug:54480
Change-Id: I66adcb08e57d2e5cc19d0542825e90de50033c5e
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/vulkan-cts/+/401273
Reviewed-by: John Bauman <jbauman@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5677cd9..765d383 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,8 +98,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/fetch_sources.py b/external/fetch_sources.py
index dd7e796..a263842 100644
--- a/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@ -328,9 +328,9 @@
"f8bf11a0253a32375c32cad92c841237b96696c0",
"spirv-headers"),
GitRepo(
- "https://github.com/google/amber.git",
+ "https://github.com/cdotstout/amber.git",
None,
- "0556811aeaad846f4bacbbd03e05e61fbfe1e545",
+ "vulkan-cts-1.2.1",
"amber"),
]
diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index fc60cb8..c18f628 100644
--- a/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -34,7 +34,7 @@
add_subdirectory(memory_model)
add_subdirectory(transform_feedback)
add_subdirectory(util)
-#add_subdirectory(amber) - removed on Fuchsia
+add_subdirectory(amber)
add_subdirectory(imageless_framebuffer)
add_subdirectory(descriptor_indexing)
add_subdirectory(fragment_shader_interlock)
@@ -74,7 +74,7 @@
memory_model
transform_feedback
util
- #amber - removed on Fuchsia
+ amber
imageless_framebuffer
descriptor_indexing
fragment_shader_interlock
@@ -134,7 +134,7 @@
deqp-vk-ycbcr
deqp-vk-protected-memory
deqp-vk-memory-model
- #deqp-vk-amber - removed on Fuchsia
+ deqp-vk-amber
deqp-vk-imageless-framebuffer
deqp-vk-transform-feedback
deqp-vk-descriptor-indexing
diff --git a/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt b/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
index f44e4c2..2a396a8 100644
--- a/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
@@ -105,7 +105,7 @@
tcutil
vkutil
referencerenderer
- #libamber - Fuchsia removed
+ libamber
)
PCH(DEQP_VK_PIPELINE_SRCS ../pch.cpp)
diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexOnlyTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexOnlyTests.cpp
index 93cc917..295d2f7 100644
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexOnlyTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexOnlyTests.cpp
@@ -37,7 +37,6 @@
void addTests (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
@@ -58,7 +57,6 @@
tests->addChild(testCase);
}
-#endif
}
} // anonymous
diff --git a/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt b/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt
index c228a5a..32a9b3d 100644
--- a/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt
@@ -11,7 +11,7 @@
set(DEQP_VK_RASTERIZATION_LIBS
tcutil
vkutil
- #libamber - Fuchsia removed
+ libamber
)
include_directories("../../../../../external/amber/src/include")
diff --git a/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp b/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp
index 569702b..4f7901f 100644
--- a/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp
+++ b/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp
@@ -4251,7 +4251,6 @@
}
}
-#ifdef USE_AMBER
// .provoking_vertex
{
tcu::TestCaseGroup* const provokingVertex = new tcu::TestCaseGroup(testCtx, "provoking_vertex", "Test provoking vertex");
@@ -4285,7 +4284,6 @@
provokingVertex->addChild(testCase);
}
}
-#endif
}
} // anonymous
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt b/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
index 71cb200..404c1d8 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
@@ -68,10 +68,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)
@@ -81,8 +81,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/vktSpvAsmPtrAccessChainTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPtrAccessChainTests.cpp
index df9530a..6af506b 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPtrAccessChainTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmPtrAccessChainTests.cpp
@@ -22,9 +22,7 @@
#include <string>
#include "vktTestGroupUtil.hpp"
-#ifdef USE_AMBER
#include "vktAmberTestCase.hpp"
-#endif
#include "vktSpvAsmPtrAccessChainTests.hpp"
namespace vkt
@@ -36,7 +34,6 @@
void createTests (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
@@ -59,7 +56,6 @@
tests->addChild(testCase);
}
-#endif
}
} // anonymous
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp
index 1b3244b..38fd9ce 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSignedIntCompareTests.cpp
@@ -25,9 +25,7 @@
#include <string>
#include "vktTestGroupUtil.hpp"
-#ifdef USE_AMBER
#include "vktAmberTestCase.hpp"
-#endif
#include "vktSpvAsmSignedIntCompareTests.hpp"
@@ -40,7 +38,6 @@
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
@@ -65,7 +62,6 @@
tests->addChild(testCase);
}
-#endif
}
} // anonymous
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSpirvVersion1p4Tests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSpirvVersion1p4Tests.cpp
index 93c4de9..694fda0 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSpirvVersion1p4Tests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmSpirvVersion1p4Tests.cpp
@@ -24,18 +24,14 @@
#include <string>
#include <vector>
-#ifdef USE_AMBER
#include <amber/amber.h>
-#endif
#include "tcuDefs.hpp"
#include "vkDefs.hpp"
#include "vktTestGroupUtil.hpp"
#include "vktTestCase.hpp"
-#ifdef USE_AMBER
#include "vktAmberTestCase.hpp"
-#endif
#include "vktSpvAsmSpirvVersion1p4Tests.hpp"
#include "vktTestGroupUtil.hpp"
@@ -75,7 +71,6 @@
void addTestsForAmberFiles (tcu::TestCaseGroup* tests, CaseGroup group)
{
-#ifdef USE_AMBER
tcu::TestContext& testCtx = tests->getTestContext();
const std::string data_dir(group.data_dir);
const std::string subdir(group.subdir);
@@ -117,7 +112,6 @@
testCase->setSpirVAsmBuildOptions(asm_options);
tests->addChild(testCase);
}
-#endif
}
} // anonymous
diff --git a/external/vulkancts/modules/vulkan/vktTestPackage.cpp b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
index b8b3cd0..f89cd3c 100644
--- a/external/vulkancts/modules/vulkan/vktTestPackage.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
@@ -88,10 +88,8 @@
#include "vktProtectedMemTests.hpp"
#include "vktDeviceGroupTests.hpp"
#include "vktMemoryModelTests.hpp"
-#ifdef USE_AMBER
#include "vktAmberExampleTests.hpp"
#include "vktAmberGraphicsFuzzTests.hpp"
-#endif
#include "vktImagelessFramebufferTests.hpp"
#include "vktTransformFeedbackTests.hpp"
#include "vktDescriptorIndexingTests.hpp"
@@ -495,10 +493,8 @@
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
addChild(imageless::createTests (m_testCtx));
addChild(TransformFeedback::createTests (m_testCtx));
addChild(DescriptorIndexing::createTests (m_testCtx));
