Merge remote-tracking branch 'aosp/upstream-master' into update-shadercHEADmastermain

Includes the following:
8ce6e2b Fix non-Windows build error.
f97f2ce HLSL: Support the constructor idiom "(struct type)0".
98ad485 HLSL: Support {...} initializer lists that are too short.
1c98904 Fix crash by returning early from finalCheck() if there is no tree to process.
5307eb2 Non-functional: Change a bunch of 0 to nullptr.
509c421 Non-functional: Fix typos.
e50dc53 Warn on HLSL not finding entry point. Issue #588.
517fe7a Non-functional: Rename some entry-point variables to entryPoint, not main.
fca8262 Always correctly terminate main. Issue #588, PR #600.
1c573fb Merge pull request #601 from BearishSun/master
e122f05 Merge pull request #599 from steve-lunarg/gs
6e848da Merge pull request #596 from steve-lunarg/hlsl-intrinsic-parsing
d347794 Merge pull request #597 from steve-lunarg/sample-keyword-fix
32c294e Adding a way to retrieve vertex attribute TType using TProgram reflection API (required in order to query location attributes).
f49cdf4 WIP: HLSL: Add GS support
75fd223 HLSL: allow "sample" as a valid identifier.
0842dbb HLSL: use HLSL parser to parse HLSL intrinsic prototypes, enable int/bool mats
fabe7d6 Test results: Fix incorrect test result caused by parallel development. Issue #594.
0bf06d3 Merge pull request #576 from steve-lunarg/uav-registers
20b030a Merge pull request #592 from ChrisGautier/barrier-wg
c3f1cdf GLSL: The execution scope for barriers should be Workgroup.
84d11e1 Merge pull request #583 from null77/fix-unref-warning
610ff83 Merge pull request #589 from steve-lunarg/vec1-promotion-fix
d9cb832 HLSL: allow promotion from 1-vector types to scalars, e.g, float<-float1
e69e196 Merge pull request #584 from steve-lunarg/attribute-expressions
a22f7db HLSL: Allow expressions in attributes
57cb69a Fix unrefenced variable warning with AMD_EXTENSIONS disabled.
d3f1122 Whole stack: Fix stale types in the AST linker object nodes, fixing #557.
9088be4 Add UAV (image) binding offset and HLSL register support
e5e58cf Merge pull request #575 from steve-lunarg/iomap-warning-fix
5b2d667 Fix build warnings in remapper, re-indent for glslang standard
89df3c2 Merge pull request #572 from steve-lunarg/numthreads
1061acc Merge pull request #562 from TiemoJung/io_map_control_publish
909b8af Merge pull request #570 from steve-lunarg/mintypes
cf35b17 Merge pull request #574 from dneto0/android-has-no-std-stoi
e301f67 Use std::atoi instead of std::stoi
3226b08 HLSL: Add min*{float,int,uint} types
1868b14 HLSL: implement numthreads for compute shaders
e19e68d Merge pull request #571 from baldurk/explicit-lambda-returns
ca73570 Add explicit lambda return types, for compilers without C++14 support
c2016a5 New uniform mapping handling
9507885 Merge pull request #560 from jeremy-lunarg/pragmas
5163446 Merge pull request #568 from steve-lunarg/logicalop-fix
aba4440 Merge pull request #567 from steve-lunarg/compare-fix
850ac06 Merge pull request #561 from jeremy-lunarg/unused
27939ca HLSL: allow component-wise operations for logical || and &&.
85244d7 HLSL: Enable component-wise vector comparisons from operators
0d628c1 Merge pull request #565 from mre4ce/master
4e3dd20 WIP: avoid strtok
c8e60e2 WIP: apply unused variable
d130075 update
2f4c832 Merge remote-tracking branch 'upstream/master'
8e1e717 fixed MSVC 2015 compile warnings
3fc1543 Merge pull request #559 from steve-lunarg/samplecmp-fix
04e2dc1 Merge pull request #558 from steve-lunarg/image-atomics
921d315 Merge pull request #555 from steve-lunarg/promotion-fixes
720e89b Merge pull request #556 from dneto0/guard-amd-enums
6b59668 HLSL: fix defect in EOpMethodSampleCmp* texture decomposition
6cb1637 Move promote methods to TIntermediate class
2232236 HLSL: phase 4 of rwtexture support: add image atomics
bb5c02f Add missing guard to code that uses AMD extensions
e5921f1 HLSL: Fix unary and binary operator type conversion issues
e07c703 Merge remote-tracking branch 'upstream/master'
5a00501 Merge remote-tracking branch 'upstream/master'
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

Test: checkbuild.py on Linux x86; unit tests on Windows
Change-Id: I9f2774801b1feeaf26ad9577507570f61a2ecff5

1 files changed, 58 insertions, 58 deletions

diff --git a/Test/baseResults/hlsl.intrinsics.negative.vert.out b/Test/baseResults/hlsl.intrinsics.negative.vert.out
index 72b6fbcc..b57a5a9a 100644
--- a/Test/baseResults/hlsl.intrinsics.negative.vert.out
+++ b/Test/baseResults/hlsl.intrinsics.negative.vert.out
@@ -114,6 +114,11 @@ Shader version: 450
 0:?           4.000000
 0:?           4.000000
 0:?   Linker Objects
+0:?     '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
+0:?     'inF0' (layout(location=0 ) in 4-component vector of float)
+0:?     'inF1' (layout(location=1 ) in 4-component vector of float)
+0:?     'inF2' (layout(location=2 ) in 4-component vector of float)
+0:?     'inI0' (layout(location=3 ) in 4-component vector of int)
 0:?     'gs_ua' (global uint)
 0:?     'gs_ub' (global uint)
 0:?     'gs_uc' (global uint)
@@ -126,11 +131,6 @@ Shader version: 450
 0:?     'gs_ua4' (global 4-component vector of uint)
 0:?     'gs_ub4' (global 4-component vector of uint)
 0:?     'gs_uc4' (global 4-component vector of uint)
-0:?     '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
-0:?     'inF0' (layout(location=0 ) in 4-component vector of float)
-0:?     'inF1' (layout(location=1 ) in 4-component vector of float)
-0:?     'inF2' (layout(location=2 ) in 4-component vector of float)
-0:?     'inI0' (layout(location=3 ) in 4-component vector of int)
 
 
 Linked vertex stage:
@@ -251,6 +251,11 @@ Shader version: 450
 0:?           4.000000
 0:?           4.000000
 0:?   Linker Objects
+0:?     '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
+0:?     'inF0' (layout(location=0 ) in 4-component vector of float)
+0:?     'inF1' (layout(location=1 ) in 4-component vector of float)
+0:?     'inF2' (layout(location=2 ) in 4-component vector of float)
+0:?     'inI0' (layout(location=3 ) in 4-component vector of int)
 0:?     'gs_ua' (global uint)
 0:?     'gs_ub' (global uint)
 0:?     'gs_uc' (global uint)
@@ -263,11 +268,6 @@ Shader version: 450
 0:?     'gs_ua4' (global 4-component vector of uint)
 0:?     'gs_ub4' (global 4-component vector of uint)
 0:?     'gs_uc4' (global 4-component vector of uint)
-0:?     '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
-0:?     'inF0' (layout(location=0 ) in 4-component vector of float)
-0:?     'inF1' (layout(location=1 ) in 4-component vector of float)
-0:?     'inF2' (layout(location=2 ) in 4-component vector of float)
-0:?     'inI0' (layout(location=3 ) in 4-component vector of int)
 
 // Module Version 10000
 // Generated by (magic number): 80001
@@ -276,7 +276,7 @@ Shader version: 450
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Vertex 4  "VertexShaderFunction" 85 122 123 124 127
+                              EntryPoint Vertex 4  "VertexShaderFunction" 85 102 103 104 107
                               Name 4  "VertexShaderFunction"
                               Name 15  "VertexShaderFunctionS(f1;f1;f1;i1;"
                               Name 11  "inF0"
@@ -311,27 +311,27 @@ Shader version: 450
                               Name 66  "inF1"
                               Name 67  "inF2"
                               Name 85  "@entryPointOutput"
-                              Name 103  "gs_ua"
-                              Name 104  "gs_ub"
-                              Name 105  "gs_uc"
-                              Name 108  "gs_ua2"
-                              Name 109  "gs_ub2"
-                              Name 110  "gs_uc2"
-                              Name 113  "gs_ua3"
-                              Name 114  "gs_ub3"
-                              Name 115  "gs_uc3"
-                              Name 118  "gs_ua4"
-                              Name 119  "gs_ub4"
-                              Name 120  "gs_uc4"
-                              Name 122  "inF0"
-                              Name 123  "inF1"
-                              Name 124  "inF2"
-                              Name 127  "inI0"
+                              Name 102  "inF0"
+                              Name 103  "inF1"
+                              Name 104  "inF2"
+                              Name 107  "inI0"
+                              Name 110  "gs_ua"
+                              Name 111  "gs_ub"
+                              Name 112  "gs_uc"
+                              Name 115  "gs_ua2"
+                              Name 116  "gs_ub2"
+                              Name 117  "gs_uc2"
+                              Name 120  "gs_ua3"
+                              Name 121  "gs_ub3"
+                              Name 122  "gs_uc3"
+                              Name 125  "gs_ua4"
+                              Name 126  "gs_ub4"
+                              Name 127  "gs_uc4"
                               Decorate 85(@entryPointOutput) Location 0
-                              Decorate 122(inF0) Location 0
-                              Decorate 123(inF1) Location 1
-                              Decorate 124(inF2) Location 2
-                              Decorate 127(inI0) Location 3
+                              Decorate 102(inF0) Location 0
+                              Decorate 103(inF1) Location 1
+                              Decorate 104(inF2) Location 2
+                              Decorate 107(inI0) Location 3
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -375,33 +375,33 @@ Shader version: 450
               94:          53 ConstantComposite 93 93 93
               97:   61(fvec4) ConstantComposite 86 86 86 86
               98:          62 ConstantComposite 97 97 97 97
-             101:             TypeInt 32 0
-             102:             TypePointer Private 101(int)
-      103(gs_ua):    102(ptr) Variable Private
-      104(gs_ub):    102(ptr) Variable Private
-      105(gs_uc):    102(ptr) Variable Private
-             106:             TypeVector 101(int) 2
-             107:             TypePointer Private 106(ivec2)
-     108(gs_ua2):    107(ptr) Variable Private
-     109(gs_ub2):    107(ptr) Variable Private
-     110(gs_uc2):    107(ptr) Variable Private
-             111:             TypeVector 101(int) 3
-             112:             TypePointer Private 111(ivec3)
-     113(gs_ua3):    112(ptr) Variable Private
-     114(gs_ub3):    112(ptr) Variable Private
-     115(gs_uc3):    112(ptr) Variable Private
-             116:             TypeVector 101(int) 4
-             117:             TypePointer Private 116(ivec4)
-     118(gs_ua4):    117(ptr) Variable Private
-     119(gs_ub4):    117(ptr) Variable Private
-     120(gs_uc4):    117(ptr) Variable Private
-             121:             TypePointer Input 61(fvec4)
-       122(inF0):    121(ptr) Variable Input
-       123(inF1):    121(ptr) Variable Input
-       124(inF2):    121(ptr) Variable Input
-             125:             TypeVector 8(int) 4
-             126:             TypePointer Input 125(ivec4)
-       127(inI0):    126(ptr) Variable Input
+             101:             TypePointer Input 61(fvec4)
+       102(inF0):    101(ptr) Variable Input
+       103(inF1):    101(ptr) Variable Input
+       104(inF2):    101(ptr) Variable Input
+             105:             TypeVector 8(int) 4
+             106:             TypePointer Input 105(ivec4)
+       107(inI0):    106(ptr) Variable Input
+             108:             TypeInt 32 0
+             109:             TypePointer Private 108(int)
+      110(gs_ua):    109(ptr) Variable Private
+      111(gs_ub):    109(ptr) Variable Private
+      112(gs_uc):    109(ptr) Variable Private
+             113:             TypeVector 108(int) 2
+             114:             TypePointer Private 113(ivec2)
+     115(gs_ua2):    114(ptr) Variable Private
+     116(gs_ub2):    114(ptr) Variable Private
+     117(gs_uc2):    114(ptr) Variable Private
+             118:             TypeVector 108(int) 3
+             119:             TypePointer Private 118(ivec3)
+     120(gs_ua3):    119(ptr) Variable Private
+     121(gs_ub3):    119(ptr) Variable Private
+     122(gs_uc3):    119(ptr) Variable Private
+             123:             TypeVector 108(int) 4
+             124:             TypePointer Private 123(ivec4)
+     125(gs_ua4):    124(ptr) Variable Private
+     126(gs_ub4):    124(ptr) Variable Private
+     127(gs_uc4):    124(ptr) Variable Private
 4(VertexShaderFunction):           2 Function None 3
                5:             Label
                               Store 85(@entryPointOutput) 87