diff --git a/src/hardware/hw_shaders.h b/src/hardware/hw_shaders.h index f7a086186..0ef5acccf 100644 --- a/src/hardware/hw_shaders.h +++ b/src/hardware/hw_shaders.h @@ -61,9 +61,9 @@ "if (scr_resolution.y > 720.0) {\n" \ "halfResolutiony = scr_resolution.y * 0.5;\n" \ "}\n" \ - "float zFactor = clamp((z - 768.0) / (2304.0 - 768.0), 0.0, 1.0);\n" \ - "halfResolutionx = mix(halfResolutionx, halfResolutionx * 2.0, zFactor);\n" \ - "halfResolutiony = mix(halfResolutiony, halfResolutiony * 2.0, zFactor);\n" \ + "float zFactor = clamp((z - 768.0) / (3072.0 - 768.0), 0.0, 1.0);\n" \ + "halfResolutionx = mix(halfResolutionx, halfResolutionx * 4.0, zFactor);\n" \ + "halfResolutiony = mix(halfResolutiony, halfResolutiony * 4.0, zFactor);\n" \ "vec2 normalizedPosition = position * vec2(halfResolutionx / scr_resolution.x, halfResolutiony / scr_resolution.y);\n" \ "int x = int(mod(normalizedPosition.x, 4.0));\n" \ "int y = int(mod(normalizedPosition.y, 4.0));\n" \ @@ -74,11 +74,11 @@ "15.0, 7.0, 13.0, 5.0\n" \ ");\n" \ "#ifdef SRB2_PALETTE_RENDERING\n" \ - "float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 11.0);\n" \ + "float threshold = bayerMatrix[y*4 + x] / 11.0;\n" \ "#else\n" \ - "float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 16.0);\n" \ + "float threshold = bayerMatrix[y*4 + x] / 16.0;\n" \ "#endif\n" \ - "return baseValue + threshold - 0.5 / 16.0;\n" \ + "return mix(baseValue + threshold - 0.5 / 16.0, baseValue, zFactor);\n" #define GLSL_DOOM_COLORMAP_NODITHER \ "return max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \