From 0640cc2ccaf931776c2a9725ce8fc38a33b3c5f2 Mon Sep 17 00:00:00 2001 From: hunterk Date: Wed, 7 Dec 2016 21:14:21 -0600 Subject: [PATCH] force srgb framebuffers in crt-royale passes --- blurs/blur9fast-horizontal-gamma-encode-every-fbo.slang | 0 ...blur9fast-horizontal-last-pass-gamma-encode-every-fbo.slang | 0 blurs/blur9fast-horizontal-last-pass.slang | 0 blurs/blur9fast-horizontal.slang | 3 ++- blurs/blur9fast-vertical-gamma-encode-every-fbo.slang | 0 blurs/blur9fast-vertical.slang | 3 ++- crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang | 3 ++- .../src/crt-royale-bloom-horizontal-reconstitute.slang | 3 ++- crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang | 3 ++- crt/shaders/crt-royale/src/crt-royale-brightpass.slang | 3 ++- .../crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang | 3 ++- .../src/crt-royale-geometry-aa-last-pass-backup.slang | 0 .../crt-royale/src/crt-royale-geometry-aa-last-pass.slang | 0 .../crt-royale/src/crt-royale-mask-resize-horizontal.slang | 0 .../crt-royale/src/crt-royale-mask-resize-vertical.slang | 0 .../src/crt-royale-scanlines-horizontal-apply-mask.slang | 3 ++- .../src/crt-royale-scanlines-vertical-interlacing.slang | 3 ++- 17 files changed, 18 insertions(+), 9 deletions(-) mode change 100644 => 100755 blurs/blur9fast-horizontal-gamma-encode-every-fbo.slang mode change 100644 => 100755 blurs/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.slang mode change 100644 => 100755 blurs/blur9fast-horizontal-last-pass.slang mode change 100644 => 100755 blurs/blur9fast-horizontal.slang mode change 100644 => 100755 blurs/blur9fast-vertical-gamma-encode-every-fbo.slang mode change 100644 => 100755 blurs/blur9fast-vertical.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-brightpass.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-backup.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang mode change 100644 => 100755 crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang diff --git a/blurs/blur9fast-horizontal-gamma-encode-every-fbo.slang b/blurs/blur9fast-horizontal-gamma-encode-every-fbo.slang old mode 100644 new mode 100755 diff --git a/blurs/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.slang b/blurs/blur9fast-horizontal-last-pass-gamma-encode-every-fbo.slang old mode 100644 new mode 100755 diff --git a/blurs/blur9fast-horizontal-last-pass.slang b/blurs/blur9fast-horizontal-last-pass.slang old mode 100644 new mode 100755 diff --git a/blurs/blur9fast-horizontal.slang b/blurs/blur9fast-horizontal.slang old mode 100644 new mode 100755 index 4a48784..17aa56d --- a/blurs/blur9fast-horizontal.slang +++ b/blurs/blur9fast-horizontal.slang @@ -63,6 +63,7 @@ layout(std140, set = 0, binding = 0) uniform UBO /////////////////////////////// FRAGMENT SHADER ////////////////////////////// #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 tex_uv; layout(location = 1) in vec2 blur_dxdy; layout(location = 0) out vec4 FragColor; @@ -73,4 +74,4 @@ void main() vec3 color = tex2Dblur9fast(Source, tex_uv, blur_dxdy); // Encode and output the blurred image: FragColor = encode_output(vec4(color, 1.0)); -} \ No newline at end of file +} diff --git a/blurs/blur9fast-vertical-gamma-encode-every-fbo.slang b/blurs/blur9fast-vertical-gamma-encode-every-fbo.slang old mode 100644 new mode 100755 diff --git a/blurs/blur9fast-vertical.slang b/blurs/blur9fast-vertical.slang old mode 100644 new mode 100755 index 2e0e1f1..2f39809 --- a/blurs/blur9fast-vertical.slang +++ b/blurs/blur9fast-vertical.slang @@ -63,6 +63,7 @@ layout(std140, set = 0, binding = 0) uniform UBO /////////////////////////////// FRAGMENT SHADER ////////////////////////////// #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 tex_uv; layout(location = 1) in vec2 blur_dxdy; layout(location = 0) out vec4 FragColor; @@ -73,4 +74,4 @@ void main() vec3 color = tex2Dblur9fast(Source, tex_uv, blur_dxdy); // Encode and output the blurred image: FragColor = encode_output(vec4(color, 1.0)); -} \ No newline at end of file +} diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang old mode 100644 new mode 100755 index f803064..b99bc05 --- a/crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang +++ b/crt/shaders/crt-royale/src/crt-royale-bloom-approx.slang @@ -216,6 +216,7 @@ void main() } #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 tex_uv; layout(location = 1) in float estimated_viewport_size_x; layout(location = 2) in vec2 blur_dxdy; @@ -350,4 +351,4 @@ void main() } // Encode and output the blurred image: FragColor = vec4(color, 1.0); -} \ No newline at end of file +} diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang old mode 100644 new mode 100755 index cbd8d93..8708b7b --- a/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang +++ b/crt/shaders/crt-royale/src/crt-royale-bloom-horizontal-reconstitute.slang @@ -83,6 +83,7 @@ void main() } #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 video_uv; layout(location = 1) in vec2 scanline_tex_uv; layout(location = 2) in vec2 halation_tex_uv; @@ -128,4 +129,4 @@ void main() // Encode and output the bloomed image: FragColor = encode_output(vec4(final_bloom, 1.0)); -} \ No newline at end of file +} diff --git a/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang b/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang old mode 100644 new mode 100755 index 3d9c3d6..06b5a99 --- a/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang +++ b/crt/shaders/crt-royale/src/crt-royale-bloom-vertical.slang @@ -69,6 +69,7 @@ void main() } #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 tex_uv; layout(location = 1) in vec2 bloom_dxdy; layout(location = 2) in float bloom_sigma_runtime; @@ -83,4 +84,4 @@ void main() bloom_dxdy, bloom_sigma); // Encode and output the blurred image: FragColor = encode_output(vec4(color, 1.0)); -} \ No newline at end of file +} diff --git a/crt/shaders/crt-royale/src/crt-royale-brightpass.slang b/crt/shaders/crt-royale/src/crt-royale-brightpass.slang old mode 100644 new mode 100755 index 04d70a6..806b717 --- a/crt/shaders/crt-royale/src/crt-royale-brightpass.slang +++ b/crt/shaders/crt-royale/src/crt-royale-brightpass.slang @@ -73,6 +73,7 @@ void main() } #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 video_uv; layout(location = 1) in vec2 scanline_tex_uv; layout(location = 2) in float bloom_sigma_runtime; @@ -139,4 +140,4 @@ void main() mix(blur_ratio, vec3(1.0), params.bloom_excess); FragColor = encode_output(vec4(brightpass, 1.0)); -} \ No newline at end of file +} diff --git a/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang b/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang old mode 100644 new mode 100755 index d9cc61f..6cf2c40 --- a/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang +++ b/crt/shaders/crt-royale/src/crt-royale-first-pass-linearize-crt-gamma-bob-fields.slang @@ -65,6 +65,7 @@ void main() } #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 tex_uv; layout(location = 1) in vec2 uv_step; layout(location = 0) out vec4 FragColor; @@ -110,4 +111,4 @@ if(interlace_detect == true) { FragColor = encode_output(tex2D_linearize(Source, tex_uv)); } -} \ No newline at end of file +} diff --git a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-backup.slang b/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass-backup.slang old mode 100644 new mode 100755 diff --git a/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang b/crt/shaders/crt-royale/src/crt-royale-geometry-aa-last-pass.slang old mode 100644 new mode 100755 diff --git a/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang b/crt/shaders/crt-royale/src/crt-royale-mask-resize-horizontal.slang old mode 100644 new mode 100755 diff --git a/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang b/crt/shaders/crt-royale/src/crt-royale-mask-resize-vertical.slang old mode 100644 new mode 100755 diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang b/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang old mode 100644 new mode 100755 index 7da0158..fb2afa8 --- a/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang +++ b/crt/shaders/crt-royale/src/crt-royale-scanlines-horizontal-apply-mask.slang @@ -116,6 +116,7 @@ void main() } #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 video_uv; layout(location = 1) in vec2 scanline_tex_uv; layout(location = 2) in vec2 blur3x3_tex_uv; @@ -290,4 +291,4 @@ void main() #endif FragColor = encode_output(vec4(pixel_color, 1.0)); -} \ No newline at end of file +} diff --git a/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang b/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang old mode 100644 new mode 100755 index 563ea39..bf8f6cd --- a/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang +++ b/crt/shaders/crt-royale/src/crt-royale-scanlines-vertical-interlacing.slang @@ -74,6 +74,7 @@ void main() } #pragma stage fragment +#pragma format R8G8B8A8_SRGB layout(location = 0) in vec2 tex_uv; layout(location = 1) in vec2 uv_step; layout(location = 2) in vec2 il_step_multiple; @@ -238,4 +239,4 @@ void main() // the alpha channel, but it wasn't working, at least not reliably. This // is faster anyway, levels_autodim_temp = 0.5 isn't causing banding. FragColor = vec4(encode_output(vec4(scanline_intensity * levels_autodim_temp, 1.0))); -} \ No newline at end of file +}