mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some warnings (errors) on release build.

Browse Source
This commit is contained in:
asuessenbach
2020-10-20 09:55:19 +02:00
parent 32c994335a
commit 2e95313c1d
6 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/utils/shaders.cpp
View File

@@ -91,8 +91,10 @@ namespace vk
std::string const & shaderText )
{
std::vector<unsigned int> shaderSPV;
bool ok = GLSLtoSPV( shaderStage, shaderText, shaderSPV );
assert( ok );
if ( !GLSLtoSPV( shaderStage, shaderText, shaderSPV ) )
{
throw std::runtime_error( "Could not convert glsl shader to spir-v -> terminating" );
}
return device->createShaderModuleUnique( vk::ShaderModuleCreateInfo( vk::ShaderModuleCreateFlags(), shaderSPV ) );
}

6
samples/utils/utils.cpp
View File

@@ -1016,7 +1016,7 @@ namespace vk
MonochromeImageGenerator::MonochromeImageGenerator( std::array<unsigned char, 3> const & rgb ) : m_rgb( rgb ) {}
void MonochromeImageGenerator::operator()( void * data, vk::Extent2D & extent ) const
void MonochromeImageGenerator::operator()( void * data, vk::Extent2D const & extent ) const
{
// fill in with the monochrome color
unsigned char * pImageMemory = static_cast<unsigned char *>( data );
@@ -1041,10 +1041,10 @@ namespace vk
assert( m_channels == 4 );
}
void PixelsImageGenerator::operator()( void * data, vk::Extent2D & extent ) const
void PixelsImageGenerator::operator()( void * data, vk::Extent2D const & extent ) const
{
assert( extent == m_extent );
memcpy( data, m_pixels, m_extent.width * m_extent.height * m_channels );
memcpy( data, m_pixels, extent.width * extent.height * m_channels );
}
TextureData::TextureData( vk::PhysicalDevice const & physicalDevice,

4
samples/utils/utils.hpp
View File

@@ -245,7 +245,7 @@ namespace vk
public:
MonochromeImageGenerator( std::array<unsigned char, 3> const & rgb );
void operator()( void * data, vk::Extent2D & extent ) const;
void operator()( void * data, vk::Extent2D const & extent ) const;
private:
std::array<unsigned char, 3> const & m_rgb;
@@ -256,7 +256,7 @@ namespace vk
public:
PixelsImageGenerator( vk::Extent2D const & extent, size_t channels, unsigned char const * pixels );
void operator()( void * data, vk::Extent2D & extent ) const;
void operator()( void * data, vk::Extent2D const & extent ) const;
private:
vk::Extent2D m_extent;