platform/upstream/glslang.git
7 years agoHLSL - Support for SV_GroupIndex
Graham Wihlidal [Fri, 17 Feb 2017 18:03:25 +0000 (19:03 +0100)]
HLSL - Support for SV_GroupIndex

7 years agoMerge pull request #1 from KhronosGroup/master
Graham Wihlidal [Fri, 17 Feb 2017 17:41:31 +0000 (18:41 +0100)]
Merge pull request #1 from KhronosGroup/master

Update from master

7 years agoMerge pull request #720 from flaviobortot/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…

7 years agoMerge pull request #728 from MaciejJesionowskiAMD/fix-mismatched-subgroup-vote-string
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

7 years agoFix 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.

7 years agoMerge pull request #724 from chaoc/master
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

7 years agoRemoved tabs and replaced with spaces. Changed layout for "else if"
Flavio [Wed, 15 Feb 2017 22:29:33 +0000 (14:29 -0800)]
Removed tabs and replaced with spaces. Changed layout for "else if"

7 years agoImplement NVX_multiview_per_view_attributes
chaoc [Tue, 14 Feb 2017 22:52:34 +0000 (14:52 -0800)]
Implement NVX_multiview_per_view_attributes

7 years agoSupport align/offset for all versions GLSL/ESSL targeting SPIR-V.
John Kessenich [Mon, 13 Feb 2017 16:09:04 +0000 (09:09 -0700)]
Support align/offset for all versions GLSL/ESSL targeting SPIR-V.

7 years agoMerge pull request #722 from steve-lunarg/tessellation
John Kessenich [Sat, 11 Feb 2017 01:10:46 +0000 (18:10 -0700)]
Merge pull request #722 from steve-lunarg/tessellation

Add basic HS/DS implementation.

7 years agoPP, nonfunctional: Properly encapsulate a TokenStream.
John Kessenich [Sat, 11 Feb 2017 01:03:01 +0000 (18:03 -0700)]
PP, nonfunctional: Properly encapsulate a TokenStream.

7 years agoAdd basic HS/DS implementation.
steve-lunarg [Sat, 7 Jan 2017 15:54:10 +0000 (08:54 -0700)]
Add basic HS/DS implementation.

This obsoletes WIP PR #704, which was built on the pre entry point wrapping master.  New version
here uses entry point wrapping.

This is a limited implementation of tessellation shaders.  In particular, the following are not functional,
and will be added as separate stages to reduce the size of each PR.

* patchconstantfunctions accepting per-control-point input values, such as
  const OutputPatch <hs_out_t, 3> cpv are not implemented.

* patchconstantfunctions whose signature requires an aggregate input type such as
  a structure containing builtin variables.  Code to synthesize such calls is not
  yet present.

These restrictions will be relaxed as soon as possible.  Simple cases can compile now: see for example
Test/hulsl.hull.1.tesc - e.g, writing to inner and outer tessellation factors.

PCF invocation is synthesized as an entry point epilogue protected behind a barrier and a test on
invocation ID == 0.  If there is an existing invocation ID variable it will be used, otherwise one is
added to the linkage.  The PCF and the shader EP interfaces are unioned and builtins appearing in
the PCF but not the EP are also added to the linkage and synthesized as shader inputs.
Parameter matching to (eventually arbitrary) PCF signatures is by builtin variable type.  Any user
variables in the PCF signature will result in an error.  Overloaded PCF functions will also result in
an error.

[domain()], [partitioning()], [outputtopology()], [outputcontrolpoints()], and [patchconstantfunction()]
attributes to the shader entry point are in place, with the exception of the Pow2 partitioning mode.

7 years agoPP, nonfunctional: Remove crufty bit-twiddling of tokens.
John Kessenich [Fri, 10 Feb 2017 19:56:05 +0000 (12:56 -0700)]
PP, nonfunctional: Remove crufty bit-twiddling of tokens.

7 years agoFix issue #708: token pasting within macro argument expansion.
John Kessenich [Fri, 10 Feb 2017 17:04:16 +0000 (10:04 -0700)]
Fix issue #708: token pasting within macro argument expansion.

7 years agoMerge pull request #707 from KhronosGroup/emit-opSelect
John Kessenich [Thu, 9 Feb 2017 00:33:11 +0000 (17:33 -0700)]
Merge pull request #707 from KhronosGroup/emit-opSelect

SPV: Emit op select

7 years agoAddress issue #718. Should change which warning is generated, hopefully to a better...
John Kessenich [Thu, 9 Feb 2017 00:31:03 +0000 (17:31 -0700)]
Address issue #718. Should change which warning is generated, hopefully to a better one.

7 years agoSPV: Implement specialization constants for ?:.
John Kessenich [Sun, 29 Jan 2017 02:29:42 +0000 (19:29 -0700)]
SPV: Implement specialization constants for ?:.

7 years agoSPV: Emit OpSelect when a selection node is simple enough.
John Kessenich [Fri, 27 Jan 2017 03:31:11 +0000 (20:31 -0700)]
SPV: Emit OpSelect when a selection node is simple enough.

Also, ensures it has a type, no disallowed side effects,
or performance trade offs.

7 years agoMerge pull request #685 from KhronosGroup/wrap-entry-point
John Kessenich [Thu, 9 Feb 2017 00:01:44 +0000 (17:01 -0700)]
Merge pull request #685 from KhronosGroup/wrap-entry-point

HLSL: Wrap entry-point; needed to write 'in' args, and support 'inout' args

7 years agoHLSL: don't do a deepCopy() for typedef, as we still want to share the type graph.
John Kessenich [Wed, 8 Feb 2017 20:59:30 +0000 (13:59 -0700)]
HLSL: don't do a deepCopy() for typedef, as we still want to share the type graph.

This enables the IO type mapping to work transparently for typedefs.

7 years agoHLSL: Add tests and refine what decorations are passed through per stage/in/out.
John Kessenich [Tue, 7 Feb 2017 01:44:52 +0000 (18:44 -0700)]
HLSL: Add tests and refine what decorations are passed through per stage/in/out.

7 years agoHLSL: Move to fine-grained control for defining input/output/uniform IO types.
John Kessenich [Mon, 6 Feb 2017 03:27:30 +0000 (20:27 -0700)]
HLSL: Move to fine-grained control for defining input/output/uniform IO types.

7 years agoHLSL: Build IO types bottom up, as parsed, and cache the original (IO).
John Kessenich [Sat, 4 Feb 2017 00:57:55 +0000 (17:57 -0700)]
HLSL: Build IO types bottom up, as parsed, and cache the original (IO).

Previously, this was done recursively, per object, and the nonIO version
was cached. This reverses both those approaches.

7 years agoHLSL: Have loose uniforms also go through the makeTypeNonIo() path.
John Kessenich [Fri, 3 Feb 2017 21:06:36 +0000 (14:06 -0700)]
HLSL: Have loose uniforms also go through the makeTypeNonIo() path.

7 years agoHLSL: remove pervertex output blocks
steve-lunarg [Fri, 3 Feb 2017 20:37:54 +0000 (13:37 -0700)]
HLSL: remove pervertex output blocks

This removes pervertex output blocks, in favor of using only
loose variables.  The pervertex blocks are not required and were
only partly implemented, and were adding some complication.

This change goes with wrap-entry-point.

7 years agoBuild: Fix Linux for older compiler: Use TMap instead of TUndorderedMap.
John Kessenich [Fri, 3 Feb 2017 18:21:24 +0000 (11:21 -0700)]
Build: Fix Linux for older compiler: Use TMap instead of TUndorderedMap.

7 years agoHLSL: fix copies between arrays of structs of builtins, and arrayed builtins.
steve-lunarg [Thu, 2 Feb 2017 23:32:02 +0000 (16:32 -0700)]
HLSL: fix copies between arrays of structs of builtins, and arrayed builtins.

Structs are split to remove builtin members to create valid SPIR-V.  In this
process, an outer structure array dimension may be propegated onto the
now-removed builtin variables.  For example, a mystruct[3].position ->
position[3].  The copy between the split and unsplit forms would handle
this in some cases, but not if the array dimension was at different levels
of aggregate.

It now does this, but may not handle arbitrary composite types.  Unclear if
that has any semantic meaning for builtins though.

7 years agoHLSL: Make the entry-point shadow function have non-IO params and return.
John Kessenich [Thu, 2 Feb 2017 01:09:17 +0000 (18:09 -0700)]
HLSL: Make the entry-point shadow function have non-IO params and return.

This also removes an no longer needed makeTemporary() and rationalizes
makeTypeNonIo()'s interface.

7 years agoHLSL: Type sanitization: create non-IO types for var decl and fn param/ret
steve-lunarg [Wed, 25 Jan 2017 17:03:17 +0000 (10:03 -0700)]
HLSL: Type sanitization: create non-IO types for var decl and fn param/ret

This introduces parallel types for IO-type containing aggregates used as
non-entry point function parameters or return types, or declared as variables.
Further uses of the same original type will share the same sanitized deep
structure.

This is intended to be used with the wrap-entry-point branch.

7 years agoAST: Have type deepCopy() preserve type graphs as graphs.
John Kessenich [Wed, 1 Feb 2017 20:14:03 +0000 (13:14 -0700)]
AST: Have type deepCopy() preserve type graphs as graphs.

Previously, a type graph would turn into a type tree. That is,
a deep node that is shared would have multiple copies made.

This is important when creating IO and non-IO versions of deep types.

7 years agoHLSL: Wrap the entry-point; need to write 'in' args, and support 'inout' args.
John Kessenich [Thu, 19 Jan 2017 22:41:47 +0000 (15:41 -0700)]
HLSL: Wrap the entry-point; need to write 'in' args, and support 'inout' args.

This needs some render testing, but is destined to be part of master.

This also leads to a variety of other simplifications.
 - IO are global symbols, so only need one list of linkage nodes (deferred)
 - no longer need parse-context-wide 'inEntryPoint' state, entry-point is localized
 - several parts of splitting/flattening are now localized

7 years agoAdded --vn option to generate a C header file containing a variable assigned to the...
Flavio [Mon, 6 Feb 2017 19:46:35 +0000 (11:46 -0800)]
Added --vn option to generate a C header file containing a variable assigned to the hex representation of the shader. This is a standard feature on Microsoft's HLSL compiler and it allows developers to include pre-compiled shaders directly into the code. This option enables "Hex output", so it is NOT required to specify -x as well. The output file name is preserved, so no ".h" extension is added. If you want the output file to have ".h" extension then you have to specify it on the output file name. The generated header file uses the "#pragma once" pragma to avoid multiple inclusions.

7 years agoResolve issue #700: allow initializers on struct members.
John Kessenich [Thu, 2 Feb 2017 22:16:20 +0000 (15:16 -0700)]
Resolve issue #700: allow initializers on struct members.

7 years agoMemory/constructor/warning clean-up. Addresses issue #705.
John Kessenich [Thu, 2 Feb 2017 21:55:02 +0000 (14:55 -0700)]
Memory/constructor/warning clean-up. Addresses issue #705.

7 years agoMerge pull request #711 from eoma/fix-friendly-specialization-name
John Kessenich [Thu, 2 Feb 2017 21:26:06 +0000 (14:26 -0700)]
Merge pull request #711 from eoma/fix-friendly-specialization-name

SPV: Emit names of specialization constants, fixes #710

7 years agoSPV: Emit names of specialization constants
Endre Oma [Tue, 31 Jan 2017 20:08:19 +0000 (21:08 +0100)]
SPV: Emit names of specialization constants

7 years agoMerge pull request #706 from Ralith/install-headers
John Kessenich [Mon, 30 Jan 2017 03:44:31 +0000 (20:44 -0700)]
Merge pull request #706 from Ralith/install-headers

Install headers

7 years agoInstall headers
Benjamin Saunders [Mon, 30 Jan 2017 01:45:12 +0000 (17:45 -0800)]
Install headers

This enables the vulkan loader to be built against an installed glslang.

7 years agoFix bug from PR #678: NV_EXTENSIONS deleted implicit array sizing.
John Kessenich [Fri, 27 Jan 2017 05:03:57 +0000 (22:03 -0700)]
Fix bug from PR #678: NV_EXTENSIONS deleted implicit array sizing.

7 years agoFix issue #693. Ternary operator on void type.
John Kessenich [Thu, 26 Jan 2017 22:48:27 +0000 (15:48 -0700)]
Fix issue #693. Ternary operator on void type.

7 years agoMerge pull request #690 from ligfx/proper_dependencies
John Kessenich [Thu, 26 Jan 2017 22:13:27 +0000 (15:13 -0700)]
Merge pull request #690 from ligfx/proper_dependencies

CMake: add target_link_libraries internally

7 years agoREADME: point to HLSL status issues
John Kessenich [Thu, 26 Jan 2017 19:12:36 +0000 (12:12 -0700)]
README: point to HLSL status issues

7 years agoMerge pull request #702 from resetnow/master
John Kessenich [Thu, 26 Jan 2017 18:51:31 +0000 (11:51 -0700)]
Merge pull request #702 from resetnow/master

SpvBuilder: add const specifier to vector reference arguments

7 years agoSpvBuilder: add const specifier to vector reference arguments
Vlad Ivanov [Thu, 26 Jan 2017 17:46:02 +0000 (20:46 +0300)]
SpvBuilder: add const specifier to vector reference arguments

7 years agoMerge pull request #694 from mtavenrath/fix_origin_link
John Kessenich [Thu, 26 Jan 2017 17:39:54 +0000 (10:39 -0700)]
Merge pull request #694 from mtavenrath/fix_origin_link

Use correct OriginUpperLeft when linking more than one shader.

7 years agoUse correct OriginUpperLeft when linking more than one shader.
Markus Tavenrath [Tue, 24 Jan 2017 00:53:16 +0000 (16:53 -0800)]
Use correct OriginUpperLeft when linking more than one shader.

7 years agoMerge pull request #696 from amdrexu/bugfix2
John Kessenich [Tue, 24 Jan 2017 17:58:21 +0000 (10:58 -0700)]
Merge pull request #696 from amdrexu/bugfix2

Semantics: Texture clamp functions are available for fragment shader only

7 years agoMerge pull request #695 from amdrexu/bugfix
John Kessenich [Tue, 24 Jan 2017 17:57:54 +0000 (10:57 -0700)]
Merge pull request #695 from amdrexu/bugfix

Fix a CMakeLists issue

7 years agoSemantics: Texture clamp functions are available for fragment shader only.
Rex Xu [Tue, 24 Jan 2017 06:36:10 +0000 (14:36 +0800)]
Semantics: Texture clamp functions are available for fragment shader only.

7 years agoFix a CMakeLists issue
Rex Xu [Tue, 24 Jan 2017 06:24:21 +0000 (14:24 +0800)]
Fix a CMakeLists issue

7 years agoMerge pull request #692 from hrydgard/no-nvextensions-build-fix
John Kessenich [Mon, 23 Jan 2017 19:34:15 +0000 (12:34 -0700)]
Merge pull request #692 from hrydgard/no-nvextensions-build-fix

Fix build if NV_EXTENSIONS is not set

7 years agoFix build if NV_EXTENSIONS is not set
Henrik Rydgard [Mon, 23 Jan 2017 15:25:50 +0000 (16:25 +0100)]
Fix build if NV_EXTENSIONS is not set

7 years agoMerge pull request #678 from chaoc/stereo_view_rendering
John Kessenich [Sat, 21 Jan 2017 19:05:47 +0000 (12:05 -0700)]
Merge pull request #678 from chaoc/stereo_view_rendering

support SPV_NV_viewport_array2 and SPV_NV_stereo_view_rendering

7 years agoCMake: add target_link_libraries internally
Michael Maltese [Sat, 21 Jan 2017 18:59:15 +0000 (10:59 -0800)]
CMake: add target_link_libraries internally

Makes it easier to include glslang in a larger CMake project---instead
of having to call `target_link_libraries(glslang OSDependent OGLCompiler
HLSL)`, for example, you only need to call
`target_link_libraries(glslang)` and it will pull in the helpers it
needs.

This is also better in terms of cleaning up the "public interface",
of sorts, for building glslang: end-users probably shouldn't need to
know or be explicitly dependent on internal targets.

7 years agosupport SPV_NV_viewport_array2 and SPV_NV_stereo_view_rendering
chaoc [Fri, 13 Jan 2017 09:10:53 +0000 (01:10 -0800)]
support SPV_NV_viewport_array2 and SPV_NV_stereo_view_rendering

7 years agoMerge pull request #689 from mikew-lunarg/master
John Kessenich [Sat, 21 Jan 2017 00:10:29 +0000 (17:10 -0700)]
Merge pull request #689 from mikew-lunarg/master

Fix for not-handled-in-switch warnings

7 years agoFix for not-handled-in-switch warnings
Mike Weiblen [Fri, 20 Jan 2017 20:34:10 +0000 (13:34 -0700)]
Fix for not-handled-in-switch warnings

Added default to the switch() for AMD_EXTENSIONS to avoid a spew
of warning messages.

7 years agoMerge pull request #683 from rdb/master
John Kessenich [Fri, 20 Jan 2017 20:21:43 +0000 (13:21 -0700)]
Merge pull request #683 from rdb/master

Fix compilation with MSVC 2010

7 years agoFix compilation with MSVC 2010
rdb [Fri, 20 Jan 2017 13:46:39 +0000 (14:46 +0100)]
Fix compilation with MSVC 2010

7 years agoMerge pull request #682 from steve-lunarg/split-copy-fix
John Kessenich [Thu, 19 Jan 2017 23:56:06 +0000 (16:56 -0700)]
Merge pull request #682 from steve-lunarg/split-copy-fix

HLSL: fix dereferencing when copying split structures with arrays

7 years agoMerge pull request #679 from ashwinkolhe/akolhe_spv_khr_subgroup_vote
John Kessenich [Thu, 19 Jan 2017 23:16:49 +0000 (16:16 -0700)]
Merge pull request #679 from ashwinkolhe/akolhe_spv_khr_subgroup_vote

Implement SPV_KHR_subgroup_vote

7 years agoSPV: Merge pull request #675 from amdrexu/feature
John Kessenich [Thu, 19 Jan 2017 23:14:28 +0000 (16:14 -0700)]
SPV: Merge pull request #675 from amdrexu/feature

SPV: Implement new revision of extension GL_AMD_shader_ballot

7 years agoInfrastructure: remove potential memory leaks.
John Kessenich [Thu, 19 Jan 2017 22:29:25 +0000 (15:29 -0700)]
Infrastructure: remove potential memory leaks.

7 years agoHLSL: fix dereferencing when copying split structures with arrays
steve-lunarg [Thu, 19 Jan 2017 22:18:00 +0000 (15:18 -0700)]
HLSL: fix dereferencing when copying split structures with arrays

When copying split types with mixtures of user variables and buitins,
where the builtins are extracted, there is a parallel structures traversal.
The traversal was not obtaining the derefenced types in the array case.

7 years agoImplement new revision of extension GL_AMD_shader_ballot
Rex Xu [Fri, 14 Oct 2016 09:22:23 +0000 (17:22 +0800)]
Implement new revision of extension GL_AMD_shader_ballot

- Add support for invocation functions with "InclusiveScan" and
  "ExclusiveScan" modes.
- Add support for invocation functions taking int64/uint64/doube/float16
  as inout data types.

7 years agoNon-functional: Factor out entry-point logic from handleFunctionDefinition().
John Kessenich [Wed, 18 Jan 2017 23:45:02 +0000 (16:45 -0700)]
Non-functional: Factor out entry-point logic from handleFunctionDefinition().

7 years agoImplement SPV_KHR_subgroup_vote
Ashwin Kolhe [Wed, 18 Jan 2017 22:16:49 +0000 (14:16 -0800)]
Implement SPV_KHR_subgroup_vote

doc.cpp: Add capabilities, scope to the opcodes. Add opcode and
capability strings.
GLSL.ext.KHR.h: Add extension
string.
GlslangToSpv.cpp: Fix handling of opcodes to generate
appropriate SPIR-V.
spirv.hpp: Add capability and opcode
enums.
spv.shaderGroupVote.comp.out: Update SPIR-V output for test
shader.

7 years agoFix build break for non-VS.
John Kessenich [Sat, 14 Jan 2017 03:22:00 +0000 (20:22 -0700)]
Fix build break for non-VS.

7 years agoNon-functional: Fix round of compiler warnings.
John Kessenich [Sat, 14 Jan 2017 03:08:54 +0000 (20:08 -0700)]
Non-functional: Fix round of compiler warnings.

7 years agoFront-ends: Non-functional: Rationalize vector and matrix swizzles.
John Kessenich [Sat, 14 Jan 2017 02:34:22 +0000 (19:34 -0700)]
Front-ends: Non-functional: Rationalize vector and matrix swizzles.

This reduces code duplication in a few ways, and better encapsulates
vector swizzle representation.

7 years agoMerge pull request #656 from TiemoJung/overload_fix
John Kessenich [Fri, 13 Jan 2017 22:10:20 +0000 (15:10 -0700)]
Merge pull request #656 from TiemoJung/overload_fix

HLSL: Improved overload handling

7 years agoHLSL: Add EOpMatrixSwizzle, selectively decomposed to other ops, for issue #670.
John Kessenich [Fri, 13 Jan 2017 19:27:52 +0000 (12:27 -0700)]
HLSL: Add EOpMatrixSwizzle, selectively decomposed to other ops, for issue #670.

Since EOpMatrixSwizzle is a new op, existing back-ends only work when the
front end first decomposes it to other operations. So far, this is only
being done for simple assignment into matrix swizzles.

7 years agoHLSL: matrix swizzle (_12, _m23) syntax, partial semantics.
John Kessenich [Thu, 12 Jan 2017 23:51:18 +0000 (16:51 -0700)]
HLSL: matrix swizzle (_12, _m23) syntax, partial semantics.

This partially addressess issue #670, for when the matrix swizzle
degenerates to a component or column: m[c], m[c][r] (where HLSL
swaps rows and columns for user's view).

An error message is given for the arbitrary cases not covered.

These cases will work for arbitrary use of l-values.

Future work will handle more arbitrary swizzles, which might
not work as arbitrary l-values.

7 years agoPP: Clean up and rationalize floating-point-number scanner.
John Kessenich [Thu, 12 Jan 2017 19:00:59 +0000 (12:00 -0700)]
PP: Clean up and rationalize floating-point-number scanner.

This encapsulates where the string could overflow, removing 40 lines
of fragile code.  It also improves handling of numbers that are too long.

There are a couple of open issues that could related to this function
being more rational (locale dependence, 1.#INF).

7 years agoMerge pull request #664 from steve-lunarg/stage-io-fix
John Kessenich [Thu, 12 Jan 2017 17:18:23 +0000 (10:18 -0700)]
Merge pull request #664 from steve-lunarg/stage-io-fix

add other builtins to interstage IO

7 years agoInfrastructure: Support standard build with ENABLE_HLSL set to off.
John Kessenich [Wed, 11 Jan 2017 21:50:16 +0000 (14:50 -0700)]
Infrastructure: Support standard build with ENABLE_HLSL set to off.

7 years agoInfrastructure: Protect against missing built-in symbol table generators.
John Kessenich [Wed, 11 Jan 2017 21:24:56 +0000 (14:24 -0700)]
Infrastructure: Protect against missing built-in symbol table generators.

7 years agoMerge pull request #663 from KhronosGroup/full-include-semantics
John Kessenich [Wed, 11 Jan 2017 01:49:07 +0000 (18:49 -0700)]
Merge pull request #663 from KhronosGroup/full-include-semantics

Includer interface change to support full include semantics (requires downstream changes)

7 years agoMerge pull request #668 from slime73/DisableHLSL
John Kessenich [Tue, 10 Jan 2017 01:52:55 +0000 (18:52 -0700)]
Merge pull request #668 from slime73/DisableHLSL

Add a CMake option to disable compilation of HLSL input support.

7 years agoChange disabled-by-default DISABLE_HLSL option to enabled-by-default ENABLE_HLSL.
Alex Szpakowski [Mon, 9 Jan 2017 22:10:14 +0000 (18:10 -0400)]
Change disabled-by-default DISABLE_HLSL option to enabled-by-default ENABLE_HLSL.

Matches existing options.

7 years agoWIP: add other builtins to interstage IO
steve-lunarg [Sat, 7 Jan 2017 16:07:14 +0000 (09:07 -0700)]
WIP: add other builtins to interstage IO

(Still adding tests: do not commit)

This fixes PR #632 so that:

(a) The 4 PerVertex builtins are added to an interface block for all stages except fragment.

(b) Other builtin qualified variables are added as "loose" linkage members.

(c) Arrayness from the PerVertex builtins is moved to the PerVertex block.

(d) Sometimes, two PerVertex blocks are created, one for in, one for out (e.g, for some GS that
    both reads and writes a Position)

7 years agoAdd a CMake option to disable compilation of HLSL input support.
Alex Szpakowski [Mon, 9 Jan 2017 01:20:25 +0000 (21:20 -0400)]
Add a CMake option to disable compilation of HLSL input support.

7 years agoMerge pull request #667 from slime73/Compiler-Warnings
John Kessenich [Sun, 8 Jan 2017 23:11:24 +0000 (16:11 -0700)]
Merge pull request #667 from slime73/Compiler-Warnings

Address several compiler warnings

7 years agoReorder initializer fields to match variable declaration order (or vice versa) for...
Alex Szpakowski [Sun, 8 Jan 2017 22:21:17 +0000 (18:21 -0400)]
Reorder initializer fields to match variable declaration order (or vice versa) for several class constructors.

7 years agoAdd a virtual destructor to a class which has virtual methods.
Alex Szpakowski [Sun, 8 Jan 2017 21:57:21 +0000 (17:57 -0400)]
Add a virtual destructor to a class which has virtual methods.

7 years agoMark an overriden method in a subclass with ‘override’.
Alex Szpakowski [Sun, 8 Jan 2017 21:54:48 +0000 (17:54 -0400)]
Mark an overriden method in a subclass with ‘override’.

7 years agoPP #include: address PR feedback.
John Kessenich [Fri, 6 Jan 2017 23:48:18 +0000 (16:48 -0700)]
PP #include: address PR feedback.

7 years agoExternal interface change: PP: Full <> and "" semantics for the Includer.
John Kessenich [Fri, 6 Jan 2017 22:01:48 +0000 (15:01 -0700)]
External interface change: PP: Full <> and "" semantics for the Includer.

Any previous use would only be for "", which would probably mean changing

    include(...)  -> includeLocal(...)

See comments about includeLocal() being an additional search over
includeSystem(), not a superset search.

This also removed ForbidIncluder, as
 - the message in ForbidIncluder was redundant: error results were
   already returned to the caller, which then gives the error it
   wants to
 - there is a trivial default implementation that a subclass can
   override any subset of (I still like abstract base classes though)
 - trying to get less implementation out of the interface file anyway

7 years agoPP #include non-functional: consistent notation for "header" and "header name".
John Kessenich [Fri, 6 Jan 2017 21:54:18 +0000 (14:54 -0700)]
PP #include non-functional: consistent notation for "header" and "header name".

This is versus a variety of file-related language, designated, requested, etc.
Will simplify diffs for next commit.

7 years agoNon-functional: White space after "//", mostly for copyrights.
John Kessenich [Fri, 6 Jan 2017 19:34:14 +0000 (12:34 -0700)]
Non-functional: White space after "//", mostly for copyrights.

7 years agoNon-Functional: Whitespace, comments, replace accidentally deleted comment.
John Kessenich [Fri, 6 Jan 2017 07:34:48 +0000 (00:34 -0700)]
Non-Functional: Whitespace, comments, replace accidentally deleted comment.

- fixed ParseHelper.cpp newlines (crlf -> lf)
- removed trailing white space in most source files
- fix some spelling issues
- extra blank lines
- tabs to spaces
- replace #include comment about no location

7 years agoMerge pull request #661 from KhronosGroup/fix-include-error-paths
John Kessenich [Fri, 6 Jan 2017 07:32:39 +0000 (00:32 -0700)]
Merge pull request #661 from KhronosGroup/fix-include-error-paths

PP: #include: simplify the different paths out of #include.

7 years agoPP: #include: simplify the different paths out of #include.
John Kessenich [Thu, 5 Jan 2017 20:32:52 +0000 (13:32 -0700)]
PP: #include: simplify the different paths out of #include.

- some paths didn't release 'res'
- token is always '\n' after proper acceptance of the directive itself,
  so no need to test it, change it to '\n', etc.
- assuming setCurrentColumn(0) is not needed unless there are header tokens,
  but not clear why it is ever needed

Note: much of the simplified code read as if the included header tokens had
actually been processed, versus queued up for processing; maybe that explains
some things.

7 years agoPP: #include: add names to error messages, so that lexical analysis can be tested.
John Kessenich [Thu, 5 Jan 2017 19:18:34 +0000 (12:18 -0700)]
PP: #include: add names to error messages, so that lexical analysis can be tested.

7 years agoNon-functional: Very minor clean up.
John Kessenich [Thu, 5 Jan 2017 17:45:32 +0000 (10:45 -0700)]
Non-functional: Very minor clean up.

7 years agoMerge pull request #650 from steve-lunarg/lvalue-swizzle-fix
John Kessenich [Thu, 5 Jan 2017 17:40:14 +0000 (10:40 -0700)]
Merge pull request #650 from steve-lunarg/lvalue-swizzle-fix

HLSL: allow destination swizzles when writing RWTexture/RWBuffer

7 years agoHLSL: Fix issue #658: Don't adopt initializer constness from declaration.
John Kessenich [Thu, 5 Jan 2017 17:28:26 +0000 (10:28 -0700)]
HLSL: Fix issue #658: Don't adopt initializer constness from declaration.

This also makes it match how GLSL handles the same thing.

7 years agoMerge pull request #648 from steve-lunarg/type-identifiers
John Kessenich [Wed, 4 Jan 2017 21:07:34 +0000 (14:07 -0700)]
Merge pull request #648 from steve-lunarg/type-identifiers

HLSL: allow type keywords as identifiers, and add half type

7 years agoMerge pull request #632 from steve-lunarg/structure-splitting
John Kessenich [Wed, 4 Jan 2017 18:41:36 +0000 (11:41 -0700)]
Merge pull request #632 from steve-lunarg/structure-splitting

HLSL: inter-stage structure splitting.

7 years agoMerge pull request #659 from steve-lunarg/d3dcolortoubyte4
John Kessenich [Tue, 3 Jan 2017 22:34:33 +0000 (15:34 -0700)]
Merge pull request #659 from steve-lunarg/d3dcolortoubyte4

Add D3DCOLORtoUBYTE4 decomposition