From d95c760c5c9bc0501bff28ab7425dfafe49132e0 Mon Sep 17 00:00:00 2001 From: Crementif Date: Tue, 26 Dec 2017 01:10:57 +0100 Subject: [PATCH] Fixed Yoshi's Wooly World black screen Fixes the problem. The actual DoF shader adjustment (the one included was a placeholder or something from me??! didn't do anything) made my computer crash in Nsight everytime I tried anything to change the related value (it's unique) so might try tomorrow. Anyway, closing the related issue. --- .../3351b5b74138d9f2_0000000000000000_vs.txt | 68 ------------------- .../d9c136f923387c45_0000000000000000_vs.txt | 68 ------------------- Source/WoollyWorld/rules.txt | 1 + 3 files changed, 1 insertion(+), 136 deletions(-) delete mode 100644 Source/WoollyWorld/3351b5b74138d9f2_0000000000000000_vs.txt delete mode 100644 Source/WoollyWorld/d9c136f923387c45_0000000000000000_vs.txt diff --git a/Source/WoollyWorld/3351b5b74138d9f2_0000000000000000_vs.txt b/Source/WoollyWorld/3351b5b74138d9f2_0000000000000000_vs.txt deleted file mode 100644 index 16c39190..00000000 --- a/Source/WoollyWorld/3351b5b74138d9f2_0000000000000000_vs.txt +++ /dev/null @@ -1,68 +0,0 @@ - -#version 420 -#extension GL_ARB_texture_gather : enable -#extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_packing : enable -// shader 3351b5b74138d9f2 -// Used for vertical blur -const float resXScale = ; -const float resYScale = ; - -uniform vec2 uf_windowSpaceToClipSpaceTransform; -layout(location = 0) in uvec4 attrDataSem0; -layout(location = 1) in uvec4 attrDataSem1; -out gl_PerVertex -{ - vec4 gl_Position; - float gl_PointSize; -}; -layout(location = 0) out vec4 passParameterSem0; -int clampFI32(int v) -{ -if( v == 0x7FFFFFFF ) - return floatBitsToInt(1.0); -else if( v == 0xFFFFFFFF ) - return floatBitsToInt(0.0); -return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); -} -float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; } -void main() -{ -vec4 R1f = vec4(0.0); -vec4 R2f = vec4(0.0); -uvec4 attrDecoder; -float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f; -vec4 PV0f = vec4(0.0), PV1f = vec4(0.0); -float PS0f = 0.0, PS1f = 0.0; -vec4 tempf = vec4(0.0); -float tempResultf; -int tempResulti; -ivec4 ARi = ivec4(0); -bool predResult = true; -vec3 cubeMapSTM; -int cubeMapFaceId; -attrDecoder.xyz = attrDataSem0.xyz; -attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24)); -attrDecoder.w = 0; -R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0))); -attrDecoder.xy = attrDataSem1.xy; -attrDecoder.xy = (attrDecoder.xy>>24)|((attrDecoder.xy>>8)&0xFF00)|((attrDecoder.xy<<8)&0xFF0000)|((attrDecoder.xy<<24)); -attrDecoder.z = 0; -attrDecoder.w = 0; -R2f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(floatBitsToInt(0.0)), intBitsToFloat(floatBitsToInt(1.0))); -// 0 -backupReg0f = R2f.x; -backupReg1f = R2f.y; -R2f.x = backupReg0f; -R2f.y = backupReg1f; -// export -gl_Position = vec4(R1f.x, R1f.y, R1f.z, R1f.w); -// export -passParameterSem0 = vec4(R2f.x, R2f.y, R2f.z, R2f.z); -} diff --git a/Source/WoollyWorld/d9c136f923387c45_0000000000000000_vs.txt b/Source/WoollyWorld/d9c136f923387c45_0000000000000000_vs.txt deleted file mode 100644 index 1a9e5a7d..00000000 --- a/Source/WoollyWorld/d9c136f923387c45_0000000000000000_vs.txt +++ /dev/null @@ -1,68 +0,0 @@ - -#version 420 -#extension GL_ARB_texture_gather : enable -#extension GL_ARB_separate_shader_objects : enable -#extension GL_ARB_shading_language_packing : enable -// shader d9c136f923387c45 -// Used for horizontal blur -const float resXScale = ; -const float resYScale = ; - -uniform vec2 uf_windowSpaceToClipSpaceTransform; -layout(location = 0) in uvec4 attrDataSem0; -layout(location = 1) in uvec4 attrDataSem1; -out gl_PerVertex -{ - vec4 gl_Position; - float gl_PointSize; -}; -layout(location = 0) out vec4 passParameterSem0; -int clampFI32(int v) -{ -if( v == 0x7FFFFFFF ) - return floatBitsToInt(1.0); -else if( v == 0xFFFFFFFF ) - return floatBitsToInt(0.0); -return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); -} -float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; } -void main() -{ -vec4 R1f = vec4(0.0); -vec4 R2f = vec4(0.0); -uvec4 attrDecoder; -float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f; -vec4 PV0f = vec4(0.0), PV1f = vec4(0.0); -float PS0f = 0.0, PS1f = 0.0; -vec4 tempf = vec4(0.0); -float tempResultf; -int tempResulti; -ivec4 ARi = ivec4(0); -bool predResult = true; -vec3 cubeMapSTM; -int cubeMapFaceId; -attrDecoder.xyz = attrDataSem0.xyz; -attrDecoder.xyz = (attrDecoder.xyz>>24)|((attrDecoder.xyz>>8)&0xFF00)|((attrDecoder.xyz<<8)&0xFF0000)|((attrDecoder.xyz<<24)); -attrDecoder.w = 0; -R1f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(int(attrDecoder.z)), intBitsToFloat(floatBitsToInt(1.0))); -attrDecoder.xy = attrDataSem1.xy; -attrDecoder.xy = (attrDecoder.xy>>24)|((attrDecoder.xy>>8)&0xFF00)|((attrDecoder.xy<<8)&0xFF0000)|((attrDecoder.xy<<24)); -attrDecoder.z = 0; -attrDecoder.w = 0; -R2f = vec4(intBitsToFloat(int(attrDecoder.x)), intBitsToFloat(int(attrDecoder.y)), intBitsToFloat(floatBitsToInt(0.0)), intBitsToFloat(floatBitsToInt(1.0))); -// 0 -backupReg0f = R2f.x; -backupReg1f = R2f.y; -R2f.x = backupReg0f; -R2f.y = backupReg1f; -// export -gl_Position = vec4(R1f.x, R1f.y, R1f.z, R1f.w); -// export -passParameterSem0 = vec4(R2f.x, R2f.y, R2f.z, R2f.z); -} diff --git a/Source/WoollyWorld/rules.txt b/Source/WoollyWorld/rules.txt index f43ef1bf..b679e35e 100644 --- a/Source/WoollyWorld/rules.txt +++ b/Source/WoollyWorld/rules.txt @@ -15,6 +15,7 @@ version = 2 [TextureRedefine] # tv width = 1280 height = 720 +formatsExcluded = 0x033 overwriteWidth = overwriteHeight =