Merge pull request xenia-project#533 from sephiroth99/noamd

More shader changes
FGOD1983 · Feb 16, 2016 · cc00b2d · cc00b2d
2 parents 043e569 + 0067473
commit cc00b2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/xenia/gpu/glsl_shader_translator.cc b/src/xenia/gpu/glsl_shader_translator.cc
@@ -179,7 +179,7 @@ vec4 cube(vec4 src0, vec4 src1) {
   float s = (sc / ma + 1.0) / 2.0;
   float t = (tc / ma + 1.0) / 2.0;
   return vec4(t, s, 2.0 * ma, float(face_id));
-};
+}
 )");
 
   if (is_vertex_shader()) {
@@ -234,7 +234,7 @@ vec4 applyTransform(const in StateData state, vec4 pos) {
   pos.xyz = mix(pos.xyz, pos.xyz / pos.w, notEqual(state.vtx_fmt.xyz, vec3(0.0)));
   pos.xy *= state.window_scale.xy;
   return pos;
-};
+}
 void processVertex(const in StateData state);
 void main() {
   gl_Position = vec4(0.0, 0.0, 0.0, 1.0);

diff --git a/src/xenia/ui/gl/gl_context.cc b/src/xenia/ui/gl/gl_context.cc
@@ -287,8 +287,8 @@ void GLContext::AssertExtensionsPresent() {
       reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
   std::string glsl_version(glsl_version_raw);
   if (glsl_version.find("4.50") != 0) {
-    XELOGW("GLSL version reported as %s; you may have a bad time!",
-           glsl_version_raw);
+    FatalGLError("OpenGL GLSL version 4.50 is required.");
+    return;
   }
 
   if (!GLEW_ARB_bindless_texture || !glMakeTextureHandleResidentARB) {