mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
Update submodule glslang to version 13.0.0 (#1700)
This commit is contained in:
parent
bab0e249f2
commit
33ea43b53f
2
glslang
2
glslang
@ -1 +1 @@
|
|||||||
Subproject commit bffcf209cb67f718bd8faafd43d0379f943c116f
|
Subproject commit f1cb8608b390a7f51b4ae0d62cd415ba47a59b86
|
@ -16,7 +16,7 @@
|
|||||||
#include "shaders.hpp"
|
#include "shaders.hpp"
|
||||||
|
|
||||||
#include "SPIRV/GlslangToSpv.h"
|
#include "SPIRV/GlslangToSpv.h"
|
||||||
#include "StandAlone/ResourceLimits.h"
|
#include "glslang/Public/ResourceLimits.h"
|
||||||
|
|
||||||
#include <vulkan/vulkan.hpp>
|
#include <vulkan/vulkan.hpp>
|
||||||
|
|
||||||
@ -59,7 +59,7 @@ namespace vk
|
|||||||
// Enable SPIR-V and Vulkan rules when parsing GLSL
|
// Enable SPIR-V and Vulkan rules when parsing GLSL
|
||||||
EShMessages messages = (EShMessages)( EShMsgSpvRules | EShMsgVulkanRules );
|
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.getInfoLog() );
|
||||||
puts( shader.getInfoDebugLog() );
|
puts( shader.getInfoDebugLog() );
|
||||||
|
@ -102,7 +102,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
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 );
|
size_t n = std::min( N, len );
|
||||||
for ( size_t i = 0; i < n; ++i )
|
for ( size_t i = 0; i < n; ++i )
|
||||||
|
@ -190,7 +190,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
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 );
|
size_t n = std::min( N, len );
|
||||||
for ( size_t i = 0; i < n; ++i )
|
for ( size_t i = 0; i < n; ++i )
|
||||||
|
@ -190,7 +190,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
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 );
|
size_t n = std::min( N, len );
|
||||||
for ( size_t i = 0; i < n; ++i )
|
for ( size_t i = 0; i < n; ++i )
|
||||||
|
Loading…
Reference in New Issue
Block a user