Added a simple compilation test and linux CI

Compilation test is required because the smaple is windows-specific.
Linux CI is needed because pull requests must stop breaking linux builds.
This commit is contained in:
Mrkol 2024-08-29 02:20:11 +03:00
parent de8e65796a
commit 86bacfd26d
5 changed files with 99 additions and 8 deletions

52
.github/workflows/linux.yaml vendored Normal file
View File

@ -0,0 +1,52 @@
name: linux
on: [push, pull_request]
permissions:
contents: read
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
cxx: [g++-12, clang++-15]
build_type: [Debug, Release]
include:
- cxx: g++-12
install: sudo apt install g++-12
- cxx: clang++-15
cxxflags: -stdlib=libc++
install: sudo apt install clang-15 libc++-15-dev libc++abi-15-dev
steps:
- uses: actions/checkout@v4
- name: Prepare Vulkan SDK
uses: humbletim/install-vulkan-sdk@v1.1.1
with:
version: 1.3.290.0
cache: true
- name: Create Build Environment
run: |
sudo apt update
${{matrix.install}}
cmake -E make_directory ${{runner.workspace}}/build
- name: Configure
working-directory: ${{runner.workspace}}/build
env:
CXX: ${{matrix.cxx}}
CXXFLAGS: ${{matrix.cxxflags}}
run: |
cmake -DCPM_SOURCE_CACHE=~/cpm-cache \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DVMA_BUILD_SAMPLES=YES \
$GITHUB_WORKSPACE
- name: Build
working-directory: ${{runner.workspace}}/build
run: |
threads=`nproc`
cmake --build . --target VmaCompilationTest --config ${{matrix.build_type}} --parallel $threads

View File

@ -45,5 +45,6 @@ if (VMA_ENABLE_INSTALL)
option(VMA_BUILD_SAMPLES "Build samples")
if (VMA_BUILD_SAMPLES)
add_subdirectory(src)
add_subdirectory(compilation_test)
endif()
endif()

View File

@ -0,0 +1,36 @@
#
# Copyright (c) 2017-2024 Advanced Micro Devices, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
find_package(Vulkan REQUIRED)
add_library(VmaCompilationTest)
target_sources(VmaCompilationTest PRIVATE vma_impl.cpp)
target_link_libraries(VmaCompilationTest PRIVATE GPUOpen::VulkanMemoryAllocator)
target_link_libraries(VmaCompilationTest PUBLIC Vulkan::Vulkan)

View File

@ -0,0 +1,2 @@
#define VMA_IMPLEMENTATION
#include <vk_mem_alloc.h>

View File

@ -10594,7 +10594,7 @@ VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator)
m_hMemory(VK_NULL_HANDLE),
m_MapCount(0),
m_pMappedData(VMA_NULL),
m_Handle(VMA_NULL) {}
m_Handle() {}
VmaDeviceMemoryBlock::~VmaDeviceMemoryBlock()
{