From 326f9dddc86d2f2d4dad174b3d651f68b16a24d3 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 21 Jul 2019 05:00:29 +0000 Subject: [PATCH] Fix skyrotate glsl compilation error, apparently nvidia are fine with qcish syntax while other drivers are not. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5493 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/r_bishaders.h | 2 +- engine/shaders/glsl/defaultskybox.glsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/gl/r_bishaders.h b/engine/gl/r_bishaders.h index f97c95ad5..cb769d1e3 100644 --- a/engine/gl/r_bishaders.h +++ b/engine/gl/r_bishaders.h @@ -4614,7 +4614,7 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND "return mat3(oc * axis.x * axis.x + c, oc * axis.x * axis.y - axis.z * s, oc * axis.z * axis.x + axis.y * s,\n" "oc * axis.x * axis.y + axis.z * s, oc * axis.y * axis.y + c, oc * axis.y * axis.z - axis.x * s,\n" "oc * axis.z * axis.x - axis.y * s, oc * axis.y * axis.z + axis.x * s, oc * axis.z * axis.z + c);\n" -"};\n" +"}\n" "void main ()\n" "{\n" "pos = v_position.xyz - e_eyepos;\n" diff --git a/engine/shaders/glsl/defaultskybox.glsl b/engine/shaders/glsl/defaultskybox.glsl index bfbb17cda..f93cd30b3 100644 --- a/engine/shaders/glsl/defaultskybox.glsl +++ b/engine/shaders/glsl/defaultskybox.glsl @@ -20,7 +20,7 @@ mat3 rotateAroundAxis(vec4 axis) //xyz axis, with angle in w return mat3(oc * axis.x * axis.x + c, oc * axis.x * axis.y - axis.z * s, oc * axis.z * axis.x + axis.y * s, oc * axis.x * axis.y + axis.z * s, oc * axis.y * axis.y + c, oc * axis.y * axis.z - axis.x * s, oc * axis.z * axis.x - axis.y * s, oc * axis.y * axis.z + axis.x * s, oc * axis.z * axis.z + c); -}; +} void main () { pos = v_position.xyz - e_eyepos;