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

diff --git a/util.cpp b/util.cpp
index 59f1dcd..d500399 100644
--- a/util.cpp
+++ b/util.cpp
@@ -19,6 +19,7 @@
 #include <epoxy/wgl.h>
 #else
 #include <epoxy/glx.h>
+#include <epoxy/egl.h>
 #endif
 
 using namespace std;
@@ -126,10 +127,10 @@ string read_file(const string &filename)
 
 string read_version_dependent_file(const string &base, const string &extension)
 {
-	if (movit_shader_model == MOVIT_GLSL_110) {
-		return read_file(base + "." + extension);
-	} else if (movit_shader_model == MOVIT_GLSL_130) {
+	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 {
@@ -333,6 +334,10 @@ void *get_gl_context_identifier()
 #elif defined(WIN32)
 	return (void *)wglGetCurrentContext();
 #else
+	void *ret = (void *)eglGetCurrentContext();
+	if (ret != NULL) {
+		return ret;
+	}
 	return (void *)glXGetCurrentContext();
 #endif
 }