Build the Vulkan backend on CI

This commit is contained in:
Corentin Wallez 2017-11-23 17:22:23 -05:00 committed by Corentin Wallez
parent 3cf6c9df0c
commit b36b501f5e
6 changed files with 29 additions and 22 deletions

View File

@ -13,7 +13,7 @@ install:
build_script: build_script:
- mkdir build - mkdir build
- cd build - cd build
- cmake -DNXT_USE_WERROR=1 .. - cmake -DNXT_USE_WERROR=1 -DNXT_ENABLE_VULKAN=1 ..
- cmake --build . - cmake --build .
# TODO(cwallez@chromium.org) test on more than Debug. # TODO(cwallez@chromium.org) test on more than Debug.

View File

@ -53,11 +53,14 @@ script:
# Use the more recent compilers we just installed # Use the more recent compilers we just installed
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$CXX" == "clang++" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$CXX" == "clang++" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi
# Build the Vulkan backend on Linux
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export BUILD_VULKAN=1; else export BUILD_VULKAN=0; fi
# Build # Build
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake --version - cmake --version
- cmake -G "Ninja" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DNXT_USE_WERROR=1 .. - cmake -G "Ninja" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DNXT_USE_WERROR=1 -DNXT_ENABLE_VULKAN=$BUILD_VULKAN ..
- cmake --build . - cmake --build .
# Test # Test

View File

@ -69,7 +69,7 @@ namespace backend { namespace vulkan {
// Write to the staging buffer // Write to the staging buffer
ASSERT(allocation.GetMappedPointer() != nullptr); ASSERT(allocation.GetMappedPointer() != nullptr);
memcpy(allocation.GetMappedPointer(), data, size); memcpy(allocation.GetMappedPointer(), data, static_cast<size_t>(size));
// Enqueue host write -> transfer src barrier and copy command // Enqueue host write -> transfer src barrier and copy command
VkCommandBuffer commands = mDevice->GetPendingCommandBuffer(); VkCommandBuffer commands = mDevice->GetPendingCommandBuffer();

View File

@ -339,6 +339,10 @@ namespace backend { namespace vulkan {
usedKnobs->debugReport = true; usedKnobs->debugReport = true;
} }
#endif #endif
if (mGlobalInfo.surface) {
extensionsToRequest.push_back(kExtensionNameKhrSurface);
usedKnobs->surface = true;
}
VkApplicationInfo appInfo; VkApplicationInfo appInfo;
appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
@ -448,7 +452,8 @@ namespace backend { namespace vulkan {
return true; return true;
} }
VkBool32 Device::OnDebugReportCallback(VkDebugReportFlagsEXT flags, VKAPI_ATTR VkBool32 VKAPI_CALL
Device::OnDebugReportCallback(VkDebugReportFlagsEXT flags,
VkDebugReportObjectTypeEXT /*objectType*/, VkDebugReportObjectTypeEXT /*objectType*/,
uint64_t /*object*/, uint64_t /*object*/,
size_t /*location*/, size_t /*location*/,

View File

@ -147,7 +147,8 @@ namespace backend { namespace vulkan {
void GatherQueueFromDevice(); void GatherQueueFromDevice();
bool RegisterDebugReport(); bool RegisterDebugReport();
static VkBool32 OnDebugReportCallback(VkDebugReportFlagsEXT flags, static VKAPI_ATTR VkBool32 VKAPI_CALL
OnDebugReportCallback(VkDebugReportFlagsEXT flags,
VkDebugReportObjectTypeEXT objectType, VkDebugReportObjectTypeEXT objectType,
uint64_t object, uint64_t object,
size_t location, size_t location,

View File

@ -32,9 +32,7 @@ namespace utils {
} }
private: private:
GLFWwindow* window = nullptr; SwapChainImplVulkan(GLFWwindow* /*window*/) {
SwapChainImplVulkan(GLFWwindow* window) : window(window) {
} }
~SwapChainImplVulkan() { ~SwapChainImplVulkan() {