aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-21WIP: apply unused variableJeremy Hayes
I happened upon numArgs while hunting for unused variables. I suspect the intent was to apply it as shown in this patch. However, I am not a compiler dude. Someone more appropriate should grok this change.
2016-10-21updateJohannes van Waveren
2016-10-21Merge remote-tracking branch 'upstream/master'Johannes van Waveren
2016-10-21fixed MSVC 2015 compile warningsJohannes van Waveren
2016-10-20Merge pull request #559 from steve-lunarg/samplecmp-fixJohn Kessenich
HLSL: fix defect in EOpMethodSampleCmp* texture decomposition
2016-10-20Merge pull request #558 from steve-lunarg/image-atomicsJohn Kessenich
HLSL: phase 4 of RWTexture support: add image atomics
2016-10-20Merge pull request #555 from steve-lunarg/promotion-fixesJohn Kessenich
HLSL: Fix unary and binary operator type conversion issues
2016-10-20Merge pull request #556 from dneto0/guard-amd-enumsJohn Kessenich
SPV: Add missing guard to code that uses AMD extensions
2016-10-20HLSL: fix defect in EOpMethodSampleCmp* texture decompositionsteve-lunarg
HLSL holds the compare value in a separate intrinsic arg, but the AST wants a vector including the cmp val, except in the 4-dim coord case, where it doesn't fit and is in fact a separate AST parameter. This is awkward but necessary, given AST semantics. In the process, a new vector is constructed for the combined result, but this vector was not being given the correct TType, so was causing some downstream troubles. Now it is. A similar defect existed in OpTextureBias, and has also been fixed.
2016-10-19Move promote methods to TIntermediate classsteve-lunarg
A need arose to use capabilities from TIntermediate during node promotion. These methods have been moved from virtual methods on the TIntermUnary and TIntermBinary nodes to methods on TIntermediate, so it is easy for them construct new nodes and so on. This is done as a separate commit to verify that no test results are changed as a result.
2016-10-19HLSL: phase 4 of rwtexture support: add image atomicssteve-lunarg
This PR will turn Interlocked* intrinsics using rwtexture or rwbuffer object as the first parameter into the proper OpImageAtomic* operations.
2016-10-19Merge remote-tracking branch 'aosp/upstream-master' into update-shadercndk-r14-beta1David Neto
Includes the following: 5d45ead HLSL: Turn on tests for groupshared. b50fd17 HLSL: Support SV_Coverage and SV_DispatchThreadId; catch SV_GroupIndex. 4a34679 Build: Fix unsigned/signed warning. 1fabc0f Merge pull request #548 from baldurk/vs2010-compile-fixes bf8a6ef Merge pull request #551 from steve-lunarg/rwbuffers-fmt c658497 Merge pull request #539 from schwa423/linux_global_lock 1b6daa0 Merge pull request #550 from amdrexu/bugfix 062b239 Merge pull request #549 from steve-lunarg/multidim-array 425af5f Use a recursive mutex. cce8d48 HLSL: phase 3c: add option to use Unknown storage format 8b0227c HLSL: phase 3b: Texture methods remember and return vector size. 4f2da27 HLSL: phase 3a: Add sub-vec4 rwtexture formats (qualifier.layoutFormat) 17ff343 SPV: Add missing extension declarations for certain AMD extensions. f042e40 Merge pull request #542 from steve-lunarg/rwbuffers e4ad1bb Merge pull request #538 from steve-lunarg/iomap-binding-range-err 7b211a3 HLSL: allow multi-dimensional arrays 486d9e4 Update HexFloat tests to use non-enum class enum values 021dbb4 Change negatable_left_shift and negatable_right_shift to inline funcs cabba60 Change {} constructor brackets to () 7cac9e7 Change "using x = y;" to "typedef y x;" statements a227d27 Explicitly implement default constructors 1a65fc2 Add std::isnan and std::isinf wrappers for VS2010 that doesn't have them 033d3ef Change enum class to plain enum 31d5d48 Change constructor to use ()s instead of {}s ff160f1 Add #include <cstdint> for std::uint32_t usage 75c3bf6 Add strtoull wrapper for VS2010, pointing to MS implementation 54a28de Give all complex lambdas an explicit return type b3da8a9 HLSL: phase 2e: introduce lower level addBinaryNode/UnaryNode fns 07830e8 HLSL: phase 2d: minor cleanup, & allow operator[] on non-rw textures 0de16da HLSL: phase 2c: use lValueErrorCheck in HLSL FE 9070796 HLSL: phase 2b: add l-value operator[] for RWTexture/RWBuffer 6b43d27 HLSL: phase 2a: add r-value operator[] for RWTexture/RWBuffer e3aa654 Merge pull request #546 from yavn/OpImageQueryLod-with-SampledImage 7208a97 SPV: Use SampledImage with OpImageQueryLod 87a83d6 Use pthread_mutex for global lock on Linux. 9ae3474 Check for out-of-range bindings during IO mapping. Test: checkbuild.py for Linux, Windows; ran unit tests on Windows Change-Id: I226a48cb970e037e5906150618c1d08ea3a5701b
2016-10-19Add missing guard to code that uses AMD extensionsDavid Neto
Otherwise compilation fails when ENABLED_AMD_EXTENSIONS is off.
2016-10-18HLSL: Fix unary and binary operator type conversion issuessteve-lunarg
This fixes defects as follows: 1. handleLvalue could be called on a non-L-value, and it shouldn't be. 2. HLSL allows unary negation on non-bool values. TUnaryOperator::promote can now promote other types (e.g, int, float) to bool for this op. 3. HLSL allows binary logical operations (&&, ||) on arbitrary types, similar (2). 4. HLSL allows mod operation on arbitrary types, which will be promoted. E.g, int % float -> float % float.
2016-10-16HLSL: Turn on tests for groupshared.John Kessenich
2016-10-16HLSL: Support SV_Coverage and SV_DispatchThreadId; catch SV_GroupIndex.John Kessenich
2016-10-16Build: Fix unsigned/signed warning.John Kessenich
2016-10-15Merge pull request #548 from baldurk/vs2010-compile-fixesJohn Kessenich
VS2010 compile fixes
2016-10-15Merge pull request #551 from steve-lunarg/rwbuffers-fmtJohn Kessenich
HLSL: phase 3 of rwtexture support: add sub-vec4 capabilities
2016-10-15Merge pull request #539 from schwa423/linux_global_lockJohn Kessenich
Use pthread_mutex for global lock on Linux.
2016-10-15Merge pull request #550 from amdrexu/bugfixJohn Kessenich
SPV: Add missing extension declarations for certain AMD extensions.
2016-10-15Merge pull request #549 from steve-lunarg/multidim-arrayJohn Kessenich
HLSL: allow multi-dimensional arrays
2016-10-15Use a recursive mutex.Josh Gargus
2016-10-14HLSL: phase 3c: add option to use Unknown storage formatsteve-lunarg
This uses the Unknown storage format, instead of deducing the format from the texture declaration type.
2016-10-14HLSL: phase 3b: Texture methods remember and return vector size.steve-lunarg
Also makes a (correct) test change for global -> temp vars.
2016-10-14HLSL: phase 3a: Add sub-vec4 rwtexture formats (qualifier.layoutFormat)steve-lunarg
This PR sets the TQualifier layoutFormat according to the HLSL image type. For instance: RWTexture1D <float2> g_tTex1df2; becomes ElfRg32f. Similar on Buffers, e.g, Buffer<float4> mybuffer; The return type for image and buffer loads is now taken from the storage format. Also, the qualifier for the return type is now (properly) a temp, not a global.
2016-10-14SPV: Add missing extension declarations for certain AMD extensions.Rex Xu
2016-10-13Merge pull request #542 from steve-lunarg/rwbuffersJohn Kessenich
HLSL: phase 2: add operator[]
2016-10-13Merge pull request #538 from steve-lunarg/iomap-binding-range-errJohn Kessenich
Check for out-of-range bindings during IO mapping.
2016-10-13HLSL: allow multi-dimensional arrayssteve-lunarg
All the underpinnings are there; this just parses multiple array dimensions and passes them through to the existing mechanisms. Also, minor comment fixes, and add a new test for multi-dim arrays.
2016-10-13Update HexFloat tests to use non-enum class enum valuesbaldurk
2016-10-13Change negatable_left_shift and negatable_right_shift to inline funcsbaldurk
* This avoids an internal compile error on VS2010 possibly related to std::enable_if use.
2016-10-13Change {} constructor brackets to ()baldurk
2016-10-13Change "using x = y;" to "typedef y x;" statementsbaldurk
2016-10-13Explicitly implement default constructorsbaldurk
2016-10-13Add std::isnan and std::isinf wrappers for VS2010 that doesn't have thembaldurk
2016-10-13Change enum class to plain enumbaldurk
2016-10-13Change constructor to use ()s instead of {}sbaldurk
2016-10-13Add #include <cstdint> for std::uint32_t usagebaldurk
2016-10-13Add strtoull wrapper for VS2010, pointing to MS implementationbaldurk
2016-10-13Give all complex lambdas an explicit return typebaldurk
2016-10-12HLSL: phase 2e: introduce lower level addBinaryNode/UnaryNode fnssteve-lunarg
- hlsl.struct.frag variable changed to static, assignment replacd. - Created new low level functions addBinaryNode and addUnaryNode. These are used by higher level functions such as addAssignment, and do not do any argument promotion or conversion of any sort. - Two functions above are now used in RWTexture lvalue conversions. Also, other direction creations of unary or binary nodes now use them, e.g, addIndex. This cleans up some existing code. - removed handling of EOpVectorTimesScalar from promote() - removed comment from ParseHelper.cpp
2016-10-12HLSL: phase 2d: minor cleanup, & allow operator[] on non-rw texturessteve-lunarg
Improve comments. A few tweaked lines allow [] on non-rw tx. Add test case for this. Improve VectorTimesScalar handling.
2016-10-12HLSL: phase 2c: use lValueErrorCheck in HLSL FEsteve-lunarg
This commit splits lValueErrorCheck into machine dependent and independent parts. The GLSL form in TParseContext inherits from and invokes the machine dependent part in TParseContextBase. The base form checks language independent things. This split does not change the set of errors tested for: the test results are identical. The new base class interface is now used from the HLSL FE to test lvalues. There was one test diff due to this, where the test was writing to a uniform. It still does the same indirections, but does not attempt a uniform write.
2016-10-12HLSL: phase 2b: add l-value operator[] for RWTexture/RWBuffersteve-lunarg
This commit adds l-value support for RW texture and buffer objects. Supported are: - pre and post inc/decrement - function out parameters - op-assignments, such as *=, +-, etc. - result values from op-assignments. e.g, val=(MyRwTex[loc] *= 2); Not supported are: - Function inout parameters - multiple post-inc/decrement operators. E.g, MyRWTex[loc]++++;
2016-10-12HLSL: phase 2a: add r-value operator[] for RWTexture/RWBuffersteve-lunarg
This commit adds r-value support for RW textures and buffers. Supported is: - Function in parameter conversions - conversion of rvalue use to imageLoad
2016-10-12Merge remote-tracking branch 'aosp/upstream-master' into refresh-shadercDavid Neto
Includes the following: 631f223 Merge pull request #543 from slime73/compilerwarnings f887785 fixup! Address some compiler warnings. 6d6b19d Merge pull request #544 from amdrexu/feature f3b2747 SPV: Implement extension SPV_KHR_shader_draw_parameters. dd2fc1f Merge pull request #545 from amdrexu/bugfix 4c25709 Parser: Some function prototypes of interpolateAtXXX are incorrect. 49ad2b7 Address some compiler warnings. 19bdf90 SPV: Distinguish between SPV and non-SPV rules for member overlap. 087a454 HLSL: Add shape conversions for return values. ed33e05 HLSL: Do structure conversion for return type struct-punning on non-entry-point functions. 7a7217c Merge pull request #540 from steve-lunarg/rwbuffers bb0183f HLSL: phase 1: add RWTexture and RWBuffer 9065ed8 Merge pull request #537 from dneto0/pass-cwd-to-gtest c056adc Allow for larger binding numbers. 65K instead of 255. 1d3a966 Gtests can be run on another source tree 196b6e2 Merge pull request #536 from steve-lunarg/flatten-assign-fix 2199c24 HLSL: fix for flattening assignments from non-symbol R-values. ce5d4af Merge pull request #533 from steve-lunarg/reflection 8ffc36a add reflection queries to return a TType. Fix minor issue with interface names. de97fe0 Non-functional: Rationalizing parse helper hierarchy, step 3 (effected editable symbols and IO resize). a2a5dd4 Non-functional: Rationalizing parse helper hierarchy, step 2 (effected error messaging and cascading errors). 273060c Non-functional: Rationalizing parse helper hierarchy, step 1 (effected memory of HLSL keyword map). a08c929 HLSL: Line numbers only: Set locations (line numbers) on synthesized flattening code. d8fe2ca HLSL: Handle flattened I/O structs passed to function *out* parameters. c86d38b Non-functional: Better use of .isParamOutput() and some other methods. ba56e23 Fix typo in error message. f571d0c Non-functional: Use isOpaque() instead of compare against EbtSampler. 47e6fa1 Merge pull request #532 from steve-lunarg/automap-offsets 088c59d Change binding auto-map to use provided offsets. d4f48b8 Merge pull request #527 from steve-lunarg/array-flattening-fix 074ced3 Merge pull request #521 from yavn/frag-shader-primitive-id-capability a6f3b41 Merge pull request #531 from steve-lunarg/add-autobinding-test e4fe8b5 Add a test for buffer auto-binding assignment. 3e47f5f Merge pull request #523 from amdrexu/feature2 c9e3c3c Parser: Implement extension GL_AMD_gpu_shader_half_float. df98cc2 Add amend ability for anonymous blocks, so they can grow between function bodies. 16738a3 Merge pull request #530 from annygakh/master 0b3b6e1 Updated README.md bc9b765 Restrict uniform array flattening to sampler and texture arrays. 21e7e32 HLSL: Fix merge conflict. 4e55988 HLSL Tests: Tests for previous commit, to make it easier to see what's changing. 6dbc0a7 Support a uniform block to hold global uniform variables. e82061d HLSL: Rationalize combination of type arrayness and name arrayness. b1672fa Merge pull request #525 from steve-lunarg/implicit-size 265c061 HLSL: allow implicit array sizing. 16a99a3 Merge pull request #524 from DominikWitczakAMD/517_include_amd_extensions_by_default 04b3e87 SPV: PrimitiveId in frag shader will emit Geometry capability daff1a2 #517: Enable AMD extensions by default 5fc501f Merge pull request #520 from amdrexu/bugfix f38978e Merge pull request #522 from steve-lunarg/glsl-binding-test ad0752e GLSL: Add binding map tests b707205 SPV: OpGroupBroadcast is unable to handle vector operand. 10f7fc7 HLSL: Reverse what the driver is told about row/column majorness, matching the row-column reversal. 88712f1 Merge pull request #519 from amdrexu/bugfix 36876e6 SPV: Still have to specify SPIR-V extension for gl_SubGroupSizeARB and gl_SubGroupInvocationARB. e53274d Merge pull request #518 from steve-lunarg/flatten-fix cf43e66 Fix defects in uniform array flattening 02df206 Merge pull request #516 from amdrexu/feature3 4455258 HLSL: Merge pull request #515 from steve-lunarg/flatten-uniform-array e0b9deb Flatten uniform arrays 5159664 SPV: Implement the extension SPV_KHR_shader_ballot 6714bcc HLSL: Fix result type of passing a flattened-aggregate to a function. 6873f3d Merge pull request #514 from steve-lunarg/binding-map-3 7f7c2ed HLSL: Add location offsets per resource type a1e2d49 HLSL: Move to correct parsing of annotations, improving all annotations and recent string grammar. Test: checkbuild.py Linux, Windows; manually ran unit test on Windows Change-Id: I7e5de3c62b908700eb127e2003cff5ccba66f789
2016-10-12Merge pull request #546 from yavn/OpImageQueryLod-with-SampledImageJohn Kessenich
SPV: Use SampledImage with OpImageQueryLod
2016-10-12SPV: Use SampledImage with OpImageQueryLodMaciej Jesionowski
Khronos SPIR-V issue #74
2016-10-11Merge pull request #543 from slime73/compilerwarningsJohn Kessenich
Address some compiler warnings.