John Kessenich [Thu, 23 Mar 2017 05:21:34 +0000 (23:21 -0600)]
HLSL: Allow use of $Global members in between function calls.
This allows global initializers to use $Global members.
John Kessenich [Wed, 22 Mar 2017 17:38:22 +0000 (11:38 -0600)]
HLSL: Implement 'this' keyword.
John Kessenich [Wed, 22 Mar 2017 05:56:40 +0000 (23:56 -0600)]
HLSL: non-static member functions: track and find active anonymous 'this' scopes and members.
Thanks to @steve-lunarg for his input and discussions on handling member functions.
John Kessenich [Wed, 22 Mar 2017 00:35:04 +0000 (18:35 -0600)]
HLSL: Non-functional: the symbol field of a token was in practice unused; remove it.
Another precurser to getting member non-static functions working.
John Kessenich [Mon, 20 Mar 2017 05:49:55 +0000 (23:49 -0600)]
Merge pull request #782 from steve-lunarg/builtin-methods-prefix
HLSL: use prefix for builtin functions names to avoid namespace colli…
John Kessenich [Mon, 20 Mar 2017 05:46:03 +0000 (23:46 -0600)]
Merge pull request #779 from steve-lunarg/buffer-unsampled-fix
HLSL: Buffer types should be unsampled.
steve-lunarg [Mon, 20 Mar 2017 00:12:37 +0000 (18:12 -0600)]
HLSL: use prefix for builtin functions names to avoid namespace collisions
It would have been possible for globally scoped user functions to collide
with builtin method names. This adds a prefix to avoid polluting the
namespace.
Ideally this would be an invalid character to use in user identifiers, but
as that requires changing the scanner, for the moment it's an unlikely yet
valid prefix.
John Kessenich [Mon, 20 Mar 2017 00:09:59 +0000 (18:09 -0600)]
HLSL: Basic turn on of non-static member functions.
Still need: pass by reference in SPIR-V and symbol-table level
for accessing 'this' members from member functions.
John Kessenich [Sun, 19 Mar 2017 19:10:28 +0000 (13:10 -0600)]
HLSL: Add implicit-this tracking to TFunction.
John Kessenich [Sun, 19 Mar 2017 18:24:29 +0000 (12:24 -0600)]
HLSL non-functional: Generalize namespace nesting.
Also use this to move deferred member-function-body parsing to a better
place.
This should also be well poised for implementing the 'namespace' keyword.
steve-lunarg [Sun, 19 Mar 2017 18:40:12 +0000 (12:40 -0600)]
WIP: HLSL: propagate readonly qualifier for buffer types
steve-lunarg [Fri, 17 Mar 2017 19:19:42 +0000 (13:19 -0600)]
WIP: HLSL: Buffer types should be unsampled.
RWBuffer objects were generating (properly) unsampled resoures, while
Buffer objects were not. This fixes that.
John Kessenich [Thu, 16 Mar 2017 17:20:38 +0000 (11:20 -0600)]
Fix #777: don't parse .suffix if <stage> is provided.
Adding a test for this also uncovered an extraneous \r in the runtests script,
fixed now.
John Kessenich [Thu, 16 Mar 2017 15:54:00 +0000 (09:54 -0600)]
Merge pull request #776 from amdrexu/bugfix
SPV: Fix unexpected declarations of capability and extension
Rex Xu [Thu, 16 Mar 2017 15:02:39 +0000 (23:02 +0800)]
SPV: Fix unexpected declarations of capability and extension
John Kessenich [Wed, 15 Mar 2017 15:05:14 +0000 (09:05 -0600)]
HLSL: Fix #771: add inline keyword.
John Kessenich [Wed, 15 Mar 2017 14:45:50 +0000 (08:45 -0600)]
Merge pull request #767 from DragoonX6/master
Fix building on MinGW-w64
John Kessenich [Wed, 15 Mar 2017 03:50:06 +0000 (21:50 -0600)]
Merge branch 'TiemoJung-semantic_handling'
John Kessenich [Wed, 15 Mar 2017 03:49:42 +0000 (21:49 -0600)]
Merge branch 'semantic_handling' of https://github.com/TiemoJung/glslang into TiemoJung-semantic_handling
John Kessenich [Wed, 15 Mar 2017 01:43:13 +0000 (19:43 -0600)]
GLSL output: Removed fixed-size buffer; fixes #769.
Makes some white-space differences in most output, plus a few cases
where more could have been put out but was cut short by the previous
fix-sized buffer.
John Kessenich [Tue, 14 Mar 2017 22:45:30 +0000 (16:45 -0600)]
Full stack: properly implement GL_EXT_device_group and GL_EXT_multiview.
John Kessenich [Tue, 14 Mar 2017 21:19:32 +0000 (15:19 -0600)]
Fix location of #defines for core and compatibility profile.
These were recently added for all profiles, versus just desktop.
John Kessenich [Tue, 14 Mar 2017 04:49:36 +0000 (22:49 -0600)]
Revert previous check-in, until knowing what the spec. is and whether the test failure is related.
John Kessenich [Mon, 13 Mar 2017 21:43:26 +0000 (15:43 -0600)]
SPV: Address #759: make ViewIndex and DeviceIndex by 'in', not 'uniform'.
John Kessenich [Mon, 13 Mar 2017 21:31:11 +0000 (15:31 -0600)]
Merge pull request #768 from amdrexu/bugfix
HLSL: Additional channel value for textureGatherXXX().
Rex Xu [Mon, 13 Mar 2017 09:07:18 +0000 (17:07 +0800)]
HLSL: Additional channel value for textureGatherXXX().
When mapping HLSL gather intrinsics to GLSL textureGatherXXX() built-in
function, the channel selection value is only valid for non-shadow samplers.
DragoonX6 [Sun, 12 Mar 2017 03:44:55 +0000 (04:44 +0100)]
Fix building on MinGW-w64
Some HLSL to Spirv tests fail.
John Kessenich [Sun, 12 Mar 2017 02:32:47 +0000 (19:32 -0700)]
HLSL: Member-functions: capture body token stream for deferred syntax/semantics.
This is needed for accessing types/variables within a member function body that are
not known until after the struct is finished being declared. However, that funtionality
is not yet present, this is just the deferred processing, which is working for
static member functions.
John Kessenich [Sun, 12 Mar 2017 00:55:28 +0000 (17:55 -0700)]
HLSL: Non-functional: consolidate function declarator information.
John Kessenich [Sat, 11 Mar 2017 21:16:58 +0000 (14:16 -0700)]
Merge pull request #762 from LukasBanana/master
Added 'GL_core_profile' and 'GL_compatibility_profile' to macro expansion
John Kessenich [Sat, 11 Mar 2017 21:13:00 +0000 (14:13 -0700)]
HLSL: Add scoping operator, accept static member functions, and support calling them.
John Kessenich [Sat, 11 Mar 2017 16:39:55 +0000 (09:39 -0700)]
HLSL: non-functional: simplify handleBuiltInMethod() to isBuiltInMethod().
Lukas Hermanns [Fri, 10 Mar 2017 19:45:20 +0000 (20:45 +0100)]
Added 'GL_core_profile' and 'GL_compatibility_profile' macro definition to preamble.
Added version check (version >= 150) for GL_(core/compatibility)_profile macros.
Added GL_core_profile standard macro check to "150.vert" test file.
Fixed version check for GL_core_profile macros, and removed bad token character from 150.vert test.
Updated 150.vert.out test base-result with google-test suite.
John Kessenich [Sat, 11 Mar 2017 01:03:43 +0000 (18:03 -0700)]
PP: Recognize the '::' token, and translate appropriately to GLSL/HLSL token.
John Kessenich [Fri, 10 Mar 2017 22:35:12 +0000 (15:35 -0700)]
Merge pull request #764 from steve-lunarg/imagequery-sign
Preserve signedness in SPIR-V image query ops
steve-lunarg [Fri, 10 Mar 2017 19:45:50 +0000 (12:45 -0700)]
Preserve signedness in SPV image query ops
The AST->SPIRV translation of image queries was dropping signedness,
causing some validation troubles.
John Kessenich [Fri, 10 Mar 2017 16:16:06 +0000 (09:16 -0700)]
Merge pull request #763 from steve-lunarg/nullstruct-preservation
HLSL: preserve empty structures after splitting
steve-lunarg [Fri, 10 Mar 2017 02:10:57 +0000 (19:10 -0700)]
WIP: HLSL: preserve empty structures after splitting
John Kessenich [Thu, 9 Mar 2017 21:37:32 +0000 (14:37 -0700)]
HLSL: Accept SV_Cull/ClipDistanceN, by refactoring the way semantics are mapped.
John Kessenich [Thu, 9 Mar 2017 18:28:21 +0000 (11:28 -0700)]
Merge pull request #761 from baldurk/vs2010-compile-fixes
Compile fixes for VS2010
John Kessenich [Thu, 9 Mar 2017 18:13:31 +0000 (11:13 -0700)]
Merge pull request #760 from steve-lunarg/gathercmpred
HLSL: Enable GatherCmpRed. Green/Blue/Alpha cannot be supported.
baldurk [Thu, 9 Mar 2017 17:48:59 +0000 (17:48 +0000)]
Compile fixes for VS2010
* Removed range-based for
* Added explicit return type to non-trivial lambda
* Added explicit scope for tInterstageIoData
steve-lunarg [Thu, 9 Mar 2017 15:59:45 +0000 (08:59 -0700)]
Enable GatherCmpRed. Green/Blue/Alpha cannot be supported.
This implements GatherCmpRed in terms of OpImageDrefGather.
There appears to be no way to implement the Green/Blue/Apha forms: see #673.
John Kessenich [Thu, 9 Mar 2017 04:16:35 +0000 (21:16 -0700)]
HLSL: Non-functional: Remove dead .length() code.
John Kessenich [Thu, 9 Mar 2017 03:09:03 +0000 (20:09 -0700)]
HLSL: Non-functional: Drive existing method recognition by syntax, not by name.
This (and previous commit) is a better foundation to build real methods on.
John Kessenich [Thu, 9 Mar 2017 01:53:51 +0000 (18:53 -0700)]
HLSL: Non-functional: Don't process function name/parameters before expected a function declaration.
John Kessenich [Wed, 8 Mar 2017 03:57:49 +0000 (20:57 -0700)]
Merge pull request #756 from steve-lunarg/getdimensions-fix
HLSL: use LOD form of ImageQuerySize when needed.
John Kessenich [Wed, 8 Mar 2017 03:44:09 +0000 (20:44 -0700)]
HLSL: Grammar: Generalize accepting a declaration to accept an aggregate of subtrees.
This is slightly cleaner today for entry-point wrapping, which sometimes made
two subtrees for a function definition instead of just one subtree. It will be
critical though for recognizing a struct with multiple member functions.
steve-lunarg [Wed, 8 Mar 2017 02:30:25 +0000 (19:30 -0700)]
HLSL: use LOD form of ImageQuerySize when needed.
The non-LOD form of image size query is prohibited in certain cases:
see the OpImageQuerySize and OpImageQuerySizeLod sections of the SPIR-V
spec for details. Sometimes we were generating the non-LOD form when
we should have been using the LOD form. Sometimes the LOD form is required
even if the underlying HLSL query did not supply a MIP level itself,
in which case level 0 is now queried.
John Kessenich [Tue, 7 Mar 2017 01:18:37 +0000 (18:18 -0700)]
HLSL: Fix #754: recognize type casts in if-statements separately from declarations.
John Kessenich [Tue, 7 Mar 2017 00:56:56 +0000 (17:56 -0700)]
Merge pull request #755 from steve-lunarg/sb-orderfix
HLSL: Fix ordering defect if global SB decl after fn param
steve-lunarg [Mon, 6 Mar 2017 19:01:44 +0000 (12:01 -0700)]
WIP: HLSL: Fix ordering defect if global SB decl after fn param
This change propagates the storage qualifier from the buffer object to its contained
array type so that isStructBufferType() realizes it is one. That propagation was
happening before only for global variable declarations, so compilation defects would
result if the use of a function parameter happened before a global declaration.
This fixes that case, whether or not there ever is a global declaration, and
regardless of the relative order.
This changes the hlsl.structbuffer.fn.frag test to exercise the alternate order.
There are no differences to generated SPIR-V for the cases which successfully compiled before.
John Kessenich [Mon, 6 Mar 2017 15:51:35 +0000 (08:51 -0700)]
SPV: Allow push constant buffers to not have an instance name.
John Kessenich [Sat, 4 Mar 2017 01:18:23 +0000 (18:18 -0700)]
HLSL: Test for issue #699.
John Kessenich [Sat, 4 Mar 2017 00:23:53 +0000 (17:23 -0700)]
Merge pull request #750 from dgkoch/rename_KHX_to_EXT
Rename KHX_multiview/device_group to EXT_multiview/device to match the released specs
John Kessenich [Sat, 4 Mar 2017 00:01:01 +0000 (17:01 -0700)]
HLSL: Add 'class' keyword as (so far) synonym for 'struct'.
Daniel Koch [Fri, 3 Mar 2017 23:40:48 +0000 (18:40 -0500)]
Rename KHX to EXT to match the released specs
GL_KHX_multiview and GL_KHX_device_group don't exist,
they were released as GL_EXT_multiview and GL_EXT_device_group.
John Kessenich [Fri, 3 Mar 2017 16:20:43 +0000 (09:20 -0700)]
Merge pull request #748 from dgkoch/dgkoch_build_fixes2
More build fixes
Daniel Koch [Fri, 3 Mar 2017 15:34:07 +0000 (10:34 -0500)]
More build fixes
Fix another build warning on some platforms
Use an explicit cast from size_t to int to avoid warning.
John Kessenich [Thu, 2 Mar 2017 21:30:59 +0000 (14:30 -0700)]
HLSL: Fix #747: accept 'struct' in front of previously user-defined type name.
John Kessenich [Wed, 1 Mar 2017 20:49:11 +0000 (13:49 -0700)]
SPV: Fix #739: OpSelect can only operate on scalars and vectors.
John Kessenich [Wed, 1 Mar 2017 20:17:24 +0000 (13:17 -0700)]
Merge pull request #744 from realitix/sanitize_sh_link
Sanitize ShaderLang.h
John Kessenich [Wed, 1 Mar 2017 20:14:51 +0000 (13:14 -0700)]
Merge pull request #746 from dgkoch/dgkoch_build_fixes
Fix build warnings on some platforms
John Kessenich [Wed, 1 Mar 2017 20:12:26 +0000 (13:12 -0700)]
Build: Another fix for issue #718: implement the hidden methods of tFinalize.
Daniel Koch [Tue, 28 Feb 2017 14:01:43 +0000 (09:01 -0500)]
Fix build warnings on some platforms
Use an explicit cast from size_t to int to avoid errors like the following:
glslang\glslang\MachineIndependent\preprocessor\Pp.cpp(1053) : error C2220: warning treated as error - no 'object' file generated
glslang\glslang\MachineIndependent\preprocessor\Pp.cpp(1053) : warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data
affects Pp.cpp, hlslParseHelper.cpp.
Initialize local variable to get rid of warningsa about potentially
uninitialized variables:
glslang\hlsl\hlslparsehelper.cpp(3667) : error C2220: warning treated as error - no 'object' file generated
glslang\hlsl\hlslparsehelper.cpp(3667) : warning C4701: potentially uninitialized local variable 'builtIn' used
affects hlslParseHelper.cpp
Jean-Sebastien Bevilacqua [Wed, 1 Mar 2017 08:23:14 +0000 (09:23 +0100)]
Sanitize ShaderLang.h
ShaderLang.h contains declaration for `ShLink` function which is never
defined.
See this grep output:
$grep -Hrn 'ShLink'
glslang/Public/ShaderLang.h:206:SH_IMPORT_EXPORT int ShLink(
glslang/Public/ShaderLang.h:214:SH_IMPORT_EXPORT int ShLinkExt(
glslang/MachineIndependent/ShaderLang.cpp:1268:int ShLinkExt(
John Kessenich [Wed, 1 Mar 2017 01:39:20 +0000 (18:39 -0700)]
PP: Fix issue #738: don't assert on characters within a string.
John Kessenich [Wed, 1 Mar 2017 01:04:47 +0000 (18:04 -0700)]
PP: Partially address issue #738: handle premature end of argument when token pasting.
John Kessenich [Tue, 28 Feb 2017 23:18:24 +0000 (16:18 -0700)]
Merge pull request #742 from steve-lunarg/f16tof32-typefix
HLSL: small fix for index type in f16tof32 opcode
steve-lunarg [Tue, 28 Feb 2017 21:14:14 +0000 (14:14 -0700)]
HLSL: small fix for index type in f16tof32 opcode
The f16tof32 opcode was indexing a vector with a float 0, rather
than an int 0. It may have made no functional difference due to the
identical bit pattern, but code looking at the type could be
confused.
John Kessenich [Tue, 28 Feb 2017 21:10:00 +0000 (14:10 -0700)]
GLSL: Fix #741: rationalize per-block vs. per-member offset checking.
John Kessenich [Tue, 28 Feb 2017 20:10:51 +0000 (13:10 -0700)]
Merge pull request #736 from steve-lunarg/structbuffer-params
HLSL: add structuredbuffer pass by reference in fn params
John Kessenich [Tue, 28 Feb 2017 19:40:40 +0000 (12:40 -0700)]
PP: Address #737: accept 'h'/'H' floating-point suffix more broadly.
John Kessenich [Tue, 28 Feb 2017 16:54:38 +0000 (09:54 -0700)]
Merge pull request #740 from steve-lunarg/f16tof32
HLSL: add f16tof32 and f32tof16 decompositions.
steve-lunarg [Mon, 27 Feb 2017 20:09:32 +0000 (13:09 -0700)]
WIP: HLSL: add f16tof32 and f32tof16 decompositions.
John Kessenich [Mon, 27 Feb 2017 08:50:28 +0000 (01:50 -0700)]
SPV: Update SPV header to official Rev. 10 of 1.0, and fix the consequences of doing so.
John Kessenich [Mon, 27 Feb 2017 08:20:51 +0000 (01:20 -0700)]
SPV: Implement new extensions GL_KHX_device_group and GL_KHX_multiview.
These correspond to SPV_KHR_device_group and SPV_KHR_multiview.
Also, bring tests up to date with Khronos internals, and some misc. related changes.
steve-lunarg [Fri, 24 Feb 2017 01:04:12 +0000 (18:04 -0700)]
WIP: HLSL: add structuredbuffer pass by reference in fn params
This PR adds the ability to pass structuredbuffer types by reference
as function parameters.
It also changes the representation of structuredbuffers from anonymous
blocks with named members, to named blocks with pseudonymous members.
That should not be an externally visible change.
John Kessenich [Sat, 25 Feb 2017 02:15:46 +0000 (19:15 -0700)]
SPV: Handle nested opaque types as function parameters.
John Kessenich [Thu, 23 Feb 2017 00:12:09 +0000 (17:12 -0700)]
Merge pull request #734 from steve-lunarg/ssbo-reflection
Add reflection queries for thread local size. Add ssbo auto-binding.
John Kessenich [Thu, 23 Feb 2017 00:11:00 +0000 (17:11 -0700)]
Merge pull request #733 from amdrexu/bugfix
SPV: Unexpected declarations of capabilities from NV extensions.
steve-lunarg [Wed, 22 Feb 2017 00:19:08 +0000 (17:19 -0700)]
Add reflection queries for thread local size and ssbo auto-binding
New command line option --shift-ssbo-binding mirrors --shift-ubo-binding, etc.
New reflection query getLocalSize(int dim) queries local size, e.g, CS threads.
Rex Xu [Wed, 22 Feb 2017 08:44:48 +0000 (16:44 +0800)]
SPV: Unexpected declarations of capabilities from NV extensions.
John Kessenich [Wed, 22 Feb 2017 00:01:37 +0000 (17:01 -0700)]
Merge pull request #725 from steve-lunarg/structurebuffer
HLSL: implement 4 (of 6) structuredbuffer types
steve-lunarg [Mon, 13 Feb 2017 00:50:28 +0000 (17:50 -0700)]
HLSL: implement 4 (of 6) structuredbuffer types
This is a partial implemention of structurebuffers supporting:
* structured buffer types of:
* StructuredBuffer
* RWStructuredBuffer
* ByteAddressBuffer
* RWByteAddressBuffer
* Atomic operations on RWByteAddressBuffer
* Load/Load[234], Store/Store[234], GetDimensions methods (where allowed by type)
* globallycoherent flag
But NOT yet supporting:
* AppendStructuredBuffer / ConsumeStructuredBuffer types
* IncrementCounter/DecrementCounter methods
Please note: the stride returned by GetDimensions is as calculated by glslang for std430,
and may not match other environments in all cases.
John Kessenich [Tue, 21 Feb 2017 20:09:05 +0000 (13:09 -0700)]
Merge pull request #732 from dneto0/fix-overrides
Add override where needed by clang++
David Neto [Tue, 21 Feb 2017 19:41:15 +0000 (14:41 -0500)]
Add override where needed by clang++
Otherwise we get an error when we have both
-Werror and -Winconsistent-missing-override.
This is required for building with NDK r14 betas
John Kessenich [Sat, 18 Feb 2017 16:45:40 +0000 (09:45 -0700)]
Fix issue #676: emit error message on failure to open spv file.
John Kessenich [Sat, 18 Feb 2017 02:06:21 +0000 (19:06 -0700)]
SPV: Fix #723: construct vectors from matrices.
John Kessenich [Sat, 18 Feb 2017 00:40:26 +0000 (17:40 -0700)]
Merge pull request #727 from jekstrand/image-load-formatted
Implement GL_EXT_shader_image_load_formatted
John Kessenich [Sat, 18 Feb 2017 00:39:32 +0000 (17:39 -0700)]
Merge pull request #729 from gwihlidal/master
HLSL - Support for SV_GroupIndex
Jason Ekstrand [Fri, 17 Feb 2017 04:35:17 +0000 (20:35 -0800)]
Implement GL_EXT_shader_image_load_formatted
Graham Wihlidal [Fri, 17 Feb 2017 18:05:14 +0000 (19:05 +0100)]
Warning fixes
Graham Wihlidal [Fri, 17 Feb 2017 18:03:25 +0000 (19:03 +0100)]
HLSL - Support for SV_GroupIndex
Graham Wihlidal [Fri, 17 Feb 2017 17:41:31 +0000 (18:41 +0100)]
Merge pull request #1 from KhronosGroup/master
Update from master
John Kessenich [Fri, 17 Feb 2017 16:34:08 +0000 (09:34 -0700)]
Merge pull request #720 from flaviobortot/master
Added --vn option to generate a C header file containing a variable a…
John Kessenich [Fri, 17 Feb 2017 16:11:41 +0000 (09:11 -0700)]
Merge pull request #728 from MaciejJesionowskiAMD/fix-mismatched-subgroup-vote-string
Fix mismatched doc string for SPV_KHR_subgroup_vote
Maciej Jesionowski [Fri, 17 Feb 2017 12:45:08 +0000 (13:45 +0100)]
Fix mismatched doc string for SPV_KHR_subgroup_vote
Text for opcodes OpSubgroupAllKHR and OpSubgroupAnyKHR was swapped.
John Kessenich [Wed, 15 Feb 2017 23:41:52 +0000 (16:41 -0700)]
Merge pull request #724 from chaoc/master
Implement NVX_multiview_per_view_attributes
Flavio [Wed, 15 Feb 2017 22:29:33 +0000 (14:29 -0800)]
Removed tabs and replaced with spaces. Changed layout for "else if"