Commit Graph

1681 Commits

Author SHA1 Message Date
John Kessenich
56b4547624 Merge pull request #620 from fjhenigman/foo
GLSL: Always define TShader::~Includer().
2016-12-08 11:15:59 -07:00
Frank Henigman
8dcf20298f GLSL: Always define TShader::~Includer().
Rather than update the existing ifdef to cover all necessary cases,
get rid of it and always define TShader::~Includer().
2016-12-06 16:37:07 -05:00
John Kessenich
b56f4ac72c Merge pull request #615 from dneto0/consistent-location-for-test-files
runtests should refer to test files in current directory
2016-12-06 00:48:11 -07:00
John Kessenich
9df6aa5361 GLSL: Allow desktop shaders to call functions from outside main().
Fixes issue #239.
2016-12-05 21:36:48 -07:00
John Kessenich
ec2e27adf8 Merge pull request #613 from Corillian/hlslpreprocess
Fixed processing #include's when preprocessing HLSL
2016-12-05 10:25:02 -07:00
David Neto
5cc92c5623 runtests should refer to test files in current directory
Recently added entry point renaming file referred to
test source file hlsl.entry.rename.frag via relative directory.

Change it to be consistent with other tests: assume test
sources are in the current directory.
2016-12-05 11:31:18 -05:00
Keith Newton
205dc4e4ec Fixed processing #include's when preprocessing HLSL 2016-12-04 17:07:10 -05:00
John Kessenich
fb06e9552e Don't print the "Linked stage" message unless the AST is being dumped. 2016-12-03 13:59:51 -07:00
John Kessenich
09512cbd5c Merge branch 'steve-lunarg-intrinsic-promotion' 2016-12-03 13:29:46 -07:00
John Kessenich
21b11f4cc1 Merge branch 'intrinsic-promotion' of https://github.com/steve-lunarg/glslang into steve-lunarg-intrinsic-promotion 2016-12-03 13:27:22 -07:00
John Kessenich
41be1cbe4a Merge pull request #604 from steve-lunarg/entry-rename-2
HLSL: allow renaming of shader entry point when creating SPIR-V
2016-12-01 23:47:49 -07:00
steve-lunarg
f1e0c87127 allow renaming of shader entry point when creating SPIR-V
Use "--source-entrypoint name" on the command line, or the
TShader::setSourceEntryPoint(char*) API.

When the name given to the above interfaces is detected in the
shader source, it will be renamed to the entry point name supplied
to the -e option or the TShader::setEntryPoint() method.
2016-12-01 08:51:43 -07:00
John Kessenich
8ce6e2ba49 Fix non-Windows build error. 2016-11-27 23:00:14 -07:00
John Kessenich
f97f2ce603 HLSL: Support the constructor idiom "(struct type)0".
This highly leverages the previous commit to handle partial initializers.
2016-11-27 22:51:36 -07:00
John Kessenich
98ad485321 HLSL: Support {...} initializer lists that are too short. 2016-11-27 17:39:07 -07:00
John Kessenich
1c98904014 Fix crash by returning early from finalCheck() if there is no tree to process. 2016-11-27 17:32:19 -07:00
John Kessenich
5307eb2d1b Non-functional: Change a bunch of 0 to nullptr. 2016-11-27 17:30:14 -07:00
John Kessenich
509c4216e6 Non-functional: Fix typos. 2016-11-27 17:26:21 -07:00
John Kessenich
e50dc536ff Warn on HLSL not finding entry point. Issue #588. 2016-11-26 13:45:18 -07:00
John Kessenich
517fe7a6ad Non-functional: Rename some entry-point variables to entryPoint, not main. 2016-11-26 13:31:47 -07:00
John Kessenich
fca826212c Always correctly terminate main. Issue #588, PR #600. 2016-11-26 13:23:20 -07:00
steve-lunarg
ef33ec0925 HLSL: add intrinsic function implicit promotions
This PR handles implicit promotions for intrinsics when there is no exact match,
such as for example clamp(int, bool, float).  In this case the int and bool will
be promoted to a float, and the clamp(float, float, float) form used.

These promotions can be mixed with shape conversions, e.g, clamp(int, bool2, float2).

Output conversions are handled either via the existing addOutputArgumentConversion
function, which this PR generalizes to handle either aggregates or unaries, or by
intrinsic decomposition.  If there are methods or intrinsics to be decomposed,
then decomposition is responsible for any output conversions, which turns out to
happen automatically in all current cases.  This can be revisited once inout
conversions are in place.

Some cases of actual ambiguity were fixed in several tests, e.g, spv.register.autoassign.*

Some intrinsics with only uint versions were expanded to signed ints natively, where the
underlying AST and SPIR-V supports that.  E.g, countbits.  This avoids extraneous
conversion nodes.

A new function promoteAggregate is added, and used by findFunction.  This is essentially
a generalization of the "promote 1st or 2nd arg" algorithm in promoteBinary.

The actual selection proceeds in three steps, as described in the comments in
hlslParseContext::findFunction:

1. Attempt an exact match.  If found, use it.
2. If not, obtain the operator from step 1, and promote arguments.
3. Re-select the intrinsic overload from the results of step 2.
2016-11-23 10:36:34 -07:00
John Kessenich
1c573fbcfb Merge pull request #601 from BearishSun/master
A way to query "location" qualifier for vertex attributes, using TProgram reflection API
2016-11-23 00:38:32 -07:00
John Kessenich
e122f053bb Merge pull request #599 from steve-lunarg/gs
HLSL: Add GS support
2016-11-23 00:29:30 -07:00
John Kessenich
6e848daf45 Merge pull request #596 from steve-lunarg/hlsl-intrinsic-parsing
HLSL: use HLSL parser for HLSL intrinsic prototypes, enable int/bool mats
2016-11-23 00:19:40 -07:00
John Kessenich
d347794ed1 Merge pull request #597 from steve-lunarg/sample-keyword-fix
HLSL: allow "sample" as a valid identifier.
2016-11-22 23:33:40 -07:00
BearishSun
32c294ed76 Adding a way to retrieve vertex attribute TType using TProgram reflection API (required in order to query location attributes). 2016-11-22 09:53:04 +01:00
steve-lunarg
f49cdf4183 WIP: HLSL: Add GS support
This PR adds:

[maxvertexcount(n)] attributes

point/line/triangle/lineadj/triangleadj qualifiers

PointStream/LineStream/TriangleStream templatized types

Append method on above template types

RestartStrip method on above template types.
2016-11-21 18:25:08 -07:00
steve-lunarg
75fd223f03 HLSL: allow "sample" as a valid identifier.
HLSL has keywords for various interpolation modifiers such as "linear",
"centroid", "sample", etc.  Of these, "sample" appears to be special,
as it is also accepted as an identifier string, where the others are not.

This PR adds this ability, so the construct "int sample = 42;" no longer
produces a compilation error.

New test = hlsl.identifier.sample.frag
2016-11-16 13:22:11 -07:00
steve-lunarg
0842dbb39a HLSL: use HLSL parser to parse HLSL intrinsic prototypes, enable int/bool mats
This PR adds a CreateParseContext() fn analogous to CreateBuiltInParseables(),
to create a language specific built in parser.  (This code was present before
but not encapsualted in a fn).  This can now be used to create a source language
specific parser for builtins.

Along with this, the code creating HLSL intrinsic prototypes can now produce
them in HLSL syntax, rather than GLSL syntax.  This relaxes certain prior
restrictions at the parser level.  Lower layers (e.g, SPIR-V) may still have
such restrictions, such as around Nx1 matrices: this code does not impact
that.

This PR also fleshes out matrix types for bools and ints, both of which were
partially in place before.  This was easier than maintaining the restrictions
in the HLSL prototype generator to avoid creating protoypes with those types.

Many tests change because the result type from intrinsics moves from "global"
to "temp".

Several new tests are added for the new types.
2016-11-16 11:19:22 -07:00
John Kessenich
fabe7d6a61 Test results: Fix incorrect test result caused by parallel development. Issue #594. 2016-11-14 21:22:05 -07:00
John Kessenich
0bf06d3cf5 Merge pull request #576 from steve-lunarg/uav-registers
Add UAV (image) binding offset and HLSL register class support
2016-11-14 09:39:46 -07:00
John Kessenich
20b030a7a6 Merge pull request #592 from ChrisGautier/barrier-wg
SPV: The execution scope for barriers should be Workgroup.
2016-11-14 09:37:34 -07:00
chrgau01@arm.com
c3f1cdfa57 GLSL: The execution scope for barriers should be Workgroup. 2016-11-14 10:10:05 +01:00
John Kessenich
84d11e1859 Merge pull request #583 from null77/fix-unref-warning
SPV: Fix unreferenced variable warning with AMD_EXTENSIONS disabled.
2016-11-13 22:04:04 -07:00
John Kessenich
610ff835c9 Merge pull request #589 from steve-lunarg/vec1-promotion-fix
HLSL: allow promotion from 1-vector types to scalars, e.g, float<-float1
2016-11-13 22:01:54 -07:00
steve-lunarg
d9cb832f9c HLSL: allow promotion from 1-vector types to scalars, e.g, float<-float1
Previously, an error was thrown when assigning a float1 to a scalar float,
or similar for other basic types.  This allows that.

Also, this allows calling functions accepting scalars with float1 params,
so for example sin(float1) will work.  This is a minor change in
HlslParseContext::findFunction().
2016-11-13 14:44:46 -07:00
John Kessenich
e69e196e02 Merge pull request #584 from steve-lunarg/attribute-expressions
HLSL: Allow expressions in attributes
2016-11-11 11:27:12 -07:00
steve-lunarg
a22f7dbb71 HLSL: Allow expressions in attributes
For example:

[numthreads(2+2, 2*3, (1+FOO)*BAR)]

This will result in a thread count (4, 6, 8).
2016-11-11 08:23:03 -07:00
Jamie Madill
57cb69a3f1 Fix unrefenced variable warning with AMD_EXTENSIONS disabled. 2016-11-09 13:49:24 -05:00
John Kessenich
d3f1122a44 Whole stack: Fix stale types in the AST linker object nodes, fixing #557.
Rationalizes the entire tracking of the linker object nodes, effecting
GLSL, HLSL, and SPIR-V, to allow tracked objects to be fully edited before
their type snapshot for linker objects.

Should only effect things when the rest of the AST contained no reference to
the symbol, because normal AST nodes were not stale. Also will only effect such
objects when their types were edited.
2016-11-05 10:22:33 -06:00
steve-lunarg
9088be4c07 Add UAV (image) binding offset and HLSL register support
This PR adds:

1. The "u" register class for RW* objects.

2. --shift-image-bindings (== --sib), analogous to --shift-texture-bindings etc.

3. Case insensitive reg classes.

4. Tests for above.
2016-11-01 14:44:54 -06:00
John Kessenich
e5e58cfee3 Merge pull request #575 from steve-lunarg/iomap-warning-fix
Fix build warnings in iomapper.cpp, re-indent to glslang standard
2016-11-01 09:49:49 -06:00
steve-lunarg
5b2d667fea Fix build warnings in remapper, re-indent for glslang standard
This has no functional changes.
2016-11-01 08:51:46 -06:00
John Kessenich
89df3c2dcb Merge pull request #572 from steve-lunarg/numthreads
HLSL: implement numthreads for compute shaders
2016-11-01 00:25:06 -06:00
John Kessenich
1061accfac Merge pull request #562 from TiemoJung/io_map_control_publish
HLSL -> Spir-V: Resource mapping handler
2016-11-01 00:24:01 -06:00
John Kessenich
909b8afa4a Merge pull request #570 from steve-lunarg/mintypes
HLSL: Add min*{float,int,uint} types
2016-11-01 00:23:29 -06:00
John Kessenich
cf35b17c4f Merge pull request #574 from dneto0/android-has-no-std-stoi
Use std::atoi instead of std::stoi
2016-11-01 00:08:40 -06:00
David Neto
e301f67828 Use std::atoi instead of std::stoi
Some Android cross cross-compilers don't have std::stoi.

E.g. i686-linux-android-g++ from Android NDK r10e don't have std::stoi.
2016-10-31 17:02:45 -04:00
steve-lunarg
3226b0835c HLSL: Add min*{float,int,uint} types
These HLSL types are guaranteed to have at least the given number of bits, but may have more.

min{16,10}float is mapped to EbtFloat at medium precision -> SPIRV RelaxedPrecision
min{16,12}int and min16uint are mapped to mediump -> SPIR-V RelaxedPrecision
2016-10-31 12:46:05 -06:00