Allow setting width/height on FlatInput and YCbCrInput after instantiation.

[movit] / util.cpp

diff --git a/util.cpp b/util.cpp
index 3f59edfbce359e752eaa7786fdd6e10636052c36..d50039993bafc08853fe1278803f053212521f71 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -129,6 +129,8 @@ string read_version_dependent_file(const string &base, const string &extension)
 {
        if (movit_shader_model == MOVIT_GLSL_130) {
                return read_file(base + ".130." + extension);
+       } else if (movit_shader_model == MOVIT_GLSL_150) {
+               return read_file(base + ".150." + extension);
        } else if (movit_shader_model == MOVIT_ESSL_300) {
                return read_file(base + ".300es." + extension);
        } else {
@@ -332,11 +334,11 @@ void *get_gl_context_identifier()
 #elif defined(WIN32)
        return (void *)wglGetCurrentContext();
 #else
-       void *ret = (void *)glXGetCurrentContext();
+       void *ret = (void *)eglGetCurrentContext();
        if (ret != NULL) {
                return ret;
        }
-       return (void *)eglGetCurrentContext();
+       return (void *)glXGetCurrentContext();
 #endif
 }