Require OpenGL 3.0 unconditionally; this is a no-op, since we already required GLSL...

diff --git a/README b/README
index 8e47db753733cbe0610259b6d640ce30f34e512a..c7b129a25b1d5db740bacc0fd7e65c63c36db46e 100644 (file)
--- a/README
+++ b/README
@@ -20,12 +20,8 @@ OK, you need
 * A C++98 compiler. GCC will do. (I haven't tried Windows, but it
   works fine on Linux and OS X, and Movit is not very POSIX-bound.)
 * GNU Make.
 * A C++98 compiler. GCC will do. (I haven't tried Windows, but it
   works fine on Linux and OS X, and Movit is not very POSIX-bound.)
 * GNU Make.

-* A GPU capable of running GLSL fragment shaders,
-  processing floating-point textures, and a few other things (all are
-  part of OpenGL 3.0 or newer, although most OpenGL 2.0 cards also
-  have what's needed through extensions). If your machine is less than five
-  years old _and you have the appropriate drivers_, you're home free.
-  GLES3 (for mobile devices) will also work.
+* A GPU capable of running OpenGL 3.0 or newer. GLES3 (for mobile devices)
+  will also work.

 * The [Eigen 3], [FFTW3] and [Google Test] libraries. (The library itself
   does not depend on the latter, but you probably want to run the unit tests.)
 * The [epoxy] library, for dealing with OpenGL extensions on various
 * The [Eigen 3], [FFTW3] and [Google Test] libraries. (The library itself
   does not depend on the latter, but you probably want to run the unit tests.)
 * The [epoxy] library, for dealing with OpenGL extensions on various

diff --git a/flat_input.h b/flat_input.h
index d8b62b7ec369b4ecf4272bd90cbf89fa4933bf08..b337788f4edaa328c1c5f1a00f2b6b4787ff6245 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -9,7 +9,6 @@
 #include "effect_chain.h"
 #include "fp16.h"
 #include "image_format.h"
 #include "effect_chain.h"
 #include "fp16.h"
 #include "image_format.h"

-#include "init.h"

 #include "input.h"
 
 namespace movit {
 #include "input.h"
 
 namespace movit {


@@ -30,8 +29,7 @@ public:
                // support for single-channel sRGB decoding, but it's not supported
                // on GLES, and we're already actively rewriting single-channel inputs
                // to GL_RED (even on desktop), so we stick to 3- and 4-channel inputs.
                // support for single-channel sRGB decoding, but it's not supported
                // on GLES, and we're already actively rewriting single-channel inputs
                // to GL_RED (even on desktop), so we stick to 3- and 4-channel inputs.

-               return (movit_srgb_textures_supported &&
-                       type == GL_UNSIGNED_BYTE &&
+               return (type == GL_UNSIGNED_BYTE &&

                        (pixel_format == FORMAT_RGB ||
                         pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) &&
                        (image_format.gamma_curve == GAMMA_LINEAR ||
                        (pixel_format == FORMAT_RGB ||
                         pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) &&
                        (image_format.gamma_curve == GAMMA_LINEAR ||

diff --git a/init.cpp b/init.cpp
index 2bade83c782fbc1e7d2d152b6ff0b0004515f2bd..d312cd8bd7e58eae1abdc7231a68b3532c8c138f 100644 (file)
--- a/init.cpp
+++ b/init.cpp
@@ -15,7 +15,6 @@ namespace movit {
 bool movit_initialized = false;
 MovitDebugLevel movit_debug_level = MOVIT_DEBUG_ON;
 float movit_texel_subpixel_precision;
 bool movit_initialized = false;
 MovitDebugLevel movit_debug_level = MOVIT_DEBUG_ON;
 float movit_texel_subpixel_precision;

-bool movit_srgb_textures_supported;

 bool movit_timer_queries_supported;
 int movit_num_wrongly_rounded;
 MovitShaderModel movit_shader_model;
 bool movit_timer_queries_supported;
 int movit_num_wrongly_rounded;
 MovitShaderModel movit_shader_model;


@@ -282,33 +281,6 @@ void measure_roundoff_problems()
        check_error();
 }
 
        check_error();
 }
 

-struct RequiredExtension {
-       int min_equivalent_gl_version;
-       const char extension_name[64];
-};
-const RequiredExtension required_extensions[] = {
-       // We fundamentally need FBOs and floating-point textures.
-       // FBOs are covered by OpenGL 1.5, and are not an extension there.
-       // Floating-point textures are part of OpenGL 3.0 and newer.
-       { 15, "GL_ARB_framebuffer_object" },
-       { 30, "GL_ARB_texture_float" },
-
-       // We assume that we can use non-power-of-two textures without restrictions.
-       { 20, "GL_ARB_texture_non_power_of_two" },
-
-       // We also need GLSL fragment shaders.
-       { 20, "GL_ARB_fragment_shader" },
-       { 20, "GL_ARB_shading_language_100" },
-
-       // FlatInput and YCbCrInput uses PBOs. (They could in theory do without,
-       // but no modern card would really not provide it.)
-       { 21, "GL_ARB_pixel_buffer_object" },
-
-       // ResampleEffect uses RG textures to encode a two-component LUT.
-       // We also need GL_R several places, for single-channel input.
-       { 30, "GL_ARB_texture_rg" },
-};
-

 bool check_extensions()
 {
        // GLES generally doesn't use extensions as actively as desktop OpenGL.
 bool check_extensions()
 {
        // GLES generally doesn't use extensions as actively as desktop OpenGL.


@@ -316,7 +288,6 @@ bool check_extensions()
        // we need.
        if (!epoxy_is_desktop_gl()) {
                if (epoxy_gl_version() >= 30) {
        // we need.
        if (!epoxy_is_desktop_gl()) {
                if (epoxy_gl_version() >= 30) {

-                       movit_srgb_textures_supported = true;

                        return true;
                } else {
                        fprintf(stderr, "Movit system requirements: GLES version %.1f is too old (GLES 3.0 needed).\n",
                        return true;
                } else {
                        fprintf(stderr, "Movit system requirements: GLES version %.1f is too old (GLES 3.0 needed).\n",


@@ -326,31 +297,13 @@ bool check_extensions()
                }
        }
 
                }
        }
 

-       // Check all extensions, and output errors for the ones that we are missing.
-       bool all_ok = true;
-       int gl_version = epoxy_gl_version();
-
-       for (unsigned i = 0; i < sizeof(required_extensions) / sizeof(required_extensions[0]); ++i) {
-               if (gl_version < required_extensions[i].min_equivalent_gl_version &&
-                   !epoxy_has_gl_extension(required_extensions[i].extension_name)) {
-                       fprintf(stderr, "Movit system requirements: Needs extension '%s' or at least OpenGL version %.1f (has version %.1f)\n",
-                               required_extensions[i].extension_name,
-                               0.1f * required_extensions[i].min_equivalent_gl_version,
-                               0.1f * gl_version);
-                       all_ok = false;
-               }
-       }
-
-       if (!all_ok) {
+       if (epoxy_gl_version() < 30) {
+               fprintf(stderr, "Movit system requirements: OpenGL version %.1f is too old (OpenGL 3.0 needed).\n",
+                       0.1f * epoxy_gl_version());

                fprintf(stderr, "Movit initialization failed.\n");
                return false;
        }
 
                fprintf(stderr, "Movit initialization failed.\n");
                return false;
        }
 

-       // sRGB texture decode would be nice, but are not mandatory
-       // (GammaExpansionEffect can do the same thing if needed).
-       movit_srgb_textures_supported =
-               (epoxy_gl_version() >= 21 || epoxy_has_gl_extension("GL_EXT_texture_sRGB"));
-

        // 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.
        // 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/init.h b/init.h
index 463c7fc3286d8b12b29846b1c80f6c07dd9dcabb..a64443500b32bbfcf9d0faf13a5c1b15f0f4b063 100644 (file)
--- a/init.h
+++ b/init.h
@@ -64,9 +64,6 @@ extern float movit_texel_subpixel_precision;
 //     (only relevant if you use e.g. GL_SRGB8 intermediates).
 extern int movit_num_wrongly_rounded;
 
 //     (only relevant if you use e.g. GL_SRGB8 intermediates).
 extern int movit_num_wrongly_rounded;
 

-// Whether the GPU in use supports GL_EXT_texture_sRGB.
-extern bool movit_srgb_textures_supported;
-

 // Whether the OpenGL driver (or GPU) in use supports GL_ARB_timer_query.
 extern bool movit_timer_queries_supported;
 
 // Whether the OpenGL driver (or GPU) in use supports GL_ARB_timer_query.
 extern bool movit_timer_queries_supported;