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

diff --git a/util.cpp b/util.cpp
index 3f59edf..675b25b 100644
--- a/util.cpp
+++ b/util.cpp
@@ -127,8 +127,15 @@ string read_file(const string &filename)
 
 string read_version_dependent_file(const string &base, const string &extension)
 {
-	if (movit_shader_model == MOVIT_GLSL_130) {
+	if (movit_shader_model == MOVIT_GLSL_130_AS_110) {
+		string contents = read_file(base + ".130." + extension);
+		assert(contents.find("#version 130") == 0);
+		contents[10] = '1';  // Change from 130 to 110.
+		return contents;
+	} else 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 +339,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
 }