aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-30Snap for 7956253 from 153d3c46363b5b47423e15aab803c8e9139c3d42 to ↵ndk-r24-rc1ndk-r24-beta2ndk-r24ndk-r24-releaseAndroid Build Coastguard Worker
ndk-r24-release Change-Id: Ifd9d3a9c79131deca827d2186d3502dedb51793b
2021-11-30Snap for 7952770 from 20e9adfc02fe14a057fd270fe2f06d36ad0e6e37 to ↵Android Build Coastguard Worker
ndk-r24-release am: a35182d2cc Original change: https://android-review.googlesource.com/c/platform/external/shaderc/glslang/+/1905591 Change-Id: I88af0562cb2043f60368bf0ce162496e318cce04
2021-11-29Snap for 7952770 from 20e9adfc02fe14a057fd270fe2f06d36ad0e6e37 to ↵Android Build Coastguard Worker
ndk-r24-release Change-Id: Ie3b19b632467ed3fce2280856217298108a80909
2021-11-11Merge remote-tracking branch 'aosp/upstream-master' into update-shadercndk-r25-beta3ndk-r25-beta2ndk-r25-beta1David Neto
Including: 600c5037 Merge pull request #2810 from greg-lunarg/push1 ac1880cc Merge pull request #2809 from KhronosGroup/revert-2803-isinf_isnan 002b3f55 Generate error for binding on push_constant 22a5e364 Revert "Use intermOut.cpp's IsNan and IsInfinity for parse-time constant folding" 9c5309a2 Merge pull request #2805 from greg-lunarg/push0 9600b97c Fix test spv.1.4.OpEntryPoint.frag bb5b3575 Merge pull request #2781 from kevin-mccullough/FixLinkTimeValidationForGl_PerVertex 627f409a Merge pull request #2801 from haasn/thread_safety fa264623 Merge pull request #2803 from mhillenbrand/isinf_isnan d1ee644e Use intermOut.cpp's IsNan and IsInfinity for parse-time constant folding 8f56d738 Merge pull request #2799 from cyanreg/master 9535746a Merge pull request #2798 from alan-baker/update-tools 13fd2d64 Fix incorrect link time validation for unused gl_PerVertex members ae2e2707 Merge pull request #2722 from ZhiqianXia/GL_ARB_draw_instanced 4302d518 Don't release global mutex before initialize/finalize is done 39714242 Initialize global mutex in a thread-safe manner 5ec47530 Add support for targeting Vulkan 1.2 in the C API 46d3a30b Support the #extension GL_ARB_draw_instanced. 80928702 Update test expectations 855f4961 Update SPIRV-Tools and SPIRV-Headers eb92526d Merge pull request #2719 from ZhiqianXia/GL_EXT_shader_integer_mix e7611698 Add the GL_EXT_shader_integer_mix Preamble for glsl. 77d680e1 Merge pull request #2712 from ZhiqianXia/switch_error 1de2d174 To be compatible with Feature: 'last case/default label not followed by statements'. d1608ab1 Merge pull request #2796 from greg-lunarg/i2793 432a43cc Remove support for double trig, pow, exp and log 44b57597 Merge pull request #2792 from jeremy-lunarg/hayes-2760 c9cc4845 Return new allocator for copied containers 3afa3503 Merge pull request #2780 from kevin-mccullough/FixCrossStageCheck 38fd9221 Merge pull request #2777 from amdrexu/bugfix 9290474d Merge pull request #2787 from greg-lunarg/i2779 8020da3f Merge pull request #2788 from alelenv/iomapper_sr_fix a450fe75 Merge pull request #2789 from greg-lunarg/i2785 82b2668d Allow 8/16-bit integer as array index 6639be7c Accept gl_ViewportMask in version 430 and later c571cd8f Skip auto decorating shader record buffer blocks with 'set' and 'binding'. 6351fcef Merge pull request #2786 from dneto0/current-source-dir 36333d1f Fix Cmake rule for extension header generation 2598bc7a Merge pull request #2783 from chrisforbes/untangle 7f1d926a Merge pull request #2749 from AaronHaganAMD/master 035a3bbc GL_EXT_spirv_intrinsics - Port extensions 07aec25f Make modifications of GL_EXT_spirv_intrinsics dd097e5a Untangle use of core glslang version enums in SpvPostProcess d3567231 Fix cross-stage check to allow subsequent stage to use previous stage's binding b9ba4c57 Merge pull request #2770 from ncesario-lunarg/ncesario-cmake-endif c8cdbac7 Merge pull request #2771 from mbechard/master c8ef4f8a cmake: Remove "conditions" from endif 7b57c6e3 rename member variable for clarity 581897f4 Merge pull request #2768 from greg-lunarg/i2744 994987bc Fix variable scoping of do-while fb0e4983 Merge pull request #2767 from greg-lunarg/i2763 3d03b782 Scalarize vector readFirstInvocationARB (#2766) 4ea41b65 Fix unreachable code in getSampledType() 3f04389a Auto push constant blocks (#2764) c2604615 Merge pull request #2685 from kevin-mccullough/FixIsIoResizeArrayTesselationStageHandling 6baa85f6 Merge pull request #2762 from greg-lunarg/2757 8b87b840 Fix SPIR-V for SampleBias 0f886fe7 Merge pull request #2759 from mbechard/vkRelaxed-RetargetID cce85320 Merge pull request #2756 from mbechard/vkRelaxed-AvoidDuplicateUniform 05794b46 GL_EXT_vulkan_glsl_relaxed - retarget gl_VertexID to gl_VertexIndex d3bff63c avoid growing the global uniform block with duplicates 80dcc369 Merge pull request #2745 from jeremy-lunarg/hayes-fix-warnings 14943d4e Merge pull request #2752 from InsertAReallyCreativeNameHere/master 07c5392f Merge pull request #2755 from greg-lunarg/2748 62ed1451 Run update_precision() on array and matrix constructors. 12e27e17 Change MINGW_HAS_SECURE_API checks. e0771b5d Merge pull request #2747 from greg-lunarg/i2740 8ef6a4cb Perform update_precision on constructors and converts 012436d6 Fix GCC warnings 5597c8d7 Fix isIoResizeArray() tessellation stage handling Testing: checkbuild.py on Linux Change-Id: Ie7c00a6d9fe54f1654142d9a9fa107db0c00dd71
2021-11-11Merge pull request #2810 from greg-lunarg/push1Greg Fischer
Generate error for binding on push_constant
2021-11-10Merge pull request #2809 from KhronosGroup/revert-2803-isinf_isnanGreg Fischer
Revert "Use intermOut.cpp's IsNan and IsInfinity for parse-time constant folding"
2021-11-10Generate error for binding on push_constantGreg Fischer
2021-11-10Revert "Use intermOut.cpp's IsNan and IsInfinity for parse-time constant ↵Greg Fischer
folding"
2021-11-10Merge pull request #2805 from greg-lunarg/push0Greg Fischer
Fix test spv.1.4.OpEntryPoint.frag
2021-11-09Fix test spv.1.4.OpEntryPoint.fragGreg Fischer
Cannot apply binding qualifier to push_constant
2021-11-09Merge pull request #2781 from ↵Greg Fischer
kevin-mccullough/FixLinkTimeValidationForGl_PerVertex Fix incorrect link time validation for unused gl_PerVertex members
2021-11-09Merge pull request #2801 from haasn/thread_safetyGreg Fischer
Thread safety fixes
2021-11-09Merge pull request #2803 from mhillenbrand/isinf_isnanGreg Fischer
Use intermOut.cpp's IsNan and IsInfinity for parse-time constant folding
2021-11-09Use intermOut.cpp's IsNan and IsInfinity for parse-time constant foldingMarius Hillenbrand
There were two implementations of isInf() and isNan(), in Constant.cpp and in intermOut.cpp. The former only works on little-endian systems, the latter is a wrapper for library functions and works regardless of endianness. Move the second version into Common.h and adopt it in both places. Thereby avoid the duplication and fix for big-endian systems. On s390x, this fixes the test case Glsl/CompileToAstTest.FromFile/constFold_frag. Fixes #2802
2021-11-08Merge pull request #2799 from cyanreg/masterGreg Fischer
Add support for targeting Vulkan 1.2 in the C API
2021-11-08Merge pull request #2798 from alan-baker/update-toolsGreg Fischer
Update tools
2021-11-08Fix incorrect link time validation for unused gl_PerVertex membersKevin McCullough
2021-11-08Merge pull request #2722 from ZhiqianXia/GL_ARB_draw_instancedGreg Fischer
Support the #extension GL_ARB_draw_instanced.
2021-11-08Don't release global mutex before initialize/finalize is doneNiklas Haas
Otherwise this can race with other threads for access to the fields it's supposed to be initializing/finalizing. For example, imagine another thread is calling ShInitialize() while the first thread is calling ShFinalize() - the finalize function would destroy the state at the same time as the initialize function is trying to initialize it. Holding on to the global lock for the entire function prevents all of these failure modes.
2021-11-08Initialize global mutex in a thread-safe mannerNiklas Haas
Currently, ShInitialize() and friends call glslang::InitGlobalLock() which *overwrites* the global mutex. As such, even though it ostensibly takes a mutex, this function is actually completely thread-unsafe. Fix it by using pthread_once to ensure the mutex is only initialized once, and then never again.
2021-11-08Add support for targeting Vulkan 1.2 in the C APILynne
2021-11-08Support the #extension GL_ARB_draw_instanced.ZhiqianXia
Signed-off-by: ZhiqianXia <xzq0528@outlook.com>
2021-11-05Update test expectationsAlan Baker
2021-11-05Update SPIRV-Tools and SPIRV-HeadersAlan Baker
2021-11-02Merge pull request #2719 from ZhiqianXia/GL_EXT_shader_integer_mixGreg Fischer
Add the preamble for GL_EXT_shader_integer_mix
2021-11-02Add the GL_EXT_shader_integer_mix Preamble for glsl.ZhiqianXia
Signed-off-by: ZhiqianXia <xzq0528@outlook.com>
2021-11-01Merge pull request #2712 from ZhiqianXia/switch_errorGreg Fischer
glslang should report a error for Feature: last case/default label not followed by statements'.
2021-10-28To be compatible with Feature: 'last case/default label not followed by ↵ZhiqianXia
statements'. Signed-off-by: ZhiqianXia <xzq0528@outlook.com>
2021-10-27Merge pull request #2796 from greg-lunarg/i2793Greg Fischer
Remove support for double trig, pow, exp and log
2021-10-27Remove support for double trig, pow, exp and logGreg Fischer
These are not supported in core GLSL or under any extension Fixes 2793
2021-10-26Merge pull request #2792 from jeremy-lunarg/hayes-2760Greg Fischer
Return new allocator for copied containers
2021-10-25Return new allocator for copied containersJeremy Hayes
Fix #2760. Implement the optional function select_on_container_copy_contruction to return a default-contructed allocator for containers that are copy-constructed. This gives copy-constructed containers a pool allocator for the current thead. There may be a similar problem with the copy contructor which takes allocators of type "Other" but, in practice, there is only one place where this is being used and the allocators are always the same. (i.e. executing from the same thread)
2021-10-22Merge pull request #2780 from kevin-mccullough/FixCrossStageCheckGreg Fischer
Fix cross-stage check to allow subsequent stage to use previous stage's binding
2021-10-21Merge pull request #2777 from amdrexu/bugfixGreg Fischer
Make modifications of GL_EXT_spirv_intrinsics
2021-10-20Merge pull request #2787 from greg-lunarg/i2779Greg Fischer
Allow 8/16-bit integer as array index
2021-10-20Merge pull request #2788 from alelenv/iomapper_sr_fixGreg Fischer
Skip auto decorating shader record buffer blocks with 'set' and 'binding'.
2021-10-20Merge pull request #2789 from greg-lunarg/i2785Greg Fischer
Accept gl_ViewportMask in version 430 and later
2021-10-20Allow 8/16-bit integer as array indexGreg Fischer
Also enable 8/16 bit int capability in SPIR-V in such cases. Also enable 64 bit capabilities when used in operations. Fixes #2779
2021-10-20Accept gl_ViewportMask in version 430 and laterGreg Fischer
Was previously accepted only in 450 or later. Fixes #2785
2021-10-19Skip auto decorating shader record buffer blocks with 'set' andalelenv
'binding'.
2021-10-19Merge pull request #2786 from dneto0/current-source-dirGreg Fischer
Fix Cmake rule for extension header generation
2021-10-19Fix Cmake rule for extension header generationDavid Neto
Allow glslang to be embedded in an enclosing project (such as Shaderc)
2021-10-19Merge pull request #2783 from chrisforbes/untangleGreg Fischer
Untangle use of core glslang version enums in SpvPostProcess
2021-10-18Merge pull request #2749 from AaronHaganAMD/masterGreg Fischer
GL_EXT_spirv_intrinsics port of GL_EXT_shader_realtime_clock
2021-10-15GL_EXT_spirv_intrinsics - Port extensionsamhagan
Add mechanism to use GL_EXT_spirv_intrinsics headers in glslang. Ported GL_EXT_shader_realtime_clock as an example.
2021-10-15Make modifications of GL_EXT_spirv_intrinsicsRex Xu
1. spirv_execution_mode_id and spirv_decorate_id could support specialization constants. The original implementation always assume only normal frontend constants are valid. It is not true. 2. spirv_type donesn't support type_specifier as an option of spirv_type_parameter. At present, only constant_expression is the valid option.
2021-10-14Untangle use of core glslang version enums in SpvPostProcessChris Forbes
This is the only thing requiring GlslangToSpv.h to be included here. Change-Id: I72e9e278aa1e6d717e83f9dbf11e089aafe2eb0e
2021-10-13Fix cross-stage check to allow subsequent stage to use previous stage's bindingKevin McCullough
2021-10-07Merge pull request #2770 from ncesario-lunarg/ncesario-cmake-endifGreg Fischer
cmake: Remove "conditions" from endif
2021-10-06Merge pull request #2771 from mbechard/masterGreg Fischer
rename member variable for clarity