Kai Ninomiya [Thu, 6 Feb 2020 21:36:52 +0000 (13:36 -0800)]
Split "is emscripten" config from "enable glslang.js"
This should enable glslang to be used as a dependency of other projects
that target WebAssembly, instead of assuming "EMSCRIPTEN" => "Want
glslang.js".
John Kessenich [Wed, 5 Feb 2020 09:02:51 +0000 (02:02 -0700)]
Merge pull request #2077 from kainino0x/configurable-target-pr
glslang.js: Make the SPIR-V target version configurable (1.0 ~ 1.5) and default to 1.0
Kai Ninomiya [Fri, 24 Jan 2020 06:22:34 +0000 (22:22 -0800)]
glslang.js: Make the SPIR-V target version configurable (1.0 ~ 1.5)
John Kessenich [Tue, 4 Feb 2020 08:24:39 +0000 (01:24 -0700)]
Merge pull request #2073 from tsuoranta/fix-memory-corruption
Fix memory corruption in TGlslIoMapper
Timo Suoranta [Sun, 2 Feb 2020 09:31:49 +0000 (11:31 +0200)]
Fix memory corruption in TGlslIoMapper
John Kessenich [Thu, 30 Jan 2020 07:58:38 +0000 (00:58 -0700)]
Merge pull request #2071 from jeffbolznv/version_less
Use NOT ... VERSION_LESS instead of VERSION_GREATER_EQUAL
Jeff Bolz [Thu, 30 Jan 2020 03:39:13 +0000 (21:39 -0600)]
Use NOT ... VERSION_LESS instead of VERSION_GREATER_EQUAL
John Kessenich [Wed, 29 Jan 2020 05:25:17 +0000 (22:25 -0700)]
Merge pull request #2068 from jljusten/standalone-fix-long-help
standalone: Fix --help
Jordan Justen [Tue, 28 Jan 2020 20:18:12 +0000 (12:18 -0800)]
standalone: Fix --help
Fixes:
bd97b6f9 ("Command-line: Give better error messages. From #1829.")
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
John Kessenich [Mon, 27 Jan 2020 19:35:25 +0000 (12:35 -0700)]
Merge pull request #2065 from zoddicus/fixChromiumDawnRolls
Use correct enum type in case statement
Ryan Harrison [Mon, 27 Jan 2020 19:31:45 +0000 (14:31 -0500)]
Use correct enum type in case statement
Two similarly named enums led to the wrong one being used here, this
is getting caught in the Chromium and Dawn DEPS rolls.
John Kessenich [Mon, 27 Jan 2020 17:16:25 +0000 (10:16 -0700)]
Build: Fix more build warnings caused by PR #2038.
Revisit fix for #2062 for consistency with this commit.
John Kessenich [Mon, 27 Jan 2020 08:02:08 +0000 (01:02 -0700)]
Merge pull request #1940 from tsuoranta/fix-gcc9
Fix for GCC 9 / Werror=deprecated-copy
John Kessenich [Mon, 27 Jan 2020 05:38:13 +0000 (22:38 -0700)]
Merge pull request #2035 from ShchchowAMD/builtin_max_limits
Add Tess machine dependent built-in variables initialization for GLES…
John Kessenich [Mon, 27 Jan 2020 04:37:38 +0000 (21:37 -0700)]
Build warning: Fix #2062, missing enum value in a switch.
John Kessenich [Fri, 24 Jan 2020 11:10:09 +0000 (04:10 -0700)]
Merge pull request #2038 from corporateshark/c_interface
Implemented C-language interface for glslang
John Kessenich [Fri, 17 Jan 2020 07:11:12 +0000 (00:11 -0700)]
HLSL: Fix #1974: ignore input primitives on non-entry-point functions.
John Kessenich [Thu, 16 Jan 2020 07:52:28 +0000 (00:52 -0700)]
Fix #2059, and also attempt to skip test bots [skip ci]
John Kessenich [Thu, 16 Jan 2020 07:23:03 +0000 (00:23 -0700)]
Merge pull request #2033 from ShchchowAMD/binding_contradictory
Add Error check flag in io mapper
Chow [Tue, 24 Dec 2019 03:49:02 +0000 (11:49 +0800)]
Add Error check flag in io mapper
GLSL could detect contradictory uniform binding, but missing error reporting, even if we could now observe error inside infosink.
Add error check when first time validate uniform binding. When doing traversal, it should be zero error.
This error check flag will be used during linking time. To quickly report errors like contradictory uniform bindings.
Add error check flags for TDefaultGlslIoResolver when catching EPrefixInternalError
John Kessenich [Wed, 15 Jan 2020 17:48:58 +0000 (10:48 -0700)]
Merge pull request #2058 from KhronosGroup/vulkan-1.2
SPV/Vulkan: Add support for Vulkan 1.2, which defaults to SPIR-V 1.5.
John Kessenich [Wed, 15 Jan 2020 16:35:48 +0000 (09:35 -0700)]
Update to latest SPIRV-Tools, supporting Vulkan 1.2.
John Kessenich [Wed, 15 Jan 2020 07:10:41 +0000 (00:10 -0700)]
SPV/Vulkan: Add support for Vulkan 1.2, which defaults to SPIR-V 1.5.
John Kessenich [Fri, 10 Jan 2020 17:19:24 +0000 (10:19 -0700)]
Merge pull request #2046 from Roy-AMD/Fix-multiple-AST-spv-generate-crash-issue
Fix glslang can't link multiple AST in a single stage
John Kessenich [Wed, 8 Jan 2020 13:18:44 +0000 (06:18 -0700)]
Merge pull request #1998 from ShchchowAMD/ARB_gpu_shader_fp64
Add support for ARB_gpu_shader_fp64
Sergey Kosarevsky [Wed, 8 Jan 2020 11:26:44 +0000 (14:26 +0300)]
Public: replaced tabs with spaces
Sergey Kosarevsky [Wed, 8 Jan 2020 11:25:56 +0000 (14:25 +0300)]
CInterface: replaced tabs with spaces
John Kessenich [Wed, 8 Jan 2020 09:21:34 +0000 (02:21 -0700)]
Merge pull request #2052 from KhronosGroup/fix-processed-def-undef-1829
Fix #1829: Allow "--" options for def/undef, for OpModuleProcessed.
John Kessenich [Tue, 7 Jan 2020 14:03:11 +0000 (07:03 -0700)]
Fix #1829: Add "--" command-line options for macro def/undef.
This allows OpModuleProcessed logging to be consistent with everything taking
"--" options.
Chow [Wed, 8 Jan 2020 06:07:50 +0000 (14:07 +0800)]
Move symbol builtin check to grammar stage
FYI, move builtin check to type symbol check.
Avoid modifying interface doubleCheck().
John Kessenich [Tue, 7 Jan 2020 08:32:53 +0000 (01:32 -0700)]
Merge pull request #2048 from Roy-AMD/Add-missing-extension-defination
Add missing extension defination
Roy [Mon, 6 Jan 2020 07:02:14 +0000 (15:02 +0800)]
Add missing extension defination
This micro should been defined 1, if opengl 2.0 is required.
John Kessenich [Tue, 7 Jan 2020 06:49:23 +0000 (23:49 -0700)]
Merge pull request #2032 from ShchchowAMD/atomic-uint-binding
Modify max binding checks for atomic_uint
John Kessenich [Mon, 6 Jan 2020 16:21:33 +0000 (09:21 -0700)]
Merge pull request #2050 from ShchchowAMD/built_in_MaxVector
Add builtin constants gl_MaxFragmentUniformVectors and gl_MaxVertexUniformVectors.
John Kessenich [Mon, 6 Jan 2020 14:50:40 +0000 (07:50 -0700)]
Bump revision
Chow [Mon, 6 Jan 2020 07:53:20 +0000 (15:53 +0800)]
Add builtin constants
Add builtin constants:
gl_MaxFragmentUniformVectors and gl_MaxVertexUniformVectors.
They should both be available since version 410 for core.
Chow [Tue, 26 Nov 2019 09:27:33 +0000 (17:27 +0800)]
Add support for ARB_gpu_shader_fp64
GLSL Version : >= 150
Purpose:
Allow users to use features by enabling this extension, even in low versions.
Extension Name:
ARB_gpu_shader_fp64
Builtin-variables:
Nah
Builtin-functions:
functions overloaded for this extension, please check registry in reference.
Keywords:
Double
Features:
add support for type "double"
Reference:
https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_gpu_shader_fp64.txt
Add support for implicit conversion
1. Remove builtin double vertex (this is introduced by vertex_attrib_64bit
2. Add extension check and implicit conversion as double has been introduced
3. Add test results.
Roy [Fri, 3 Jan 2020 08:21:34 +0000 (16:21 +0800)]
Fix glslang can't link multiple AST in a single stage
Root cause:
GlslangToSpv use symbol structure's ptr as a map key, but multiple shader object can build a new AST.
In the AST the the same symbol has different ptr point to their structure, so indext map faild.
solution:
Add a new map glslangTypeToIdMap to map ptr to symbol id, and use symbol id to index memberRemapper.
Sergey Kosarevsky [Mon, 30 Dec 2019 08:13:06 +0000 (11:13 +0300)]
CInterface: added static asserts to compare C/C++ enums
Sergey Kosarevsky [Mon, 30 Dec 2019 08:11:55 +0000 (11:11 +0300)]
Added LAST_ELEMENT_MARKER for every enum used in the C interface
John Kessenich [Mon, 30 Dec 2019 04:33:41 +0000 (21:33 -0700)]
Merge pull request #1997 from ShchchowAMD/ARB_uniform_buffer_object
Add support for ARB_uniform_buffer_object
John Kessenich [Mon, 30 Dec 2019 04:32:41 +0000 (21:32 -0700)]
Merge branch 'master' into ARB_uniform_buffer_object
John Kessenich [Mon, 30 Dec 2019 03:19:39 +0000 (20:19 -0700)]
Merge pull request #1996 from ShchchowAMD/ARB_texture_multisample
Add support for ARB_texture_multisample
John Kessenich [Mon, 30 Dec 2019 02:49:16 +0000 (19:49 -0700)]
Merge pull request #2036 from ShchchowAMD/fix_atomic_uint_offset_check
atomic counter offset should align to 4 (compute shader)
John Kessenich [Mon, 30 Dec 2019 02:35:18 +0000 (19:35 -0700)]
Merge pull request #1995 from ShchchowAMD/ARB_sample_shading_support
Add support for ARB_sample_shading
Sergey Kosarevsky [Thu, 26 Dec 2019 18:17:37 +0000 (21:17 +0300)]
CInterface: replaced SH_ prefix with GLSLANG_
John Kessenich [Thu, 26 Dec 2019 17:56:54 +0000 (10:56 -0700)]
HLSL: Fix #2037: Integer dot used incorrect input for adds.
Chow [Wed, 25 Dec 2019 09:27:45 +0000 (17:27 +0800)]
atomic counter offset should align to 4
atomic counter offset should align to 4
Ref:
glspec46.core - 6.8 BufferObjectState
offset restriction multiple of 4
Chow [Wed, 25 Dec 2019 09:08:48 +0000 (17:08 +0800)]
Modify atomic_uint binding check
Modify atomic_uint binding check.
Currently, when not declared with offset, default atomic_unint won't check whether its binding is valid or not more than its limit value.
Sergey Kosarevsky [Tue, 24 Dec 2019 22:01:06 +0000 (01:01 +0300)]
CInterface: added glslang_program_SPIRV_get_ptr()
Sergey Kosarevsky [Tue, 24 Dec 2019 21:06:00 +0000 (00:06 +0300)]
CInterface: added files to CMakeLists.txt
Sergey Kosarevsky [Tue, 24 Dec 2019 21:05:41 +0000 (00:05 +0300)]
CInterface: added _BIT suffix to glslang_messages_t and glslang_reflection_options_t, fixed const-correctness
Sergey Kosarevsky [Tue, 24 Dec 2019 21:00:23 +0000 (00:00 +0300)]
CInterface: reformatted according to .clang-format rules
Sergey Kosarevsky [Tue, 24 Dec 2019 20:53:05 +0000 (23:53 +0300)]
Added original glslang_c_interface implementation by Viktor Latypov
Chow [Tue, 24 Dec 2019 05:56:15 +0000 (13:56 +0800)]
Add Tess machine dependent built-in variables initialization for GLES 3.2
Add Tess machine dependent built-in variables initialization for GLES 3.2
Chow [Tue, 26 Nov 2019 09:02:46 +0000 (17:02 +0800)]
Add support for ARB_uniform_buffer_object
GLSL Version : >= 120
Purpose:
Allow users to use features by enabling this extension, even in low versions.
Extension Name:
ARB_uniform_buffer_object
Builtin-variables:
Uniform
Builtin-functions:
Nah
Keywords:
Nah
Features:
uniform block
Reference:
https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_uniform_buffer_object.txt
Chow [Tue, 26 Nov 2019 08:28:52 +0000 (16:28 +0800)]
Add support for ARB_texture_multisample
GLSL Version : >= 140
Purpose:
Allow users to use features by enabling this extension, even in low versions.
Extension Name:
ARB_texture_multisample
Builtin-variables:
Nah
Builtin-functions:
Nah
Keywords:
sampler2DMS, isampler2DMS, usampler2DMS,
sampler2DMSArray, isampler2DMSArray, usampler2DMSArray
Reference:
https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_texture_multisample.txt
Chow [Tue, 26 Nov 2019 08:18:52 +0000 (16:18 +0800)]
Add support for ARB_sample_shading
Version : >= 130
Extension Name: ARB_sample_shading
Builtin-variables:
"gl_SampleID"
"gl_SamplePosition"
"gl_SampleMask"
"gl_NumSamples"
Reference:
https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_sample_shading.txt
John Kessenich [Fri, 20 Dec 2019 17:33:13 +0000 (10:33 -0700)]
Command-line: Give better error messages. From #1829.
John Kessenich [Fri, 13 Dec 2019 05:28:57 +0000 (22:28 -0700)]
Merge pull request #2023 from greg-lunarg/kg109
Update spriv-tools known good
Greg Fischer [Thu, 12 Dec 2019 18:15:42 +0000 (11:15 -0700)]
Update spriv-tools known good
John Kessenich [Tue, 10 Dec 2019 07:36:41 +0000 (00:36 -0700)]
Merge pull request #2021 from KhronosGroup/fix-2020-inconsistent-HLSL
Fix #2020: PR #1977 broke HLSL member consistency, this fixes it.
John Kessenich [Tue, 10 Dec 2019 06:48:50 +0000 (23:48 -0700)]
Fix #2020: PR #1977 broke HLSL member consistency, this finishes it...
using an unitialized member. This commit consistently does not use those
HLSL members unless ENABLE_HLSL is on.
John Kessenich [Mon, 9 Dec 2019 17:18:17 +0000 (10:18 -0700)]
Merge pull request #2019 from KhronosGroup/fix-2014-dont-and-versions-extensions
Fix: #2014: Don't do "extension-on && version >= ..." keyword checks.
John Kessenich [Mon, 9 Dec 2019 15:10:38 +0000 (08:10 -0700)]
Merge pull request #2018 from KhronosGroup/fix-2007-rationalize-include-paths
Fix #2007: Fix a couple relative header paths in header files.
John Kessenich [Mon, 9 Dec 2019 11:34:09 +0000 (04:34 -0700)]
Fix: #2014: Don't do "extension-on && version >= ..." keyword checks.
Keywords should only have tests like "extension-on || version >= ...", or
"extension-off && version <= ...".
John Kessenich [Mon, 9 Dec 2019 10:12:10 +0000 (03:12 -0700)]
Fix #2007: Fix a couple relative header paths in header files.
John Kessenich [Mon, 9 Dec 2019 08:23:37 +0000 (01:23 -0700)]
Fix #1993: Fully exclude ftransform() from SPIR-V semantics.
John Kessenich [Thu, 5 Dec 2019 02:24:16 +0000 (19:24 -0700)]
Merge pull request #2010 from rnk/pool-alloc-clang
Remove glslang::pool_allocator::setAllocator
Reid Kleckner [Wed, 4 Dec 2019 22:09:03 +0000 (14:09 -0800)]
Remove glslang::pool_allocator::setAllocator
TPoolAllocator is not copy assignable, so this setter could never have
been used. After a recent change (
878a24ee2), new versions of Clang
reject this code outright.
John Kessenich [Wed, 4 Dec 2019 03:07:08 +0000 (20:07 -0700)]
Merge pull request #1990 from ianromanick/INTEL_shader_integer_functions2
Implement INTEL_shader_integer_functions2
Ian Romanick [Mon, 21 Jan 2019 16:57:25 +0000 (08:57 -0800)]
INTEL_shader_integer_functions2: Add SPIR-V generation
v2: Move addCapability and addExtension extension calls from
TGlslangToSpvTraverser::createBinaryOperation to
TGlslangToSpvTraverser::visitAggregate. Suggested by JohnK.
Ian Romanick [Thu, 20 Sep 2018 08:22:19 +0000 (01:22 -0700)]
INTEL_shader_integer_functions2: Add compiler front-end support
The changes to glslang/glslang/MachineIndependent/ParseHelper.cpp exist
purely to prevent even more instances of "warning: enumeration value
‘EOp...’ not handled in switch"
v2: Remove 8-bit types. Overzealous copy-and-paste led to adding
support for a bunch of types that the extension doesn't actually enable.
v3: Update expected test results file. Just changing an expected
results file to make a test pass seems sketchy to me, but I'm not sure
what else to do.
v4: Add missing entry for EOpAbsDifference in
TOutputTraverser::visitBinary. Noticed by JohnK.
Ian Romanick [Thu, 20 Sep 2018 07:58:03 +0000 (00:58 -0700)]
INTEL_shader_integer_functions2: Add basic extension tracking
John Kessenich [Tue, 3 Dec 2019 05:58:21 +0000 (22:58 -0700)]
Merge pull request #2004 from ianromanick/document-other-test-requirements
Update README.md to include other test requirements
Ian Romanick [Mon, 2 Dec 2019 18:53:46 +0000 (10:53 -0800)]
Update README.md to include other test requirements
Knowing this in advance would have saved me some time.
John Kessenich [Sun, 1 Dec 2019 02:35:13 +0000 (19:35 -0700)]
Merge pull request #2001 from mbechard/master
Fix #1981
Malcolm Bechard [Thu, 28 Nov 2019 04:37:16 +0000 (23:37 -0500)]
Fix #1981
Copy over incoming units localSize if it's set, and this->localSize is not set
Also fix overwritting localSizeSpecId if it's already been set.
John Kessenich [Sat, 23 Nov 2019 08:29:02 +0000 (01:29 -0700)]
Fix #1983: __ is okay starting with ES 300, rather than 310.
John Kessenich [Sat, 23 Nov 2019 04:38:36 +0000 (21:38 -0700)]
Merge pull request #1972 from andflo-Arm/master
Fix construction issue for 8 and 16 bit types.
John Kessenich [Fri, 22 Nov 2019 18:07:43 +0000 (11:07 -0700)]
Fix #1987: Use large enough built-in buffer to hold vec4 of maxint-64.
John Kessenich [Fri, 22 Nov 2019 13:24:38 +0000 (06:24 -0700)]
Merge branch 'dj2-install'
John Kessenich [Fri, 22 Nov 2019 08:38:38 +0000 (01:38 -0700)]
Merge pull request #1980 from mattst88/respect-CMAKE_INSTALL_LIBDIR
Respect CMAKE_INSTALL_LIBDIR in installed CMake files
Dan Sinclair [Thu, 21 Nov 2019 15:33:32 +0000 (10:33 -0500)]
Check for ENABLE_SPVREMAPPER flag in CMakeList files.
There is a flag to disable the SPVRemapper during the GLSLang build.
That flag is check in some, but not all spots so if you try to build
with SPVRemapper disabled you get CMake errors and compile errors.
This CL fixs up the build so building with -DENABLE_SPVREMAPPER=0 will
complete correclty.
Arfrever Frehtes Taifersar Arahesis [Mon, 18 Nov 2019 19:11:55 +0000 (11:11 -0800)]
Respect CMAKE_INSTALL_LIBDIR in installed CMake files
Fixes #1965
John Kessenich [Fri, 15 Nov 2019 14:22:44 +0000 (07:22 -0700)]
Merge pull request #1977 from KhronosGroup/no-hlsl-structs
HLSL: Fix #1976: Don't let ENABLE_HLSL change struct/class layout.
John Kessenich [Thu, 14 Nov 2019 10:20:06 +0000 (03:20 -0700)]
HLSL: Fix #1976: Don't let ENABLE_HLSL change struct/class layout.
Andreas Flöjt [Thu, 14 Nov 2019 13:41:52 +0000 (14:41 +0100)]
Add a test for 8- and 16-bit construction.
John Kessenich [Tue, 12 Nov 2019 13:00:51 +0000 (06:00 -0700)]
Merge pull request #1973 from KhronosGroup/fix-fmod-int
HLSL: Fix #1960: fmod() was not converting int args to float.
John Kessenich [Tue, 12 Nov 2019 12:32:51 +0000 (05:32 -0700)]
HLSL: Fix #1960: fmod() was not converting int args to float.
Andreas Flöjt [Mon, 11 Nov 2019 10:30:22 +0000 (11:30 +0100)]
Fix construction issue for 8 and 16 bit types.
The problem is that constructing a float16_t, int8_t, uint8_t, int16_t,
or uint16_t with a non 32-bit argument generates an aggregate with the
wrong construction op. For int8_t and uint8_t, this resulted in a crash.
John Kessenich [Fri, 8 Nov 2019 03:31:16 +0000 (20:31 -0700)]
Merge pull request #1968 from dneto0/reclaim-web-codespace
SPIR-V postprocessing: WEB case only needs CFG mods
John Kessenich [Fri, 8 Nov 2019 03:29:18 +0000 (20:29 -0700)]
Merge pull request #1967 from kainino0x/fix-dot-free
Fix compileGLSLZeroCopy accidental minification
David Neto [Thu, 7 Nov 2019 22:55:22 +0000 (17:55 -0500)]
SPIR-V postprocessing: WEB case only needs CFG mods
The SPIR-V post-processing to discover capabilities and
extensions does not apply to WebGPU compilation. So don't include
that code.
This reclaims some of the code space added by #1943
Kai Ninomiya [Thu, 7 Nov 2019 02:06:00 +0000 (18:06 -0800)]
Fix compileGLSLZeroCopy accidental minification
John Kessenich [Wed, 6 Nov 2019 15:56:22 +0000 (08:56 -0700)]
Merge pull request #1963 from KhronosGroup/revert-7b0e236
Fix #1959 by reverting 7b0e236 to put files in two places.
John Kessenich [Wed, 6 Nov 2019 15:55:59 +0000 (08:55 -0700)]
Merge pull request #1966 from dj2/readme
Add deprecation for SPIRV/ install folder location.
dan sinclair [Wed, 6 Nov 2019 14:50:40 +0000 (09:50 -0500)]
Add deprecation for SPIRV/ install folder location.
This Cl updates the README.md to reference the deprecation date for the
current SPIRV/ install location.
Issue #1964
John Kessenich [Wed, 6 Nov 2019 01:05:42 +0000 (18:05 -0700)]
Fix #1959 by reverting 7b0e236 to put files in two places.
John Kessenich [Tue, 5 Nov 2019 08:05:10 +0000 (01:05 -0700)]
Merge pull request #1961 from zoddicus/fixChromiumRoll
Remove std::move that is breaking chromium roll