diff --git a/ci_shadervalidator/main.cpp b/ci_shadervalidator/main.cpp index 7a4b53aa2..65ad54b2a 100644 --- a/ci_shadervalidator/main.cpp +++ b/ci_shadervalidator/main.cpp @@ -46,6 +46,8 @@ bool check_shader_allopts(std::string filename) Global.gfx_skippipeline = false; Global.gfx_extraeffects = true; Global.gfx_shadergamma = true; + // the default of the simulator, which compiles the alpha to coverage branches of the shaders + Global.iMultisampling = 2; if (!check_shader(filename)) suc = false; @@ -56,6 +58,7 @@ bool check_shader_allopts(std::string filename) Global.gfx_skippipeline = true; Global.gfx_extraeffects = false; Global.gfx_shadergamma = false; + Global.iMultisampling = 0; if (!check_shader(filename)) suc = false; diff --git a/gl/glsl_common.cpp b/gl/glsl_common.cpp index a0d38de63..e621fdc6b 100644 --- a/gl/glsl_common.cpp +++ b/gl/glsl_common.cpp @@ -65,6 +65,7 @@ void gl::glsl_common_setup() float fog_density; float alpha_mult; float shadow_tone; + float alpha_to_coverage; }; layout (std140) uniform scene_ubo @@ -117,12 +118,19 @@ void gl::glsl_common_setup() // multisampling; otherwise the alpha test keeps or drops whole pixels and its edges stay // jagged whatever the multisampling. the alpha is sharpened to go from 0 to 1 over about // a pixel around the test threshold, so the edge keeps the place and sharpness the alpha - // test gave it. computed before any discard, which leaves the derivatives undefined + // test gave it. computed before any discard, which leaves the derivatives undefined. + // alpha_to_coverage of model_ubo tells whether alpha to coverage is on for this draw; where + // it isn't (reflections, previews) the shaders keep the plain alpha test float alpha_coverage(float alpha) { #if ALPHA_TO_COVERAGE_ENABLED - if (opacity > 0.0) - return clamp((alpha - opacity) / max(fwidth(alpha), 0.0001) + 0.5, 0.0, 1.0); + if (opacity > 0.0 && alpha_to_coverage > 0.0) + { + // a flat alpha has no edge in the pixel and gets the plain test, so an alpha equal + // to the threshold stays fully covered + float fw = fwidth(alpha); + return (fw > 0.0 ? clamp((alpha - opacity) / fw + 0.5, 0.0, 1.0) : step(opacity, alpha)); + } #endif return alpha; } @@ -133,7 +141,7 @@ void gl::glsl_common_setup() bool alpha_test_fail(float alpha, float coverage) { #if ALPHA_TO_COVERAGE_ENABLED - if (opacity > 0.0) + if (opacity > 0.0 && alpha_to_coverage > 0.0) return coverage <= 0.0; #endif return (opacity >= 0.0 ? (alpha < opacity) : (alpha >= -opacity)); diff --git a/gl/ubo.h b/gl/ubo.h index 9d2c96912..0e5901cb3 100644 --- a/gl/ubo.h +++ b/gl/ubo.h @@ -76,7 +76,11 @@ namespace gl float fog_density; float alpha_mult; float shadow_tone; - UBS_PAD(12); + // 1.0 while GL_SAMPLE_ALPHA_TO_COVERAGE is on, so the alpha tested shaders write the + // coverage of their test edge; 0.0 keeps their plain alpha test. set together with + // the GL state by opengl33_renderer::setup_alpha_to_coverage() + float alpha_to_coverage; + UBS_PAD(8); void set_modelview(const glm::mat4 &mv) { diff --git a/rendering/opengl33renderer.cpp b/rendering/opengl33renderer.cpp index d577312b5..39c0d865c 100644 --- a/rendering/opengl33renderer.cpp +++ b/rendering/opengl33renderer.cpp @@ -1822,6 +1822,10 @@ void opengl33_renderer::setup_matrices() void opengl33_renderer::setup_alpha_to_coverage(bool const Enable) { + // the shaders keep the plain alpha test unless told the coverage of their alpha is used; + // uploaded with the rest of the model block at the next draw + model_ubs.alpha_to_coverage = (Enable ? 1.f : 0.f); + if (Enable == m_alphatocoverageenabled) return; @@ -2390,11 +2394,13 @@ void opengl33_renderer::Bind_Material( material_handle const Material, TSubModel // the alpha test drops or keeps whole pixels, so multisampling alone leaves its edges (e.g. sides // of the trackbed textures) jagged. the alpha tested materials of the opaque colour pass get them - // antialiased with alpha to coverage instead; their shaders give the coverage as the alpha + // antialiased with alpha to coverage instead; their shaders give the coverage as the alpha. + // the model previews draw in colour mode too, but to a single-sampled framebuffer setup_alpha_to_coverage( Global.iMultisampling > 0 && false == m_blendingenabled && m_renderpass.draw_mode == rendermode::color + && false == m_previewing && model_ubs.opacity > 0.f && material.shader->alpha_to_coverage );