lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of gcc 8 fall-through warnings

Browse Source
This commit is contained in:
baldurk
2019-04-12 10:46:39 +01:00
parent 82c54f7310
commit e2a7ef3ceb
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/CMakeLists.txt
+3 -1
View File
@@ -103,7 +103,9 @@ set_source_files_properties(${glslang_sources}
PROPERTIES COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-strict-aliasing")
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
set_source_files_properties(${glslang_dir}/glslang/MachineIndependent/reflection.cpp
set_source_files_properties(
${glslang_dir}/glslang/MachineIndependent/reflection.cpp
${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
PROPERTIES COMPILE_FLAGS "-Wno-implicit-fallthrough -Wno-ignored-qualifiers")
endif()
renderdoc/driver/shaders/spirv/spirv_common.cpp
+3 -5
View File
@@ -352,17 +352,15 @@ void glslangGetProgramResourceiv(glslang::TProgram *program, ReflectionInterface
break;
}
case ReflectionProperty::Internal_Binding:
case ReflectionProperty::AtomicCounterBufferIndex:
{
if(programInterface == ReflectionInterface::UniformBlock)
if(props[i] == ReflectionProperty::Internal_Binding &&
programInterface == ReflectionInterface::UniformBlock)
{
params[i] = program->getUniformBlock(index).getType()->getQualifier().layoutBinding;
break;
}
// deliberate fall-through
}
case ReflectionProperty::AtomicCounterBufferIndex:
{
if(programInterface == ReflectionInterface::Uniform)
params[i] = program->getUniform(index).getType()->getQualifier().layoutBinding;
else if(programInterface == ReflectionInterface::AtomicCounterBuffer)
renderdoc/driver/vulkan/vk_resources.cpp
+14
View File
@@ -1490,11 +1490,18 @@ BlockShape GetBlockShape(VkFormat Format, uint32_t plane)
case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
case VK_FORMAT_G8_B8R8_2PLANE_422_UNORM:
if(plane == 0)
{
return {1, 1, 1};
}
else if(plane == 1)
{
return {1, 1, 2};
}
else
{
RDCERR("Invalid plane %d in 2-plane format", plane);
return {1, 1, 1};
}
case VK_FORMAT_R10X6_UNORM_PACK16:
case VK_FORMAT_R12X4_UNORM_PACK16:
// basically just 16-bit format with only top 10-bits used
@@ -1535,11 +1542,18 @@ BlockShape GetBlockShape(VkFormat Format, uint32_t plane)
case VK_FORMAT_G12X4_B12X4R12X4_2PLANE_422_UNORM_3PACK16:
case VK_FORMAT_G16_B16R16_2PLANE_422_UNORM:
if(plane == 0)
{
return {1, 1, 2};
}
else if(plane == 1)
{
return {1, 1, 4};
}
else
{
RDCERR("Invalid plane %d in 2-plane format", plane);
return {1, 1, 2};
}
default: RDCERR("Unrecognised Vulkan Format: %d", Format);
}