X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=d50039993bafc08853fe1278803f053212521f71;hp=3f59edfbce359e752eaa7786fdd6e10636052c36;hb=3cb6aa45faa156fcb380aeacc13b03743bc471ec;hpb=67a7863f5f060d4396b27a39ea8b495498197e45

diff --git a/util.cpp b/util.cpp
index 3f59edf..d500399 100644
--- 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
 }