diff options
author | Hans-Kristian Arntzen <hans-kristian.arntzen@arm.com> | 2018-09-27 12:10:22 +0300 |
---|---|---|
committer | Hans-Kristian Arntzen <hans-kristian.arntzen@arm.com> | 2018-09-27 12:10:22 +0300 |
commit | af75ef005ffb27f7641a556f2627b973c0995737 (patch) | |
tree | 2f46c4a6f85a8aefd935c5a335b3c3843b0a3343 /reference/shaders/flatten | |
parent | 69b034f26e28a76a6f4e5d9521123072b24d7ea2 (diff) |
Update glslang and SPIRV-Tools.
A lot of changes in spirv-opt output.
Some new invalid SPIR-V was found but most of them were not significant
for SPIRV-Cross, so just marked them as invalid.
Diffstat (limited to 'reference/shaders/flatten')
-rw-r--r-- | reference/shaders/flatten/matrix-conversion.flatten.frag | 2 | ||||
-rw-r--r-- | reference/shaders/flatten/multi-dimensional.desktop.invalid.flatten_dim.frag (renamed from reference/shaders/flatten/multi-dimensional.desktop.flatten_dim.frag) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/reference/shaders/flatten/matrix-conversion.flatten.frag b/reference/shaders/flatten/matrix-conversion.flatten.frag index 05f6aef2..ee79bf5b 100644 --- a/reference/shaders/flatten/matrix-conversion.flatten.frag +++ b/reference/shaders/flatten/matrix-conversion.flatten.frag @@ -9,6 +9,6 @@ layout(location = 0) flat in vec3 vNormal; void main() { mat4 _19 = mat4(UBO[0], UBO[1], UBO[2], UBO[3]); - FragColor = mat3(vec3(_19[0].x, _19[0].y, _19[0].z), vec3(_19[1].x, _19[1].y, _19[1].z), vec3(_19[2].x, _19[2].y, _19[2].z)) * vNormal; + FragColor = mat3(_19[0].xyz, _19[1].xyz, _19[2].xyz) * vNormal; } diff --git a/reference/shaders/flatten/multi-dimensional.desktop.flatten_dim.frag b/reference/shaders/flatten/multi-dimensional.desktop.invalid.flatten_dim.frag index ef6bb526..ef6bb526 100644 --- a/reference/shaders/flatten/multi-dimensional.desktop.flatten_dim.frag +++ b/reference/shaders/flatten/multi-dimensional.desktop.invalid.flatten_dim.frag |