Merge pull request #693 from asuessenbach/glslang

Update of submodule glslang
This commit is contained in:
Andreas Süßenbach 2020-07-29 09:37:21 +02:00 committed by GitHub
commit ab295e57ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions

View File

@ -11,10 +11,13 @@ build:
environment: environment:
matrix: matrix:
- GENERATOR_ARCH: Win32 - GENERATOR_ARCH: Win32
PYTHON: "C:\\Python38"
- GENERATOR_ARCH: x64 - GENERATOR_ARCH: x64
PYTHON: "C:\\Python38-x64"
install: install:
- git submodule update --init --recursive - git submodule update --init --recursive
- set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
build_script: build_script:
- mkdir build - mkdir build

@ -1 +1 @@
Subproject commit 05d12a9461dd0a76053bdd42f062a37a10d56afb Subproject commit 3ee5f2f1d3316e228916788b300d786bb574d337

View File

@ -59,7 +59,7 @@ int main( int /*argc*/, char ** /*argv*/ )
vk::UniqueCommandBuffer commandBuffer = vk::UniqueCommandBuffer commandBuffer =
std::move( device->allocateCommandBuffersUnique( {}, vectorAllocator, vk::DispatchLoaderStatic() ).front() ); std::move( device->allocateCommandBuffersUnique( {}, vectorAllocator, vk::DispatchLoaderStatic() ).front() );
commandBuffer->begin( nullptr ); commandBuffer->begin( vk::CommandBufferBeginInfo() );
std::vector<vk::UniqueHandle<vk::CommandBuffer, vk::DispatchLoaderDynamic>>::allocator_type dynamicVectorAllocator; std::vector<vk::UniqueHandle<vk::CommandBuffer, vk::DispatchLoaderDynamic>>::allocator_type dynamicVectorAllocator;
vk::UniqueHandle<vk::CommandBuffer, vk::DispatchLoaderDynamic> dynamicCommandBuffer = std::move( vk::UniqueHandle<vk::CommandBuffer, vk::DispatchLoaderDynamic> dynamicCommandBuffer = std::move(