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, 118 insertions, 0 deletions

diff --git a/Test/baseResults/hlsl.promote.vec1.frag.out b/Test/baseResults/hlsl.promote.vec1.frag.out
new file mode 100644
index 00000000..9179dbcc
--- /dev/null
+++ b/Test/baseResults/hlsl.promote.vec1.frag.out
@@ -0,0 +1,118 @@
+hlsl.promote.vec1.frag
+Shader version: 450
+gl_FragCoord origin is upper left
+0:? Sequence
+0:3  Function Definition: main( (temp 4-component vector of float)
+0:3    Function Parameters: 
+0:?     Sequence
+0:7      move second child to first child (temp float)
+0:7        'f1a' (temp float)
+0:7        Construct float (temp float)
+0:7          'f1b' (temp 1-component vector of float)
+0:8      move second child to first child (temp 1-component vector of float)
+0:8        'f1b' (temp 1-component vector of float)
+0:8        Construct float (temp 1-component vector of float)
+0:8          'f1a' (temp float)
+0:11      step (temp 3-component vector of float)
+0:11        Constant:
+0:11          0.000000
+0:11          0.000000
+0:11          0.000000
+0:11        'f3' (temp 3-component vector of float)
+0:13      sine (temp float)
+0:13        Construct float (in float)
+0:13          'f1b' (temp 1-component vector of float)
+0:15      Sequence
+0:15        move second child to first child (temp 4-component vector of float)
+0:?           '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
+0:?           Constant:
+0:?             0.000000
+0:?             0.000000
+0:?             0.000000
+0:?             0.000000
+0:15        Branch: Return
+0:?   Linker Objects
+0:?     '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
+
+
+Linked fragment stage:
+
+
+Shader version: 450
+gl_FragCoord origin is upper left
+0:? Sequence
+0:3  Function Definition: main( (temp 4-component vector of float)
+0:3    Function Parameters: 
+0:?     Sequence
+0:7      move second child to first child (temp float)
+0:7        'f1a' (temp float)
+0:7        Construct float (temp float)
+0:7          'f1b' (temp 1-component vector of float)
+0:8      move second child to first child (temp 1-component vector of float)
+0:8        'f1b' (temp 1-component vector of float)
+0:8        Construct float (temp 1-component vector of float)
+0:8          'f1a' (temp float)
+0:11      step (temp 3-component vector of float)
+0:11        Constant:
+0:11          0.000000
+0:11          0.000000
+0:11          0.000000
+0:11        'f3' (temp 3-component vector of float)
+0:13      sine (temp float)
+0:13        Construct float (in float)
+0:13          'f1b' (temp 1-component vector of float)
+0:15      Sequence
+0:15        move second child to first child (temp 4-component vector of float)
+0:?           '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
+0:?           Constant:
+0:?             0.000000
+0:?             0.000000
+0:?             0.000000
+0:?             0.000000
+0:15        Branch: Return
+0:?   Linker Objects
+0:?     '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
+
+// Module Version 10000
+// Generated by (magic number): 80001
+// Id's are bound by 26
+
+                              Capability Shader
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main" 23
+                              ExecutionMode 4 OriginUpperLeft
+                              Name 4  "main"
+                              Name 8  "f1a"
+                              Name 9  "f1b"
+                              Name 16  "f3"
+                              Name 23  "@entryPointOutput"
+                              Decorate 23(@entryPointOutput) Location 0
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 32
+               7:             TypePointer Function 6(float)
+              12:             TypeVector 6(float) 3
+              13:    6(float) Constant 0
+              14:   12(fvec3) ConstantComposite 13 13 13
+              15:             TypePointer Function 12(fvec3)
+              21:             TypeVector 6(float) 4
+              22:             TypePointer Output 21(fvec4)
+23(@entryPointOutput):     22(ptr) Variable Output
+              24:   21(fvec4) ConstantComposite 13 13 13 13
+         4(main):           2 Function None 3
+               5:             Label
+          8(f1a):      7(ptr) Variable Function
+          9(f1b):      7(ptr) Variable Function
+          16(f3):     15(ptr) Variable Function
+              10:    6(float) Load 9(f1b)
+                              Store 8(f1a) 10
+              11:    6(float) Load 8(f1a)
+                              Store 9(f1b) 11
+              17:   12(fvec3) Load 16(f3)
+              18:   12(fvec3) ExtInst 1(GLSL.std.450) 48(Step) 14 17
+              19:    6(float) Load 9(f1b)
+              20:    6(float) ExtInst 1(GLSL.std.450) 13(Sin) 19
+                              Store 23(@entryPointOutput) 24
+                              Return
+                              FunctionEnd