gpu/shaders: avoid first-class arrays

Safari's WebGL1 implementation (rightly) complains that first-class
array types are not supported as function result types. Define and
use a struct type instead.

While we're here, use const variables instead of functions.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-04-28 14:33:27 +02:00
parent 22f964548b
commit 1062d4e79d
4 changed files with 87 additions and 95 deletions
+3 -5
View File
@@ -17,12 +17,10 @@ layout(binding = 0) uniform Block {
layout(location = 0) out vec2 vUV;
void main() {
vec3[2] fboTrans = fboTransform();
vec3 p = transform3x2(fboTrans, vec3(pos, 1.0));
vec3 p = transform3x2(fboTransform, vec3(pos, 1.0));
gl_Position = vec4(p, 1);
vec3[2] fboTexTrans = fboTextureTransform();
vec3 uv3 = transform3x2(fboTexTrans, vec3(uv, 1.0));
vec3 uv3 = transform3x2(fboTextureTransform, vec3(uv, 1.0));
vUV = uv3.xy*subUVTransform.xy + subUVTransform.zw;
vUV = transform3x2(fboTexTrans, vec3(vUV, 1.0)).xy;
vUV = transform3x2(fboTextureTransform, vec3(vUV, 1.0)).xy;
vUV = vUV*uvTransform.xy + uvTransform.zw;
}