From bb8f46837ca4dfa2d085dfbf62e5c27136778712 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 7 Feb 2016 12:15:07 +0100 Subject: [PATCH] Remove the check for movit_shader_rounding_supported, as we now demand 1.30 unconditionally. --- demo.cpp | 6 +----- dither_effect.cpp | 2 +- init.cpp | 9 --------- version.h | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/demo.cpp b/demo.cpp index dbbb4cb..ff910f0 100644 --- a/demo.cpp +++ b/demo.cpp @@ -213,11 +213,7 @@ int main(int argc, char **argv) printf("Wrongly rounded x+0.48 or x+0.52 values: %d/510\n", movit_num_wrongly_rounded); if (movit_num_wrongly_rounded > 0) { - if (movit_shader_rounding_supported) { - printf("Rounding off in the shader to compensate.\n"); - } else { - printf("No shader roundoff available; cannot compensate.\n"); - } + printf("Rounding off in the shader to compensate.\n"); } unsigned img_w, img_h; diff --git a/dither_effect.cpp b/dither_effect.cpp index 574d70a..3fa6aeb 100644 --- a/dither_effect.cpp +++ b/dither_effect.cpp @@ -51,7 +51,7 @@ DitherEffect::~DitherEffect() string DitherEffect::output_fragment_shader() { char buf[256]; - sprintf(buf, "#define NEED_EXPLICIT_ROUND %d\n", (movit_num_wrongly_rounded > 0 && movit_shader_rounding_supported)); + sprintf(buf, "#define NEED_EXPLICIT_ROUND %d\n", (movit_num_wrongly_rounded > 0)); return buf + read_file("dither_effect.frag"); } diff --git a/init.cpp b/init.cpp index 55bddec..b9e68ab 100644 --- a/init.cpp +++ b/init.cpp @@ -18,7 +18,6 @@ float movit_texel_subpixel_precision; bool movit_srgb_textures_supported; bool movit_timer_queries_supported; int movit_num_wrongly_rounded; -bool movit_shader_rounding_supported; MovitShaderModel movit_shader_model; // The rules for objects with nontrivial constructors in static scope @@ -318,7 +317,6 @@ bool check_extensions() if (!epoxy_is_desktop_gl()) { if (epoxy_gl_version() >= 30) { movit_srgb_textures_supported = true; - movit_shader_rounding_supported = true; return true; } else { fprintf(stderr, "Movit system requirements: GLES version %.1f is too old (GLES 3.0 needed).\n", @@ -353,13 +351,6 @@ bool check_extensions() movit_srgb_textures_supported = (epoxy_gl_version() >= 21 || epoxy_has_gl_extension("GL_EXT_texture_sRGB")); - // We may want to use round() at the end of the final shader, - // if supported. We need either GLSL 1.30 or this extension to do that, - // and 1.30 brings with it other things that we don't want to demand - // for now. - movit_shader_rounding_supported = - (epoxy_gl_version() >= 30 || epoxy_has_gl_extension("GL_EXT_gpu_shader4")); - // The user can specify that they want a timing report for each // phase in an effect chain. However, that depends on this extension; // without it, we do cannot even create the query objects. diff --git a/version.h b/version.h index b1e3d36..556c4af 100644 --- a/version.h +++ b/version.h @@ -5,6 +5,6 @@ // changes, even within git versions. There is no specific version // documentation outside the regular changelogs, though. -#define MOVIT_VERSION 17 +#define MOVIT_VERSION 18 #endif // !defined(_MOVIT_VERSION_H) -- 2.39.2