John Kessenich [Tue, 13 Oct 2015 23:23:10 +0000 (17:23 -0600)]
Front-end: Fix missing tessellation shader built-in qualifiers.
The gl_in array has a special path due to context-specific
gl_MaxPatchVertices, making the code out of order for tagging built-ins.
This commit moves the tagging to the correct location.
This also fixes issue #80.
John Kessenich [Tue, 13 Oct 2015 22:29:02 +0000 (16:29 -0600)]
SPV: Add modes for spacing, depth, depth replacing, winding, and point mode.
John Kessenich [Tue, 13 Oct 2015 16:55:08 +0000 (10:55 -0600)]
Add comment that was missed in previous commit.
John Kessenich [Tue, 13 Oct 2015 16:39:19 +0000 (10:39 -0600)]
SPV constants and constOffsets completion: isConstant() and disassembler to see results.
Expand to full isConstant() implementation.
Fix disassembler to generate texture look-up masks.
John Kessenich [Tue, 13 Oct 2015 16:04:26 +0000 (10:04 -0600)]
Merge pull request #81 from amdrexu/myfix
Generate correct image operand mask for Offset and ConstOffset(#77) and correct arg # for rect. texelFetchOffset.
Rex Xu [Mon, 12 Oct 2015 09:02:21 +0000 (17:02 +0800)]
Fix an issue related with texelFetchOffset
Rex Xu [Sun, 11 Oct 2015 11:37:48 +0000 (19:37 +0800)]
Generate correct image operand mask for Offset and ConstOffset(#77)
John Kessenich [Tue, 6 Oct 2015 19:11:38 +0000 (13:11 -0600)]
Give error for calling a user-defined function at global scope.
John Kessenich [Mon, 5 Oct 2015 16:00:27 +0000 (10:00 -0600)]
Add another frexp() test.
John Kessenich [Fri, 2 Oct 2015 21:01:53 +0000 (15:01 -0600)]
Allow future keywords to be accessed as members in a struct.
This fixes a bug where a token that could be a keyword in one version
is not a keyword in another version, but treated like a non-member after
a "." dereference.
John Kessenich [Thu, 1 Oct 2015 18:40:48 +0000 (12:40 -0600)]
Front-end: Fix: Cubemap arrays only use 3-component coord when accessed as an image.
4 components are needed when used a texture, but not an image, which multiplies
layers and faces into the same coordinate. This fixes it from using 4 everywhere,
to only using 4 for textures and 3 for images.
John Kessenich [Thu, 1 Oct 2015 00:57:47 +0000 (18:57 -0600)]
GLSL front-end: Check recursively for opaque types in a block; these are all illegal.
John Kessenich [Tue, 22 Sep 2015 03:50:29 +0000 (21:50 -0600)]
SPV: Fix missing 'Member' operand to OpArrayLength.
John Kessenich [Mon, 21 Sep 2015 16:39:20 +0000 (10:39 -0600)]
SPV 31: Remove obsolete and unused ../SPIRV/GLSL450Lib.h.
John Kessenich [Mon, 21 Sep 2015 16:00:42 +0000 (10:00 -0600)]
Merge pull request #75 from google/fix-vs2013-debug
SPV non-determinism: Fixed subtle issue that causes tests to fail in VS2013 in some configs.
John Kessenich [Mon, 21 Sep 2015 14:59:47 +0000 (08:59 -0600)]
SPV: Remove old Rev. 30 header spirv.h (glslang has been using Rev. 31 spirv.hpp).
Andrew Woloszyn [Fri, 18 Sep 2015 20:12:03 +0000 (16:12 -0400)]
Fixed subtle issue that causes tests to fail in VS2013 in some configs.
Depending on specific optimization settings VS2013 will sometimes
execute the operands to
new Instruction(builder.getUniqueId(), builder.makeBoolType(), OpPhi)
left-to-right, and sometimes right-to-left. Since makeBoolType can
also call getUniqueId(), the IDs to the OpPhi can sometimes be swapped.
This guarantees an explicit ordering of the Ids so that tests work
reliably.
John Kessenich [Thu, 17 Sep 2015 00:23:20 +0000 (18:23 -0600)]
PP: Restore a line of code deleted by commit
bb63bd5e3792455b77ce93e471158bed0cc884f0.
John Kessenich [Wed, 16 Sep 2015 22:04:05 +0000 (16:04 -0600)]
SPV: Generate the LocalSize Execution Mode for compute shaders.
John Kessenich [Wed, 16 Sep 2015 16:54:31 +0000 (10:54 -0600)]
SPV: Minor corrections to previous big merge for images and atomics.
John Kessenich [Wed, 16 Sep 2015 16:51:33 +0000 (10:51 -0600)]
Merge pull request #71 from amdrexu/mywork
SPIRV: Add image instruction support and atomic counter support.
Rex Xu [Wed, 16 Sep 2015 09:48:22 +0000 (17:48 +0800)]
Add new test case for image functions and fix issues caught by this test
Rex Xu [Wed, 16 Sep 2015 05:20:37 +0000 (13:20 +0800)]
Merge master branch from upstream
Rex Xu [Wed, 16 Sep 2015 03:44:50 +0000 (11:44 +0800)]
Merge remote-tracking branch 'upstream/master'
Rex Xu [Wed, 16 Sep 2015 03:44:02 +0000 (11:44 +0800)]
Fix issues from review comments and those relevant to texelFetch
John Kessenich [Wed, 16 Sep 2015 01:38:56 +0000 (19:38 -0600)]
Full stack: implement textureQueryLod(*) and textureQueryLevels(*).
John Kessenich [Wed, 16 Sep 2015 01:17:30 +0000 (19:17 -0600)]
Update the Todo.txt file with recent AEP, 3.1, and textureQuery progress.
John Kessenich [Tue, 15 Sep 2015 04:45:16 +0000 (22:45 -0600)]
SPV OpAtomicCompareSwap: Generate correct operand order and number of operands.
John Kessenich [Tue, 15 Sep 2015 04:08:12 +0000 (22:08 -0600)]
SPV legacy texturing: Smear result of Op*Dref* up to a vector to match
the expectations of old GLSL shadow*() lookups.
John Kessenich [Tue, 15 Sep 2015 02:58:02 +0000 (20:58 -0600)]
SPV return from main: Simplify a legacy design such returns are not jumps to exit block.
Structured control-flow rules allow leaving the middle of a construct through
a return, but not through a jump to a block that does a return.
Addresses issue #58.
John Kessenich [Mon, 14 Sep 2015 02:59:36 +0000 (20:59 -0600)]
Bump up layout(location) limit from 62 to 4094, to handle bigger uniform locations.
Rex Xu [Mon, 14 Sep 2015 02:38:56 +0000 (10:38 +0800)]
Merge master branch from upstream
Rex Xu [Mon, 14 Sep 2015 02:15:54 +0000 (10:15 +0800)]
Merge remote-tracking branch 'upstream/master'
John Kessenich [Sun, 13 Sep 2015 20:46:30 +0000 (14:46 -0600)]
SPV: Reduce spurious type generation by removing intermediate types in the middle of access chains.
This generally simplifies access chain generation, with far fewer type conversions.
It is particularly important to future SPIR-V changes where there is less aggregate
type uniqueness due to carrying different layout information with the type.
John Kessenich [Sat, 12 Sep 2015 18:17:44 +0000 (12:17 -0600)]
SPV arrays: Add support for runtime-sized array types and arrays of arrays.
This includes run-time block.member.length() (OpArrayLength).
John Kessenich [Fri, 11 Sep 2015 21:25:38 +0000 (15:25 -0600)]
Front-end Arrays of arrays: Add ES-specific checks and tests. AoA should be quite close to done now.
John Kessenich [Fri, 11 Sep 2015 21:15:23 +0000 (15:15 -0600)]
SPV: Correct generation of transparent offsets for implicitly assigned offsets.
Rex Xu [Thu, 10 Sep 2015 04:06:48 +0000 (12:06 +0800)]
Merge pull request #1 from KhronosGroup/master
Sync local master branch from the upstream
John Kessenich [Wed, 9 Sep 2015 23:51:38 +0000 (17:51 -0600)]
SPV: Only decorate array and matrix strides for transparent types requiring explicit layouts.
John Kessenich [Wed, 9 Sep 2015 22:36:37 +0000 (16:36 -0600)]
Add test results for merge pull request #69.
John Kessenich [Wed, 9 Sep 2015 22:28:39 +0000 (16:28 -0600)]
README: Update testing section.
John Kessenich [Wed, 9 Sep 2015 22:33:45 +0000 (16:33 -0600)]
Merge pull request #69 from jekstrand/texel-fetch
SPIR-V: Add support for texelFetch
John Kessenich [Wed, 9 Sep 2015 22:19:15 +0000 (16:19 -0600)]
Update test results for pull request #68, SPIRV: Decorate matrices and arrays with their strides.
John Kessenich [Wed, 9 Sep 2015 22:12:35 +0000 (16:12 -0600)]
Merge pull request #68 from jekstrand/stride-decorations
SPIRV: Decorate matrices and arrays with their strides
John Kessenich [Wed, 9 Sep 2015 21:52:29 +0000 (15:52 -0600)]
Merge pull request #66 from chadversary/cmake-dont-override-install-prefix
cmake: Don't override CMAKE_INSTALL_PREFIX
John Kessenich [Wed, 9 Sep 2015 21:45:23 +0000 (15:45 -0600)]
Merge pull request #60 from xorgy/no-define-defined
Preprocessor: 'defined' cannot be used as a macro name in #define or #undef.
John Kessenich [Wed, 9 Sep 2015 21:32:38 +0000 (15:32 -0600)]
Remove executables from the source tree. This addresses issue #48.
Rex Xu [Wed, 9 Sep 2015 08:42:49 +0000 (16:42 +0800)]
SPIRV: Add the support of missing image functions #72
Rex Xu [Sun, 6 Sep 2015 08:30:11 +0000 (16:30 +0800)]
SPIRV: Token layout of OpAtomicXXX instructions is incorrect #70
Rex Xu [Sun, 6 Sep 2015 06:55:45 +0000 (14:55 +0800)]
SPIRV: Fix a comment issue
Jason Ekstrand [Sat, 5 Sep 2015 21:14:48 +0000 (14:14 -0700)]
SPIRV: Add support for texelFetch
There's nothing really special about texelFetch other than the opcode and
some restrictions so adding it is pretty trivial.
Jason Ekstrand [Sat, 5 Sep 2015 16:50:58 +0000 (09:50 -0700)]
SPIRV: Decorate matrices and arrays with their strides
Chad Versace [Mon, 31 Aug 2015 21:27:04 +0000 (14:27 -0700)]
cmake: Don't override CMAKE_INSTALL_PREFIX
Stop forcing CMAKE_INSTALL_PREFIX="install". If the user manually set
CMAKE_INSTALL_PREFIX, then trust that he knows what he's doing.
This patch does NOT change the project's default value ("install") of
CMAKE_INSTALL_PREFIX.
Change-Id: I81b46dd1986427b498fe6316bed03f01689987d4
John Kessenich [Sun, 30 Aug 2015 11:43:51 +0000 (05:43 -0600)]
Implement GL_KHR_blend_equation_advanced.
Aaron Hamilton [Wed, 19 Aug 2015 21:04:18 +0000 (21:04 +0000)]
'defined' cannot be used as a macro name in #define or #undef.
John Kessenich [Sat, 22 Aug 2015 22:54:35 +0000 (16:54 -0600)]
GL_OES_shader_multisample_interpolation: Include scalar swizzles as valid for interpolateAt*.
John Kessenich [Sat, 22 Aug 2015 07:21:47 +0000 (01:21 -0600)]
Implement GL_OES_shader_multisample_interpolation, as well as core desktop versions of it.
John Kessenich [Fri, 21 Aug 2015 15:19:52 +0000 (09:19 -0600)]
Link-check fix: Don't include built-in variables in the fragment output ES rule:
"No layout(location=) is required if there is only one output" should not count
built-in variables like gl_SampleMask. This is fixed.
John Kessenich [Wed, 19 Aug 2015 23:30:12 +0000 (17:30 -0600)]
Fix misspelled EOpFrexp and EOpLdexp.
John Kessenich [Wed, 19 Aug 2015 19:34:18 +0000 (13:34 -0600)]
Backward incompatible: Turn on PureOperatorBuiltins: use only enum-based built-in functions in the AST.
If this breaks your AST consumer, best is to modify it to test
against the enum values instead of doing string comparisons on
built-in function names. This is the reason the change was made.
If you need the old behavior, you should be able to get it back by changing
PureOperatorBuiltins to be false instead of true. This path will work for
a while, but is marked deprecated.
Also, the old behavior is tagged as release 2.4.
John Kessenich [Wed, 19 Aug 2015 18:13:44 +0000 (12:13 -0600)]
Create last version before moving to pure enums for built-in functions.
John Kessenich [Wed, 19 Aug 2015 16:46:52 +0000 (10:46 -0600)]
More preparation for pure built-in functions as enums: Add texturing op cracker.
John Kessenich [Wed, 19 Aug 2015 05:17:15 +0000 (23:17 -0600)]
Front-end "pure" built-in TOperator: Finish adding full support, but still turned off.
This is to avoid all need to do text comparison of built-in function names
when consuming the AST. All built-in functions get enumerants.
Will want to turn on soon. See PureOperatorBuiltins. See issue #8.
John Kessenich [Tue, 18 Aug 2015 23:00:37 +0000 (17:00 -0600)]
Add more TOperator: fma/frexp/ldexp, AddCarry/SubBorrow/MulExtended/Bit*/Find*, (un)pack4x8/2x32, ftransform.
Also corrects some existing ones missing the "Op" part of their name.
John Kessenich [Tue, 18 Aug 2015 07:35:08 +0000 (01:35 -0600)]
Turn on the gpu_shader5 of the AEP .tesc test.
John Kessenich [Mon, 17 Aug 2015 16:27:11 +0000 (10:27 -0600)]
Merge pull request #57 from google/glslang-android
Fixes for compiling glslang on Android.
Andrew Woloszyn [Mon, 17 Aug 2015 15:39:38 +0000 (11:39 -0400)]
Fixes for compiling glslang on Android.
Primarily fix is due to Android not supporting std::to_string().
John Kessenich [Mon, 17 Aug 2015 05:40:15 +0000 (23:40 -0600)]
Implement GL_OES_shader_image_atomic.
John Kessenich [Mon, 17 Aug 2015 03:55:59 +0000 (21:55 -0600)]
Implement GL_OES_sample_variables.
John Kessenich [Mon, 17 Aug 2015 03:10:38 +0000 (21:10 -0600)]
Implement GL_OES_texture_storage_multisample_2d_array.
John Kessenich [Mon, 17 Aug 2015 03:04:07 +0000 (21:04 -0600)]
Fix two multi-sample bugs: 1) include MS in name mangling, 2) add 'sample' argument texelFetch(*MS*,...).
John Kessenich [Sun, 16 Aug 2015 20:21:20 +0000 (14:21 -0600)]
Implement GL_OES_texture_cube_map_array.
John Kessenich [Sun, 16 Aug 2015 18:52:19 +0000 (12:52 -0600)]
Implement GL_OES_texture_buffer.
John Kessenich [Sun, 16 Aug 2015 17:38:07 +0000 (11:38 -0600)]
Implement GL_OES_primitive_bounding_box.
John Kessenich [Sun, 16 Aug 2015 17:35:30 +0000 (11:35 -0600)]
Whitespace in preprocessor results; trying to eliminate differences.
John Kessenich [Sun, 16 Aug 2015 17:07:50 +0000 (11:07 -0600)]
Merge pull request #56 from Psybrus/master
Fixed VS2015 build
Neil Richardson [Sat, 15 Aug 2015 15:29:37 +0000 (08:29 -0700)]
Fixed VS2015 build
John Kessenich [Tue, 11 Aug 2015 20:25:20 +0000 (14:25 -0600)]
Merge pull request #54 from mknejp/master
SPIR-V: Return undefined values from implicit returns instead of dummy
John Kessenich [Tue, 11 Aug 2015 20:24:34 +0000 (14:24 -0600)]
Merge pull request #55 from srk-lunarg/v31_type_fixes
Add missing OpTypeSampledImage to prevent unknown type error from SPVā¦
Steve [Tue, 11 Aug 2015 15:20:14 +0000 (09:20 -0600)]
Add missing OpTypeSampledImage to prevent unknown type error from SPVRemapper.
Miro Knejp [Tue, 11 Aug 2015 00:45:24 +0000 (02:45 +0200)]
SPIR-V: Return undefined values from implicit returns instead of dummy
Previously if a non-void function implictly returned, a dummy variable
was created as return value. Now instead it returns the result of the
OpUndef instruction. This better conveys the presence of undefined
behavior to SPIR-V consuming tools (and humans).
It also saves one ID per occurrence...
John Kessenich [Mon, 10 Aug 2015 23:08:55 +0000 (17:08 -0600)]
Array of array: Implement the core functionality: types, constructors, operations.
There will be subsequent commits to refine semantics, esp. version-specific semantics,
as well as I/O functionality and restrictions.
Note: I'm getting white-space differences in the preprocessor test results,
which I'm not checking in. I think they need to be tagged as binary or something.
John Kessenich [Sun, 9 Aug 2015 20:27:34 +0000 (14:27 -0600)]
Array of Array prep: Turn a batch of 0's into nullptr or UnsizedArraySize.
Added some const as well. This will remove camouflage of the next commit,
which will add the bulk of Array of Array semantics and functionality.
(Note the basic grammar and data structure is already in place.)
John Kessenich [Fri, 7 Aug 2015 04:59:24 +0000 (22:59 -0600)]
Add new SPIR-V 31 files.
John Kessenich [Fri, 7 Aug 2015 04:53:06 +0000 (22:53 -0600)]
Move to revision 31 of SPIR-V.
John Kessenich [Fri, 7 Aug 2015 04:19:45 +0000 (22:19 -0600)]
Create last version before going to SPIR-V Revision 31.
John Kessenich [Fri, 7 Aug 2015 04:06:34 +0000 (22:06 -0600)]
Merge pull request #53 from google/get-string-name-or-num
Add getStringNameOrNum() in TSourceLoc.
John Kessenich [Fri, 7 Aug 2015 04:02:24 +0000 (22:02 -0600)]
John Kessenich [Fri, 7 Aug 2015 03:03:57 +0000 (21:03 -0600)]
Merge pull request #52 from baldurk/gcc-warn-fixes
Compile fixes for gcc -Wall
John Kessenich [Fri, 7 Aug 2015 02:43:13 +0000 (20:43 -0600)]
Merge pull request #51 from baldurk/size-t-int-warning-fixes
Remove unsigned/size_t downcast (warning when building on x64)
Lei Zhang [Tue, 21 Jul 2015 19:18:40 +0000 (15:18 -0400)]
Create a new method to return string name or number to DRY code.
baldurk [Wed, 5 Aug 2015 18:54:58 +0000 (20:54 +0200)]
Compile fixes for gcc -Wall
baldurk [Wed, 5 Aug 2015 18:24:26 +0000 (20:24 +0200)]
Remove unsigned/size_t downcast (warning when building on x64)
John Kessenich [Wed, 5 Aug 2015 18:07:48 +0000 (12:07 -0600)]
Merge pull request #50 from google/remove-unused-code
Remove unused members from TPpContext
David Neto [Fri, 24 Jul 2015 12:12:36 +0000 (08:12 -0400)]
Remove unused members from TPpContext.
The ErrMsg and ifloc members were unused or had no effect.
John Kessenich [Wed, 5 Aug 2015 16:29:23 +0000 (10:29 -0600)]
Merge pull request #46 from google/include-directive
#include directive support
Lei Zhang [Wed, 5 Aug 2015 15:56:14 +0000 (11:56 -0400)]
Create a new ppRequireExtensions method for preprocessor.
Now extensions required by preprocessor should be checked via
the ppRequireExtensions method. This is more clear and coherent
with the rest of the code.
John Kessenich [Sun, 2 Aug 2015 22:11:21 +0000 (16:11 -0600)]
Revisioning: Include GLSL.std.450 version. Also, the revision.h script now includes redirection to revision.h.
John Kessenich [Sat, 1 Aug 2015 23:10:02 +0000 (17:10 -0600)]
Version reporting: Restart active use of revision.h, now based on a git tag.
The new make-revision script regenerates glslang/Include/revision.h,
used as it always has been, but made with a git-tag version and the
the number of commits on master.
I have a pre-commit hook that will automatically do this on master,
likely often enough to work in practice, without needing pull requests
to include it.
John Kessenich [Sat, 1 Aug 2015 03:22:43 +0000 (21:22 -0600)]
Merge branch 'master' of https://github.com/KhronosGroup/glslang