diff --git a/glslang b/glslang index bffcf20..f1cb860 160000 --- a/glslang +++ b/glslang @@ -1 +1 @@ -Subproject commit bffcf209cb67f718bd8faafd43d0379f943c116f +Subproject commit f1cb8608b390a7f51b4ae0d62cd415ba47a59b86 diff --git a/samples/utils/shaders.cpp b/samples/utils/shaders.cpp index 879b054..f448ff2 100644 --- a/samples/utils/shaders.cpp +++ b/samples/utils/shaders.cpp @@ -16,7 +16,7 @@ #include "shaders.hpp" #include "SPIRV/GlslangToSpv.h" -#include "StandAlone/ResourceLimits.h" +#include "glslang/Public/ResourceLimits.h" #include @@ -59,7 +59,7 @@ namespace vk // Enable SPIR-V and Vulkan rules when parsing GLSL EShMessages messages = (EShMessages)( EShMsgSpvRules | EShMsgVulkanRules ); - if ( !shader.parse( &glslang::DefaultTBuiltInResource, 100, false, messages ) ) + if ( !shader.parse( GetDefaultResources(), 100, false, messages ) ) { puts( shader.getInfoLog() ); puts( shader.getInfoDebugLog() ); diff --git a/snippets/ArrayWrapper1D.hpp b/snippets/ArrayWrapper1D.hpp index 542ead3..ea7f681 100644 --- a/snippets/ArrayWrapper1D.hpp +++ b/snippets/ArrayWrapper1D.hpp @@ -102,7 +102,7 @@ public: } private: - VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) const VULKAN_HPP_NOEXCEPT + VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) VULKAN_HPP_NOEXCEPT { size_t n = std::min( N, len ); for ( size_t i = 0; i < n; ++i ) diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index a094d67..a3ff7f1 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -190,7 +190,7 @@ namespace VULKAN_HPP_NAMESPACE } private: - VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) const VULKAN_HPP_NOEXCEPT + VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) VULKAN_HPP_NOEXCEPT { size_t n = std::min( N, len ); for ( size_t i = 0; i < n; ++i ) diff --git a/vulkan/vulkansc.hpp b/vulkan/vulkansc.hpp index d6c7707..c710112 100644 --- a/vulkan/vulkansc.hpp +++ b/vulkan/vulkansc.hpp @@ -190,7 +190,7 @@ namespace VULKAN_HPP_NAMESPACE } private: - VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) const VULKAN_HPP_NOEXCEPT + VULKAN_HPP_CONSTEXPR_14 void copy( char const * data, size_t len ) VULKAN_HPP_NOEXCEPT { size_t n = std::min( N, len ); for ( size_t i = 0; i < n; ++i )