Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #16116 from hrydgard/color-test-fix

Browse source 
Fix color test.
This commit is contained in:
Unknown W. Brackets 2022-09-26 14:18:12 -07:00 • committed by GitHub
commit 59f11df98b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Common/GPU/Vulkan/VulkanFrameData.h
View file

@ -48,16 +48,16 @@ struct FrameData {
std::condition_variable fenceCondVar; std::condition_variable fenceCondVar;
bool readyForFence = true; bool readyForFence = true;
VkFence fence; VkFence fence = VK_NULL_HANDLE;
VkFence readbackFence; // Strictly speaking we might only need one global of these. VkFence readbackFence = VK_NULL_HANDLE; // Strictly speaking we might only need one global of these.
// These are on different threads so need separate pools. // These are on different threads so need separate pools.
VkCommandPool cmdPoolInit; // Written to from main thread VkCommandPool cmdPoolInit = VK_NULL_HANDLE; // Written to from main thread
VkCommandPool cmdPoolMain; // Written to from render thread, which also submits VkCommandPool cmdPoolMain = VK_NULL_HANDLE; // Written to from render thread, which also submits
VkCommandBuffer initCmd; VkCommandBuffer initCmd = VK_NULL_HANDLE;
VkCommandBuffer mainCmd; VkCommandBuffer mainCmd = VK_NULL_HANDLE;
VkCommandBuffer presentCmd; VkCommandBuffer presentCmd = VK_NULL_HANDLE;
bool hasInitCommands = false; bool hasInitCommands = false;
bool hasMainCommands = false; bool hasMainCommands = false;
@ -73,7 +73,7 @@ struct FrameData {
// Profiling. // Profiling.
QueueProfileContext profile; QueueProfileContext profile;
bool profilingEnabled_; bool profilingEnabled_ = false;
void Init(VulkanContext *vulkan, int index); void Init(VulkanContext *vulkan, int index);
void Destroy(VulkanContext *vulkan); void Destroy(VulkanContext *vulkan);

7
GPU/Common/FragmentShaderGenerator.cpp
View file

@ -184,6 +184,7 @@ bool GenerateFragmentShader(const FShaderID &id, char *buffer, const ShaderLangu
} }
if (enableColorTest && !colorTestAgainstZero) { if (enableColorTest && !colorTestAgainstZero) {
WRITE(p, "uint roundAndScaleTo8x4(in highp vec3 x) { uvec3 u = uvec3(floor(x * 255.0 + 0.5)); return u.r | (u.g << 8) | (u.b << 16); }\n"); WRITE(p, "uint roundAndScaleTo8x4(in highp vec3 x) { uvec3 u = uvec3(floor(x * 255.0 + 0.5)); return u.r | (u.g << 8) | (u.b << 16); }\n");
WRITE(p, "uint packFloatsTo8x4(in vec3 x) { uvec3 u = uvec3(x); return u.r | (u.g << 8) | (u.b << 16); }\n");
} }
WRITE(p, "layout (location = 0, index = 0) out vec4 fragColor0;\n"); WRITE(p, "layout (location = 0, index = 0) out vec4 fragColor0;\n");
@ -263,6 +264,7 @@ bool GenerateFragmentShader(const FShaderID &id, char *buffer, const ShaderLangu
if (enableColorTest) { if (enableColorTest) {
if (compat.shaderLanguage == HLSL_D3D11) { if (compat.shaderLanguage == HLSL_D3D11) {
WRITE(p, "uint roundAndScaleTo8x4(float3 x) { uvec3 u = (floor(x * 255.0f + 0.5f)); return u.r | (u.g << 8) | (u.b << 16); }\n"); WRITE(p, "uint roundAndScaleTo8x4(float3 x) { uvec3 u = (floor(x * 255.0f + 0.5f)); return u.r | (u.g << 8) | (u.b << 16); }\n");
WRITE(p, "uint packFloatsTo8x4(in vec3 x) { uvec3 u = uvec3(x); return u.r | (u.g << 8) | (u.b << 16); }\n");
} else { } else {
WRITE(p, "vec3 roundAndScaleTo255v(float3 x) { return floor(x * 255.0f + 0.5f); }\n"); WRITE(p, "vec3 roundAndScaleTo255v(float3 x) { return floor(x * 255.0f + 0.5f); }\n");
} }
@ -408,7 +410,8 @@ bool GenerateFragmentShader(const FShaderID &id, char *buffer, const ShaderLangu
} }
if (enableColorTest && !colorTestAgainstZero) { if (enableColorTest && !colorTestAgainstZero) {
if (compat.bitwiseOps) { if (compat.bitwiseOps) {
WRITE(p, "uint roundAndScaleTo8x4(in vec3 x) { uvec3 u = uvec3(floor(x * 255.0 + 0.5)); return u.r | (u.g << 8) | (u.b << 16); }\n"); WRITE(p, "uint roundAndScaleTo8x4(in vec3 x) { uvec3 u = uvec3(floor(x * 255.99)); return u.r | (u.g << 8) | (u.b << 16); }\n");
WRITE(p, "uint packFloatsTo8x4(in vec3 x) { uvec3 u = uvec3(x); return u.r | (u.g << 8) | (u.b << 16); }\n");
} else if (gl_extensions.gpuVendor == GPU_VENDOR_IMGTEC) { } else if (gl_extensions.gpuVendor == GPU_VENDOR_IMGTEC) {
WRITE(p, "vec3 roundTo255thv(in vec3 x) { vec3 y = x + (0.5/255.0); return y - fract(y * 255.0) * (1.0 / 255.0); }\n"); WRITE(p, "vec3 roundTo255thv(in vec3 x) { vec3 y = x + (0.5/255.0); return y - fract(y * 255.0) * (1.0 / 255.0); }\n");
} else { } else {
@ -943,7 +946,7 @@ bool GenerateFragmentShader(const FShaderID &id, char *buffer, const ShaderLangu
} else if (compat.bitwiseOps) { } else if (compat.bitwiseOps) {
WRITE(p, " uint v_uint = roundAndScaleTo8x4(v.rgb);\n"); WRITE(p, " uint v_uint = roundAndScaleTo8x4(v.rgb);\n");
WRITE(p, " uint v_masked = v_uint & u_alphacolormask;\n"); WRITE(p, " uint v_masked = v_uint & u_alphacolormask;\n");
WRITE(p, " uint colorTestRef = roundAndScaleTo8x4(u_alphacolorref.rgb) & u_alphacolormask;\n"); WRITE(p, " uint colorTestRef = packFloatsTo8x4(u_alphacolorref.rgb) & u_alphacolormask;\n");
WRITE(p, " if (v_masked %s colorTestRef) %s\n", test, discardStatement); WRITE(p, " if (v_masked %s colorTestRef) %s\n", test, discardStatement);
} else if (gl_extensions.gpuVendor == GPU_VENDOR_IMGTEC) { } else if (gl_extensions.gpuVendor == GPU_VENDOR_IMGTEC) {
WRITE(p, " if (roundTo255thv(v.rgb) %s u_alphacolorref.rgb) %s\n", test, discardStatement); WRITE(p, " if (roundTo255thv(v.rgb) %s u_alphacolorref.rgb) %s\n", test, discardStatement);