BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HLSL: Fix merge conflict.

Browse source
This commit is contained in:
John Kessenich 2016-09-29 10:27:57 -06:00
parent 4e55988a47
commit 21e7e32126
3 changed files with 143 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Test/hlsl.array.implicit-size.frag
View file

@ -1,12 +1,12 @@
// implicit sized array
uniform float g_array [ ] = { 1, 2, 3, 4, 5 };
static float g_array [ ] = { 1, 2, 3, 4, 5 };
// Unused implicit sized array
uniform float g_array_unused [ ] = { 1, 2, 3, 4, 5, 6, 7 };
static float g_array_unused [ ] = { 1, 2, 3, 4, 5, 6, 7 };
// Test implicit size arrayed structs
uniform struct mystruct {
static struct mystruct {
int i;
float f;
} g_mystruct[] = {