GregF [Mon, 23 Oct 2017 22:48:42 +0000 (16:48 -0600)]
Update spirv-tools known-good
John Kessenich [Mon, 23 Oct 2017 05:28:22 +0000 (23:28 -0600)]
Merge pull request #1118 from xorgy/only-swizzle-numbers-and-bools
Only try swizzles on vectors, numbers, and booleans.
John Kessenich [Mon, 23 Oct 2017 05:19:02 +0000 (23:19 -0600)]
Merge branch 'only-parse-inf-constant-in-hlsl' of https://github.com/xorgy/glslang into xorgy-only-parse-inf-constant-in-hlsl
John Kessenich [Mon, 23 Oct 2017 05:17:18 +0000 (23:17 -0600)]
Tests: Add test for GLSL +-#INF.
John Kessenich [Mon, 23 Oct 2017 05:09:32 +0000 (23:09 -0600)]
Merge pull request #1120 from xorgy/overlong-hex-literal
Check for hexadecimal literals exceeding MaxTokenLength.
Aaron Muir Hamilton [Mon, 23 Oct 2017 02:56:27 +0000 (02:56 +0000)]
GLSL: Only parse [-]1.#INF in HLSL mode.
Aaron Muir Hamilton [Sun, 22 Oct 2017 17:41:13 +0000 (17:41 +0000)]
Check for hexadecimal literals exceeding MaxTokenLength.
Aaron Muir Hamilton [Sat, 21 Oct 2017 19:13:42 +0000 (19:13 +0000)]
Only try swizzles on vectors, numbers, and booleans.
John Kessenich [Fri, 20 Oct 2017 22:31:26 +0000 (16:31 -0600)]
Merge pull request #1115 from LoopDawg/stdarray-binding-set
Nonfunctional: minor: use std::array for per-set shifts, fix warning.
LoopDawg [Fri, 20 Oct 2017 18:02:38 +0000 (12:02 -0600)]
Nonfunctional: minor: use std::array for per-set shifts, fix warning.
Two unrelated, minor tweaks:
(1) Use std::array for shiftBindingForSet. Now matches shiftBinding.
(2) Add parens in shouldFlatten() to make compiler warning happy.
John Kessenich [Fri, 20 Oct 2017 17:35:29 +0000 (11:35 -0600)]
Merge pull request #1111 from LoopDawg/per-set-binding-offsets
Add per-descriptor-set IO mapping shift values.
John Kessenich [Fri, 20 Oct 2017 16:56:50 +0000 (10:56 -0600)]
SPV: Don't emit StorageImageMultisample capability for subpass images.
John Kessenich [Fri, 20 Oct 2017 16:56:20 +0000 (10:56 -0600)]
Non-functional: missing comments from missed git add.
John Kessenich [Thu, 19 Oct 2017 22:54:25 +0000 (16:54 -0600)]
HLSL: Fix #1106. Support shader setting of binding/set for $Global.
LoopDawg [Wed, 18 Oct 2017 01:27:14 +0000 (19:27 -0600)]
Add per-descriptor-set IO mapping shift values.
This PR adds the ability to provide per-descriptor-set IO mapping shift
values. If a particular binding does not land into a per-set value,
then it falls back to the prior behavior (global shifts per resource class).
Because there were already 6 copies of many different methods and internal
variables and functions, and this PR would have added 6 more, a new API is
introduced to cut down on replication and present a cleaner interface.
For the global (non-set-specific) API, the old entry points still exist
for backward compatibility, but are phrased internally in terms of the
following.
// Resource type for IO resolver
enum TResourceType {
EResSampler,
EResTexture,
EResImage,
EResUbo,
EResSsbo,
EResUav,
EResCount
};
Methods on TShader:
void setShiftBinding(TResourceType res, unsigned int base);
void setShiftBindingForSet(TResourceType res, unsigned int set, unsigned int base);
The first method replaces the 6 prior entry points of various spellings, which
exist now in depreciated form. The second provides per-resource-set functionality.
Both accept an enum from the list above.
From the command line, the existing options can accept either a single shift value as
before, or a series of 1 or more [set offset] pairs. Both can be provided, as in:
... --stb 20 --stb 2 25 3 30 ...
which will use the offset 20 for anything except descriptor set 2 (which uses 25) and
3 (which uses 30).
John Kessenich [Thu, 19 Oct 2017 08:07:30 +0000 (02:07 -0600)]
GLSL->SPIR-V: Put precision decorations on imageLoad().
John Kessenich [Thu, 19 Oct 2017 06:26:39 +0000 (00:26 -0600)]
GLSL: Make sampling operations have agnostic precision qualifiers for desktop.
Desktop defaults to highp for samplers, but this should not apply to the built-in
functions, so make it appy only to user declarations.
John Kessenich [Thu, 19 Oct 2017 06:24:05 +0000 (00:24 -0600)]
Merge pull request #1113 from xorgy/preprocessor-int-min-over-negative-one
Preprocessor: Evaluate INT_MIN / -1 to 0.
John Kessenich [Wed, 18 Oct 2017 20:53:53 +0000 (14:53 -0600)]
Merge pull request #1102 from KhronosGroup/partially-flatten
HLSL: Partially flatten hierarchies, instead of all or nothing.
Aaron Muir Hamilton [Wed, 18 Oct 2017 19:33:00 +0000 (19:33 +0000)]
Preprocessor: Evaluate INT_MIN / -1 to 0.
This division is undefined behaviour which raises SIGFPE on x86.
Most C++ preprocessors evaluate this silently to 0.
John Kessenich [Tue, 17 Oct 2017 18:27:51 +0000 (12:27 -0600)]
Build: Fix build warning.
John Kessenich [Tue, 17 Oct 2017 15:03:17 +0000 (09:03 -0600)]
Merge pull request #1109 from xorgy/never-try-to-swizzle-void
GLSL: Don't try to swizzle void.
Aaron Muir Hamilton [Tue, 17 Oct 2017 08:11:33 +0000 (08:11 +0000)]
Don't try to swizzle void.
GregF [Mon, 16 Oct 2017 16:53:53 +0000 (10:53 -0600)]
Update spirv-tools known-good
John Kessenich [Mon, 16 Oct 2017 21:29:07 +0000 (15:29 -0600)]
PP: Fix #1104: Missing check for #if overflow.
Also, rationalized this to generally make it safer and more readable.
It could use a more modern approach, at some point...
John Kessenich [Mon, 16 Oct 2017 19:11:53 +0000 (13:11 -0600)]
HLSL: More clip fix: It is more involved than previous commit. Complete.
John Kessenich [Mon, 16 Oct 2017 17:42:35 +0000 (11:42 -0600)]
Fix #1103: clip() works on int/uint.
John Kessenich [Mon, 16 Oct 2017 17:35:11 +0000 (11:35 -0600)]
Tests: Add clip(int) tests.
John Kessenich [Fri, 13 Oct 2017 05:12:40 +0000 (23:12 -0600)]
Infrastructure: Add a TShader method to publicly expose the intermediate.
Fixes #1088.
John Kessenich [Wed, 11 Oct 2017 20:03:45 +0000 (14:03 -0600)]
HLSL: Partially flatten hierarchies, instead of all or nothing.
Fixes #1092. Allows arrays of opaques to keep arrayness, unless
needed by uniform array flattening.
Can handle assignments of mixed amounts of flattening.
John Kessenich [Wed, 11 Oct 2017 03:05:06 +0000 (06:05 +0300)]
Merge pull request #1098 from LoopDawg/attribute-gets
HLSL: nonfunctional: add helper access methods to TAttributeMap
John Kessenich [Tue, 10 Oct 2017 22:54:06 +0000 (01:54 +0300)]
Merge pull request #1097 from SWIFTingAround/master
Set cmake-policy CMP0048 to NEW
John Kessenich [Tue, 10 Oct 2017 22:48:49 +0000 (01:48 +0300)]
Merge pull request #1094 from LoopDawg/split-shadow-tx
HLSL: nonfunctional: rename setId -> switchId, add comment
John Kessenich [Tue, 10 Oct 2017 22:48:04 +0000 (01:48 +0300)]
Merge pull request #1080 from hedejing/master
Add getAsLoopNode() method for TIntermLoop
LoopDawg [Tue, 10 Oct 2017 20:59:40 +0000 (14:59 -0600)]
HLSL: add helper access methods to TAttributeMap
There was some code replication around getting string and integer
values out of an attribute map. This adds new methods to the
TAttributeMap class to encapsulate some accessor details.
Tim Diekmann [Tue, 10 Oct 2017 14:26:31 +0000 (16:26 +0200)]
Set cmake-policy CMP0048 to NEW
He Dejing [Mon, 2 Oct 2017 18:41:23 +0000 (02:41 +0800)]
Add getAsLoopNode() method for Loop node
follow local conventions of spaces
LoopDawg [Sat, 7 Oct 2017 22:42:37 +0000 (16:42 -0600)]
HLSL: nonfunctional: rename setId -> switchId, add comment
Method rename, add comment about its intended use. No
test diffs.
John Kessenich [Sat, 7 Oct 2017 19:23:09 +0000 (13:23 -0600)]
HLSL: Validate implicit initializer assignment to opaque members.
Fixes #1091.
John Kessenich [Sat, 7 Oct 2017 17:33:11 +0000 (11:33 -0600)]
SPV: GeneratorVersion: bump version number because of atomic decrement change.
John Kessenich [Sat, 7 Oct 2017 04:19:21 +0000 (07:19 +0300)]
Merge pull request #1090 from tafuri/#1084-fix-segfault
Only track variables in the global scope
John Kessenich [Sat, 7 Oct 2017 03:21:48 +0000 (21:21 -0600)]
SPV: Correct semantics of atomic-counter decrement.
The semantics differ between GLSL/HLSL and SPIR-V.
Translate between these.
John Kessenich [Sat, 7 Oct 2017 03:01:07 +0000 (21:01 -0600)]
HLSL: Tests: Add subset of flattened opaque test to legalize results.
Sebastian Tafuri [Fri, 6 Oct 2017 22:47:54 +0000 (00:47 +0200)]
Added test for local structured buffer variable
Sebastian Tafuri [Fri, 6 Oct 2017 22:12:50 +0000 (00:12 +0200)]
Fixed formatting
John Kessenich [Fri, 6 Oct 2017 21:33:20 +0000 (00:33 +0300)]
Merge pull request #1089 from LoopDawg/split-shadow-tx
HLSL: split textures used for both shadow and non-shadow modes
Sebastian Tafuri [Fri, 6 Oct 2017 20:45:00 +0000 (22:45 +0200)]
Only track variables in the global scope
LoopDawg [Thu, 5 Oct 2017 22:25:52 +0000 (16:25 -0600)]
HLSL: split textures used for both shadow and non-shadow modes
A single texture can statically appear in code mixed with a shadow sampler
and a non-shadow sampler. This would be create invalid SPIR-V, unless
one of them is provably dead.
The previous detection of this happened before DCE, so some shaders would
trigger the error even though they wouldn't after DCE. To handle that
case, this PR splits the texture into two: one with each mode. It sets
"needsLegalization" (if that happens for any texture) to warn that this shader
will need post-compilation legalization.
If the texture is only used with one of the two modes, behavior is as it
was before.
John Kessenich [Fri, 6 Oct 2017 06:24:41 +0000 (00:24 -0600)]
Readme: Update with additional Windows build information for SPIRV-tools build.
John Kessenich [Wed, 4 Oct 2017 20:41:08 +0000 (23:41 +0300)]
Merge pull request #1085 from KhronosGroup/flatten-assign-subset
HLSL: Fix #954: Track/access subsets of flattened multi-level aggrega…
John Kessenich [Wed, 4 Oct 2017 19:27:43 +0000 (13:27 -0600)]
HLSL: Fix #954: Track/access subsets of flattened multi-level aggregates.
Works in conjuction with d1be754 to represent and modify a partially
dereferenced multi-level flattened aggregate.
John Kessenich [Wed, 4 Oct 2017 19:01:25 +0000 (22:01 +0300)]
Merge pull request #1081 from xxxbxxx/for-upstream-1
HLSL: Fix crash when flattening both side of assignement simultaneously.
Unknown [Tue, 3 Oct 2017 07:10:26 +0000 (09:10 +0200)]
HLSL: Fix crash when flattening both side of assignement simultaneously.
John Kessenich [Mon, 2 Oct 2017 22:47:48 +0000 (01:47 +0300)]
Merge pull request #1075 from LoopDawg/subpass-input
HLSL: add subpass input types and methods
LoopDawg [Wed, 27 Sep 2017 15:04:43 +0000 (09:04 -0600)]
HLSL: add subpass input types and methods
Add support for Subpass Input proposal of issue #1069.
Subpass input types are given as:
layout(input_attachment_index = 1) SubpassInput<float4> subpass_f;
layout(input_attachment_index = 2) SubpassInput<int4> subpass_i;
layout(input_attachment_index = 3) SubpassInput<uint4> subpass_u;
layout(input_attachment_index = 1) SubpassInputMS<float4> subpass_ms_f;
layout(input_attachment_index = 2) SubpassInputMS<int4> subpass_ms_i;
layout(input_attachment_index = 3) SubpassInputMS<uint4> subpass_ms_u;
The input attachment may also be specified using attribute syntax:
[[vk::input_attachment_index(7)]] SubpassInput subpass_2;
The template type may be a shorter-than-vec4 vector, but currently user
structs are not supported. (An unimplemented error will be issued).
The load operations are methods on objects of the above type:
float4 result = subpass_f.SubpassLoad();
int4 result = subpass_i.SubpassLoad();
uint4 result = subpass_u.SubpassLoad();
float4 result = subpass_ms_f.SubpassLoad(samp);
int4 result = subpass_ms_i.SubpassLoad(samp);
uint4 result = subpass_ms_u.SubpassLoad(samp);
Additionally, the AST printer could not print EOpSubpass* nodes. Now it can.
Fixes #1069
John Kessenich [Sat, 30 Sep 2017 20:54:18 +0000 (14:54 -0600)]
Build: Fix a couple build issues.
John Kessenich [Sat, 30 Sep 2017 20:34:50 +0000 (14:34 -0600)]
HLSL: Additional attribute support: [[]], namespace, parameters:
- support C++11 style brackets [[...]]
- support namespaces [[vk::...]]
- support these on parameter declarations in functions
- support location, binding/set, input attachments
John Kessenich [Fri, 29 Sep 2017 23:51:52 +0000 (17:51 -0600)]
Fix #1060: Could crash if using --source-entry-point with -e; fixed.
John Kessenich [Fri, 29 Sep 2017 17:57:30 +0000 (20:57 +0300)]
Merge pull request #1078 from greg-lunarg/addopt14
Remove opaque workarounds
GregF [Fri, 29 Sep 2017 16:08:20 +0000 (10:08 -0600)]
Legalization: Fix tests after workarounds removed
John Kessenich [Sun, 10 Sep 2017 21:21:05 +0000 (15:21 -0600)]
SPV: rationalize parameter handling for "original" and "writable" parameters.
John Kessenich [Fri, 8 Sep 2017 08:38:07 +0000 (02:38 -0600)]
HLSL: Pass opaques by local copy, instead of by interface original.
Also, remove assumption that if something is opaque that it
must be in the UniformConstant storage class.
This allows function declarations to know all parameters will
be in the Function storage class.
John Kessenich [Thu, 7 Sep 2017 10:33:11 +0000 (04:33 -0600)]
HLSL: Remove workarounds for assigning to opaques.
This assumes it will be combined with optimizing transforms
that eliminate assignments to opaques.
John Kessenich [Fri, 29 Sep 2017 02:07:50 +0000 (05:07 +0300)]
Merge pull request #1076 from LoopDawg/shadow-tx-types
HLSL: force textures to shadow modes from combined samplers
LoopDawg [Wed, 27 Sep 2017 15:12:51 +0000 (09:12 -0600)]
HLSL: force textures to shadow modes from combined samplers
Texture shadow mode must match the state of the sampler they are
combined with. This change does that, both for the AST and the
symbol table. Note that the texture cannot easily be *created*
the right way, because this may not be known at that time. Instead,
the texture is subsequently patched.
This cannot work if a single texture is used with both a shadow and
non-shadow sampler, so that case is detected and generates an error.
This is permitted by the HLSL language, however. See #1073 discussion.
Fixed one test source that was using a texture with both shadow and
non-shadow samplers.
John Kessenich [Thu, 28 Sep 2017 19:38:29 +0000 (22:38 +0300)]
Merge pull request #1077 from greg-lunarg/addopt12
Legalization: Fix warnings and disable tests when spirv-tools not present
GregF [Thu, 28 Sep 2017 16:08:32 +0000 (10:08 -0600)]
Legalization: Fix warnings and disable tests when spirv-tools not present
John Kessenich [Thu, 28 Sep 2017 02:56:56 +0000 (05:56 +0300)]
Merge pull request #1070 from greg-lunarg/addopt8
Enable HLSL legalization
GregF [Wed, 27 Sep 2017 21:46:59 +0000 (15:46 -0600)]
Advance spirv-opt known-good to hopefully fix travis multithread failure
GregF [Wed, 27 Sep 2017 17:34:48 +0000 (11:34 -0600)]
Legalization: Skip spirv-tools tests
GregF [Mon, 25 Sep 2017 19:50:32 +0000 (13:50 -0600)]
Pick up latest spirv-tools in attempt to fix travis failures
GregF [Fri, 22 Sep 2017 23:21:37 +0000 (17:21 -0600)]
Try Python interpreter on update_glslang_sources.py in appveyor
GregF [Fri, 22 Sep 2017 21:30:10 +0000 (15:30 -0600)]
Fix travis and appveyor calls to update_glslang_sources.py
GregF [Fri, 22 Sep 2017 00:40:22 +0000 (18:40 -0600)]
Enable HLSL legalization
Also added known-good mechanism to fetch latest validated spirv-tools.
Also added -Od and -Os to disable optimizer and optimize for size.
Fetching spirv-tools is optional for both glsl and hlsl. Legalization
of hlsl is done by default if spirv-opt is present at cmake time.
Optimization for glsl is currently done through the option -Os.
Legalization testing is currently only done on four existing shaders.
A separate baseLegalResults directory holds those results. All previous
testing is done with the optimizer disabled.
John Kessenich [Wed, 27 Sep 2017 15:11:06 +0000 (18:11 +0300)]
Merge pull request #1072 from amdrexu/feature
Implement extension GL_NV_shader_atomic_int64
Rex Xu [Tue, 26 Sep 2017 07:42:56 +0000 (15:42 +0800)]
Implement extension GL_NV_shader_atomic_int64
John Kessenich [Tue, 26 Sep 2017 06:08:30 +0000 (00:08 -0600)]
Merge pull request #1071 from antiagainst/ninja-make
Travis: use make instead of ninja
Lei Zhang [Mon, 25 Sep 2017 18:04:20 +0000 (14:04 -0400)]
Travis: use make instead of ninja and limit concurrent jobs
John Kessenich [Sat, 23 Sep 2017 12:32:02 +0000 (06:32 -0600)]
Merge pull request #1063 from LoopDawg/remapper-error-cleanup
Remapper: make remapper robust against non-exiting error handlers
John Kessenich [Fri, 22 Sep 2017 19:51:02 +0000 (13:51 -0600)]
Build: Merge pull request #1068 from greg-lunarg/addopt4
CMake file changes for SPIR-V legalization for HLSL
GregF [Thu, 21 Sep 2017 22:50:39 +0000 (16:50 -0600)]
CMake changes for HLSL legalization
Cmake now looks for External/spirv-tools. If found, it links in
SPIRV-Tools-opt and SPVRemapper, and adds -DENABLE_OPT to build.
LoopDawg [Sun, 17 Sep 2017 16:38:52 +0000 (10:38 -0600)]
Remapper: make remapper robust against non-exiting error handlers
Remapper errors are generally fatal: there has been some unexpected situation while
parsing the SPV binary, and there is no reasonable way to carry on. The
errorHandler() function is called in this case, which by default exits, but
it is possible to submit a handler which does not. In that case the remapper would
carry on in a bad state.
This change ensures a graceful termination of the remap() function.
While a try {} catch {} construct would be the ideal and safe way to do this,
that's off limits for certain environments, so this tries to do the same thing
with explicit code, to catch all the bailout paths.
John Kessenich [Tue, 19 Sep 2017 17:09:59 +0000 (11:09 -0600)]
HLSL: Fix #1064: Don't include empty structures on OpEntryPoint
John Kessenich [Sat, 16 Sep 2017 03:10:08 +0000 (21:10 -0600)]
Merge pull request #1044 from dsrbecky/image_external_essl3
Add support for GL_OES_EGL_image_external_essl3
xavier [Sun, 20 Aug 2017 08:44:21 +0000 (10:44 +0200)]
HLSL: fix array[1] of vec4 constant declaration.
John Kessenich [Fri, 15 Sep 2017 19:15:23 +0000 (13:15 -0600)]
Test: Make another test legal HLSL, and rationalize GLSL vs HLSL addConstructor().
John Kessenich [Fri, 15 Sep 2017 01:45:28 +0000 (19:45 -0600)]
HLSL: Add bounds checking, shared with GLSL. Partially address #1032.
John Kessenich [Fri, 15 Sep 2017 00:18:19 +0000 (18:18 -0600)]
Merge pull request #1051 from LoopDawg/bug-1049
HLSL: allow split type in InputPatch template type, & HS return types.
LoopDawg [Wed, 13 Sep 2017 14:44:39 +0000 (08:44 -0600)]
HLSL: handle split InputPatch templat type in patch constant functions
InputPatch parameters to patch constant functions were not using the
internal (temporary) variable type. That could cause validation errors
if the input patch had a mixture of builtins and user qualified members.
This uses the entry point's internal form.
There is currently a limitation: if an InputPatch is used in a PCF,
it must also have appeared in the main entry point's parameter list.
That is not a limitation of HLSL. Currently that situation is detected
and an "implemented" error results. The limitation can be addressed,
but isn't yet in the current form of the PR.
LoopDawg [Sun, 10 Sep 2017 15:46:55 +0000 (09:46 -0600)]
HLSL: allow mixed user & builtin members in hull shader output structure
Hull shaders have an implicitly arrayed output. This is handled by creating an arrayed form of the
provided output type, and writing to the element of it indexed by InvocationID.
The implicit indirection into that array was causing some troubles when copying to a split
structure. handleAssign was able to handle simple symbol lvalues, but not an lvalue composed
of an indirection into an array.
John Kessenich [Wed, 13 Sep 2017 19:22:50 +0000 (13:22 -0600)]
GLSL: Make gl_Layer and gl_ViewportIndex always be outside blocks.
There was some ambiguity/contradiction in this behavior, and
Khronos decided glslang should always have these outside blocks,
rather than have stage/vendor/target variations.
John Kessenich [Tue, 12 Sep 2017 16:53:05 +0000 (10:53 -0600)]
Merge pull request #1056 from KhronosGroup/glsl-entrypoint-rename
GLSL: Promote HLSL entry-point renaming code to be used by GLSL as well.
John Kessenich [Tue, 12 Sep 2017 03:48:19 +0000 (21:48 -0600)]
GLSL: Promote HLSL entry-point renaming code to be used by GLSL as well.
Fixes #1045.
John Kessenich [Tue, 12 Sep 2017 15:09:37 +0000 (09:09 -0600)]
Merge pull request #1050 from amdrexu/feature
Implement the extension GL_AMD_shader_fragment_mask
John Kessenich [Tue, 12 Sep 2017 04:04:59 +0000 (22:04 -0600)]
Merge pull request #1055 from KhronosGroup/strdup
Build: Fix strdup -> _strdup warnings.
John Kessenich [Tue, 12 Sep 2017 03:27:23 +0000 (21:27 -0600)]
Build: Fix strdup -> _strdup warnings.
John Kessenich [Tue, 12 Sep 2017 02:39:54 +0000 (20:39 -0600)]
Build: Fix build warnings.
John Kessenich [Tue, 12 Sep 2017 02:35:49 +0000 (20:35 -0600)]
Fix #1043: set all scan string-locations to have bias, not just the first one.
John Kessenich [Tue, 12 Sep 2017 02:13:49 +0000 (20:13 -0600)]
Non-functional: Make usage for entry points more consistent.
John Kessenich [Tue, 12 Sep 2017 01:33:11 +0000 (19:33 -0600)]
Merge pull request #1053 from mchock-nv/mchock-nv-fix-lambda
Delete unused 'this' capture