John Kessenich
2c6038ecf1
Merge branch 'cpp-headers'
2016-08-11 10:01:13 -06:00
John Kessenich
10e0efeb42
Merge pull request #451 from steve-lunarg/stagemask-all
...
HLSL: Put all intrinsics in common stage symbol table
2016-08-11 09:58:01 -06:00
steve-lunarg
61da5e41f7
HLSL: Put intrinsics in symbol table for all stages
2016-08-11 07:29:30 -06:00
John Kessenich
0a6fb85494
Infrastructure: Make shared symbol-table cache complete, delete work around.
...
Fixes issue #370 and replaces PR #371 .
2016-08-09 19:15:17 -06:00
John Kessenich
0b5214486b
Merge pull request #448 from steve-lunarg/promotions
...
HLSL: add implicit promotions for assignments and function returns.
2016-08-09 15:29:25 -06:00
steve-lunarg
c4a1307403
HLSL: add implicit promotions for assignments and function returns.
2016-08-09 13:48:47 -06:00
John Kessenich
426542ba57
Front-end: Fix issue #443 : dvec3 uses only 2 components of second location.
2016-08-08 15:34:00 -06:00
John Kessenich
34177cd778
Tests: Test base case for fixing issue #443 .
2016-08-08 15:29:25 -06:00
John Kessenich
4583b61e20
HLSL: Smear scalars to match vectors for relational operations.
...
Yield a vector relational compare and a vector result.
2016-08-07 19:14:22 -06:00
John Kessenich
267590d452
Whitespace: Nonfunctional: fix inconsistent white space, esp. no tabs.
2016-08-05 17:34:34 -06:00
John Kessenich
5c72a73971
Merge pull request #436 from dankbaker/master
...
HLSL: disabling dx9 attempt to parse dx9 style samplers
2016-08-05 17:29:43 -06:00
John Kessenich
bbd1b0ef76
Tests: Add some location-decoration tests, to aid PR #422 .
2016-08-05 15:19:46 -06:00
John Kessenich
66ec80e01b
Build: C++ headers: Replace PR #366 with a more directed version.
2016-08-05 14:04:23 -06:00
Dan Baker
349ac3df86
Merge branch 'master' of https://github.com/dankbaker/glslang
2016-08-05 14:56:40 -04:00
dankbaker
c0962f1e90
Merge pull request #2 from KhronosGroup/master
...
Integrating Master into dankbaker fork
2016-08-05 14:55:44 -04:00
Dan Baker
c7e501613a
Commenting out attempt to parse DX9 samplers, since this is imcompatible with DX10+ shaders
2016-08-05 14:52:38 -04:00
John Kessenich
9f9bad09b4
PP: Add missing atoms that effect -E mode.
...
When preprocessing only, some tokens were emitted as <bad token>.
This fixes them to preserve their original content.
This supplants PR #182 , with a correction and test results.
2016-08-04 22:46:19 -06:00
John Kessenich
cfc5fbb967
Merge pull request #429 from steve-lunarg/samplers.sm5
...
HLSL: Add GatherRed/Green/Blue/Alpha methods, inc 4-offset forms
2016-08-03 14:35:07 -06:00
steve-lunarg
7dfcf4d1ad
HLSL: Add GatherRed/Green/Blue/Alpha methods, inc 4-offset forms
2016-08-03 13:34:39 -06:00
dankbaker
0e46eaef0e
Merge pull request #1 from KhronosGroup/master
...
Pull request from glslang master
2016-08-03 15:32:58 -04:00
John Kessenich
98a2e92f0c
Merge pull request #431 from steve-lunarg/semicolon-fix
...
HLSL: allow semicolons between global scope declarations
2016-08-03 12:07:45 -06:00
steve-lunarg
cb88de5e5e
HLSL: allow semicolons between global scope declarations.
2016-08-03 07:08:06 -06:00
John Kessenich
f6640761c4
Front-end: Implement 2nd task of issue #400 ; precision of result and operation.
...
From the ES spec + Bugzilla 15931 and GL_KHR_vulkan_glsl:
- Update precision qualifiers for all built-in function prototypes.
- Implement the new algorithm used to distinguish built-in function
operation precisions from result precisions.
Also add tracking of separate result and operation precisions, and
use that in generating SPIR-V.
(SPIR-V cares about precision of operation, while the front-end
cares about precision of result, for propagation.)
2016-08-02 21:48:02 -06:00
John Kessenich
6c136223ed
Merge pull request #428 from dankbaker/master
...
HLSL: Fixing some casts that warn when compiled to 64 bit (size_t is 64 bit…
2016-08-02 12:58:22 -06:00
Dan Baker
b49806b0bf
Fixing some casts that warn when compiled to 64 bit (size_t is 64 bit rather then 32 bit)
2016-08-02 14:42:43 -04:00
John Kessenich
1176530bf5
SPV: Prevent issue #415 with better semantic checking.
2016-07-31 12:39:46 -06:00
John Kessenich
11e1a073f3
PP: Fix issue #407 ; handle empty identifier.
...
The sequence
#define m()
int m"
creates a token of no length (a string of 0 size). Protect
against a string of 0 size as well as the existing protect
against a null string.
2016-07-30 13:39:52 -06:00
John Kessenich
7208473c69
PP: Non-functional; fix typos and blank spaces.
2016-07-30 13:25:33 -06:00
John Kessenich
73d4fb5bc5
PP: Fix issue #408 : # as last character in macro.
...
This would look ahead for a second #, for token pasting, and if not
found, backup one token. This is fine, unless at the end of line,
which would backup the #, rather than the look ahead.
2016-07-30 12:41:35 -06:00
John Kessenich
50d4fbe4c7
Merge pull request #424 from steve-lunarg/initializer-fix
...
HLSL: allow trailing commas in initializer lists & scalar initialization
2016-07-30 11:17:03 -06:00
steve-lunarg
fe5a3ff2f3
HLSL: allow trailing commas in initializer lists & scalar initialization
2016-07-30 10:47:33 -06:00
John Kessenich
b38f071605
HLSL: Add back in the [subcomponent] part of a 'register' decl.
2016-07-30 10:30:51 -06:00
John Kessenich
dd50d025d6
Merge pull request #423 from steve-lunarg/constructor-expr-fix
...
HLSL: Fix a grammar error related to constructors in paren expr
2016-07-30 10:28:38 -06:00
steve-lunarg
5964c64b2a
HLSL: Fix a grammar error related to constructors in parenthetical expressions
2016-07-30 08:09:09 -06:00
John Kessenich
ff13213547
Front-ends GLSL/HLSL: Fix initializer lists for structs of one member.
...
Single member structs initialized with an initializer list had
an incorrect argument for constructor emulation.
2016-07-29 18:29:06 -06:00
John Kessenich
96e9f47cbb
HLSL: Implement the register production.
2016-07-29 14:28:39 -06:00
John Kessenich
82d6baf86f
HLSL: Implement packoffset production.
2016-07-29 13:03:50 -06:00
John Kessenich
1936eebe04
Merge pull request #421 from amdrexu/bugfix
...
SPV: Fix an issue of ++/-- for dvec/dmat.
2016-07-29 10:42:40 -06:00
Rex Xu
ce31aea0d0
SPV: Fix an issue of ++/-- for dvec/dmat.
2016-07-29 16:13:04 +08:00
John Kessenich
64076ed7e9
HLSL: Fix binary-expression associativity and termination issue.
2016-07-28 21:48:25 -06:00
John Kessenich
fea226ba43
HLSL: Add shape conversions for scalar -> vector assigments.
...
Also, this allows turning on the error check for a failed assigment
when parsing.
This makes 39 HLSL tests have a working assignment that was previously
silently dropped, due to lack of this functionality.
2016-07-28 18:41:20 -06:00
John Kessenich
a26a5170a3
Non-functional: Rationalize location and use of mapTypeToConstructor().
2016-07-28 16:56:52 -06:00
John Kessenich
c552aece83
Merge pull request #417 from steve-lunarg/buffers
...
HLSL: add Buffer support for Load method
2016-07-28 16:56:39 -06:00
John Kessenich
c21badf2a1
Merge pull request #419 from steve-lunarg/lerp-fix
...
HLSL: add missing vec,vec,scalar form of lerp(), + test
2016-07-28 16:56:25 -06:00
John Kessenich
080fbe9615
Merge pull request #420 from steve-lunarg/uint-literal-fix
...
HLSL: allow uint literals, and add test for numeric suffixes
2016-07-28 16:51:33 -06:00
steve-lunarg
2de329112b
HLSL: allow uint literals, and add test for numeric suffixes
2016-07-28 14:49:48 -06:00
steve-lunarg
cf57c04401
HLSL: add missing vec,vec,scalar form of lerp(), + test
2016-07-28 13:23:22 -06:00
steve-lunarg
d53f717fd3
HLSL: add Buffer support for Load method
2016-07-27 15:57:31 -06:00
John Kessenich
414f735443
Front-end: Fix issue #409 , check for implicitly-sized binding arrays.
2016-07-27 14:55:06 -06:00
John Kessenich
e15509e450
Infrastructure: Address issue #414 , build instructions.
2016-07-27 13:14:36 -06:00