ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS/Vulkan: Fix warning when compiling RGBA8->RGB5A1 shader 

Also gets rid of the program info log length check, since that's been
long removed in glslang.
This commit is contained in:
Connor McLaughlin 2022-02-20 15:08:03 +10:00 committed by refractionpcsx2
parent 2b646c2153
commit f73398ea84
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/resources/shaders/vulkan/convert.glsl
View File

@ -90,7 +90,7 @@ void ps_filter_transparency()
// Need to be careful with precision here, it can break games like Spider-Man 3 and Dogs Life // Need to be careful with precision here, it can break games like Spider-Man 3 and Dogs Life
void ps_convert_rgba8_16bits() void ps_convert_rgba8_16bits()
{ {
highp uvec4 i = uvec4(sample_c(v_tex) * vec4(255.5f, 255.5f, 255.5f, 255.5f)); uvec4 i = uvec4(sample_c(v_tex) * vec4(255.5f, 255.5f, 255.5f, 255.5f));
o_col0 = ((i.x & 0x00F8u) >> 3) | ((i.y & 0x00F8u) << 2) | ((i.z & 0x00f8u) << 7) | ((i.w & 0x80u) << 8); o_col0 = ((i.x & 0x00F8u) >> 3) | ((i.y & 0x00F8u) << 2) | ((i.z & 0x00f8u) << 7) | ((i.w & 0x80u) << 8);
} }

6
common/Vulkan/ShaderCompiler.cpp
View File

@ -107,13 +107,11 @@ namespace Vulkan::ShaderCompiler
glslang::GlslangToSpv(*intermediate, out_code, &logger); glslang::GlslangToSpv(*intermediate, out_code, &logger);
// Write out messages // Write out messages
// Temporary: skip if it contains "Warning, version 450 is not yet complete; most version-specific if (std::strlen(shader->getInfoLog()) > 0)
// features are present, but some are missing."
if (std::strlen(shader->getInfoLog()) > 108)
Console.Warning("Shader info log: %s", shader->getInfoLog()); Console.Warning("Shader info log: %s", shader->getInfoLog());
if (std::strlen(shader->getInfoDebugLog()) > 0) if (std::strlen(shader->getInfoDebugLog()) > 0)
Console.Warning("Shader debug info log: %s", shader->getInfoDebugLog()); Console.Warning("Shader debug info log: %s", shader->getInfoDebugLog());
if (std::strlen(program->getInfoLog()) > 25) if (std::strlen(program->getInfoLog()) > 0)
Console.Warning("Program info log: %s", program->getInfoLog()); Console.Warning("Program info log: %s", program->getInfoLog());
if (std::strlen(program->getInfoDebugLog()) > 0) if (std::strlen(program->getInfoDebugLog()) > 0)
Console.Warning("Program debug info log: %s", program->getInfoDebugLog()); Console.Warning("Program debug info log: %s", program->getInfoDebugLog());