Revert "Add a hack to use #version 110 but keep using 130 features, for the benefit...

[movit] / init.cpp

diff --git a/init.cpp b/init.cpp
index 733d24689b5f5c4f2ef56135a32030e92fa9738f..55bddece75f74dc3a3a726a63e0cdd52baf454f7 100644 (file)
--- a/init.cpp
+++ b/init.cpp
@@ -437,14 +437,7 @@ bool init_movit(const string& data_directory, MovitDebugLevel debug_level)
                if (get_glsl_version() < 1.30f) {
                        fprintf(stderr, "Movit system requirements: Needs at least GLSL version 1.30 (has version %.1f)\n",
                                get_glsl_version());
-                       if (get_glsl_version() >= 1.10f) {
-                               fprintf(stderr, "Attempting to continue nevertheless; expect shader compilation issues.\n");
-                               fprintf(stderr, "Try switching to a core OpenGL context, as especially OS X drivers\n");
-                               fprintf(stderr, "support newer GLSL versions there.\n");
-                               movit_shader_model = MOVIT_GLSL_130_AS_110;
-                       } else {
-                               return false;
-                       }
+                       return false;
                }
                if (get_glsl_version() < 1.50f) {
                        movit_shader_model = MOVIT_GLSL_130;