Skip to content

G
glslang
Commit 21e7e321 by John Kessenich
Options

HLSL: Fix merge conflict.

parent 4e55988a
Showing with 5 additions and 5 deletions
Test/hlsl.array.implicit-size.frag
// implicit sized array // 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 // 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 // Test implicit size arrayed structs
uniform struct mystruct { static struct mystruct {
int i; int i;
float f; float f;
} g_mystruct[] = { } g_mystruct[] = {
......
glslang/Include/revision.h
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1525" #define GLSLANG_REVISION "Overload400-PrecQual.1527"
#define GLSLANG_DATE "27-Sep-2016" #define GLSLANG_DATE "29-Sep-2016"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment