mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,829 Commits 1 Branch 0 Tags
Commit Graph

1829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Kessenich
6577a0e26c Merge pull request #476 from steve-lunarg/string-literals 
HLSL: Support string literals, e.g, for annotations
 2016-08-23 17:41:54 -06:00
John Kessenich
3de0a6d427 Merge pull request #477 from amdrexu/bugfix 
SPV: Some group invocation operations should be applied to scalars.
 2016-08-23 17:40:53 -06:00
Rex Xu
2bbbe0621d SPV: Some group invocation operations should be applied to scalars. 2016-08-23 15:41:05 +08:00
steve-lunarg
efe9724795 HLSL: Add EHTokStringConstant, so that string attributes may be parsed 2016-08-22 17:13:17 -06:00
John Kessenich
370234888d Front-end: Add a function selector under implicit type conversion. 
Use the new function selector for #version 400 and above,
parameterized for the GLSL #version 400 selection rules.

This can be used for both GLSL and HLSL, and other languages
as well.
 2016-08-21 14:26:27 -06:00
dankbaker
afe6e9c4fc HLSL and standalone, modifying Standalone to send filename as string source, and HLSL backend will use this to print a better error mesage when things fail 2016-08-21 12:29:08 -04:00
John Kessenich
0a04b4df02 Front-end/Non-functional: Add some const/auto, useful for upcoming changes. 2016-08-19 07:27:28 -06:00
John Kessenich
b9e39120b4 HLSL: Partially address issue #463: accept GLSL layout(...). 
This includes all "per variable" layout qualifiers, but the
key ones mattering and tested for now are:
  set=
  binding=
  constant_id=
  push_constant
 2016-08-17 17:38:45 -06:00
John Kessenich
78a8b0737c Merge pull request #471 from steve-lunarg/remapper-literal64-b 
SPIRV remapper: allow 64 bit literals in OperandVariableLiteralI…
 2016-08-17 09:23:46 -06:00
steve-lunarg
811d9f4cad WIP: SPIRV remapper: allow 64 bit literals in OperandVariableLiteralId class iteration 2016-08-17 08:33:49 -06:00
John Kessenich
057c01efb4 Merge pull request #467 from dankbaker/HLSL_Changing_defualt_language 
HLSL: changing SPIRV defualt language for HLSL to unknown
 2016-08-15 15:14:55 -06:00
Dan Baker
2c646b7afa Updating tests, sadly every single HLSL test needs updating becuase of the language identifier 2016-08-15 16:25:55 -04:00
Dan Baker
55d5f2d4df HLSL: Changing SPIRV source language to unkown 2016-08-15 16:05:45 -04:00
John Kessenich
15c0fbee32 Merge pull request #466 from baldurk/minor-msvc-warning-fix 
fix x64 warning about conversion size_t -> int
 2016-08-15 10:47:28 -06:00
baldurk
1eb1c11dea fix x64 warning about conversion size_t -> int 2016-08-15 18:01:15 +02:00
John Kessenich
7fb66097e1 Merge pull request #458 from dneto0/revert-remap-64bit-patch 
Revert "Merge pull request #456 from steve-lunarg/remapper-literal64"
 2016-08-12 15:02:40 -06:00
David Neto
b86e8b629a Revert "Merge pull request #456 from steve-lunarg/remapper-literal64" 
This reverts commit ad08b30f696267ec6243dd0ad68a3db889cd2d21, reversing
changes made to 28660bb580d4c61e16ef75008550a87b3be90b91.

This backs out the pull request
https://github.com/KhronosGroup/glslang/pull/456 because it introduced
several internal errors even on code that only uses 32-bit numeric
types.
 2016-08-12 16:49:58 -04:00
John Kessenich
ad08b30f69 Merge pull request #456 from steve-lunarg/remapper-literal64 
SPIRV: Remapper: allow 64 bit literals in OperandVariableLiteralId iteration
 2016-08-12 11:33:19 -06:00
steve-lunarg
b249f2fc24 SPIRV: allow 64 bit literals in OperandVariableLiteralId class iteration. 2016-08-12 09:53:31 -06:00
John Kessenich
28660bb580 Merge pull request #450 from dankbaker/standalone_change 
Allowing explicit specification of shader compiltion type via -T opti…
 2016-08-11 16:37:52 -06:00
Dan Baker
5afdd78131 Standalong: Changing -T to -S since it's a stage now instead of a target 2016-08-11 17:53:57 -04:00
Dan Baker
895275e357 Standalone: Changing some comments and user strings 2016-08-11 14:55:49 -04:00
Dan Baker
c6ede8938a Changing target to stage 2016-08-11 14:06:06 -04:00
John Kessenich
359dcee715 Merge pull request #427 from wesleygriffin/master 
Build: Bump required CMake version down to 2.8.11
 2016-08-11 10:11:13 -06:00
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
dankbaker
45d49bcd51 Allowing explicit specification of shader compiltion type via -T option, rather then looking at file extension. For HLSL files, this is nice because .hlsl extension is natively udnerstood by visual studio, likely to be used with the -e option. 2016-08-08 22:24:29 -04: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