AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-12 21:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,721 Commits 55 Branches 95 Tags 91 MiB
9d8c7b75c9
Commit Graph

4721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrea Pappacoda
1b32fc8eb2
build: install glslang-config.cmake to libdir 
As glslang ships architecture dependant files, the Config file should be
installed to libdir, not datadir. See
https://github.com/KhronosGroup/glslang/pull/2989#discussion_r955367103
for more details.

Here's the diff between the install tree before and after this patch:

    $ diff <(tree install-datadir) <(tree install)
    1c1
    < install-datadir
    ---
    > install
    74,99c74,98
    <         ├── lib
    <         │   ├── cmake
    <         │   │   ├── glslang-default-resource-limitsTargets.cmake
    <         │   │   ├── glslangTargets.cmake
    <         │   │   ├── glslangValidatorTargets.cmake
    <         │   │   ├── HLSLTargets.cmake
    <         │   │   ├── OGLCompilerTargets.cmake
    <         │   │   ├── OSDependentTargets.cmake
    <         │   │   ├── spirv-remapTargets.cmake
    <         │   │   ├── SPIRVTargets.cmake
    <         │   │   └── SPVRemapperTargets.cmake
    <         │   ├── libGenericCodeGen.a
    <         │   ├── libglslang.a
    <         │   ├── libglslang-default-resource-limits.a
    <         │   ├── libHLSL.a
    <         │   ├── libMachineIndependent.a
    <         │   ├── libOGLCompiler.a
    <         │   ├── libOSDependent.a
    <         │   ├── libSPIRV.a
    <         │   └── libSPVRemapper.a
    <         └── share
    <             └── glslang
    <                 ├── glslang-config.cmake
    <                 ├── glslang-config-version.cmake
    <                 ├── glslang-targets.cmake
    <                 └── glslang-targets-debug.cmake
    ---
    >         └── lib
    >             ├── cmake
    >             │   ├── glslang-default-resource-limitsTargets.cmake
    >             │   ├── glslangTargets.cmake
    >             │   ├── glslangValidatorTargets.cmake
    >             │   ├── HLSLTargets.cmake
    >             │   ├── OGLCompilerTargets.cmake
    >             │   ├── OSDependentTargets.cmake
    >             │   ├── spirv-remapTargets.cmake
    >             │   ├── SPIRVTargets.cmake
    >             │   └── SPVRemapperTargets.cmake
    >             ├── glslang
    >             │   ├── glslang-config.cmake
    >             │   ├── glslang-config-version.cmake
    >             │   ├── glslang-targets.cmake
    >             │   └── glslang-targets-debug.cmake
    >             ├── libGenericCodeGen.a
    >             ├── libglslang.a
    >             ├── libglslang-default-resource-limits.a
    >             ├── libHLSL.a
    >             ├── libMachineIndependent.a
    >             ├── libOGLCompiler.a
    >             ├── libOSDependent.a
    >             ├── libSPIRV.a
    >             └── libSPVRemapper.a
    101c100
    < 15 directories, 83 files
    ---
    > 14 directories, 83 files
 2022-08-25 23:15:14 +02:00
Jeremy Hayes
10423ec659
Merge pull request #3000 from jeremy-lunarg/hayes-update-cmake-minimum 
Update cmake minimum required version
 2022-08-12 11:44:16 -06:00
Jeremy Hayes
56e19ed8ce Update cmake minimum required version 2022-08-12 10:29:31 -06:00
Jeremy Hayes
73c9630da9
Merge pull request #2998 from jeremy-lunarg/hayes-update-changes 
Update CHANGES for release 11.11.0
 2022-08-12 09:32:10 -06:00
Jeremy Hayes
6079f49dea Update CHANGES for release 11.11.0 2022-08-11 14:09:38 -06:00
Greg Fischer
f771c1293d
Merge pull request #2995 from jeremy-lunarg/hayes-update-known-good 
Update known_good.json
 2022-08-11 13:47:08 -06:00
Jeremy Hayes
5326d151b2 Update known_good.json 2022-08-10 12:29:15 -06:00
Greg Fischer
adf7bf0113
Merge pull request #2991 from KhronosGroup/revert-2988-build_arm64_binaries_mac 
Revert "Fix: Build arm64 binaries for macOS"
 2022-08-03 13:22:21 -06:00
Greg Fischer
d8b64c2713
Revert "Fix: Build arm64 binaries for macOS" 2022-08-03 12:39:23 -06:00
Greg Fischer
de0b1bf6d7
Merge pull request #2988 from spnda/build_arm64_binaries_mac 
Fix: Build arm64 binaries for macOS
 2022-08-03 10:32:34 -06:00
MACHIZAUD Andréa
fb64704060
Add unified glslang CMake config collecting glslang-targets targets (#2989) 2022-08-02 18:16:03 -06:00
David Neto
f28022c9f9
Avoid double-free in functions cloned for vulkan relaxed mode (#2987) 
* Avoid double-free in functions cloned for vulkan relaxed mode

When rewriting function calls atomicCounterIncrement and
atoicCounterDecrement, clone the parameters so that the TParameter
'type' field is cloned.  This avoids double-free when both the original
and transformed functions are deleted by the parser.

Fixes a ubsan failure.
 2022-08-02 18:07:01 -06:00
sean
b43848f0ca
Fix: Build arm64 binaries for macOS 2022-07-30 06:51:06 +02:00
Greg Fischer
f0ce653a25
Merge pull request #2986 from jeremy-lunarg/hayes-update-macos-runner 
Update MacOS runner
 2022-07-27 17:39:33 -06:00
Jeremy Hayes
457d11ebd8 Update MacOS runner 
Per https://github.com/actions/virtual-environments/issues/5583

Fix #2984
 2022-07-27 17:13:36 -06:00
Greg Fischer
22d39cd684
Merge pull request #2977 from AMD-dwang/AMD_shader_early_and_late_fragment_tests 
Add SPV_AMD_shader_early_and_late_fragment_tests
 2022-07-27 11:23:16 -06:00
Jeremy Hayes
7b75c5dc7d
Merge pull request #2982 from jeremy-lunarg/hayes-remove-tabs 
Replace tabs with spaces
 2022-07-26 09:05:13 -06:00
Jeremy Hayes
b35ba4f355
Merge pull request #2981 from jeremy-lunarg/hayes-fix-2978 
Update release description
 2022-07-26 09:04:25 -06:00
Jeremy Hayes
6a2b45c3cd Replace tabs with spaces 
This file was accidentally using mixed tabs and spaces.
 2022-07-25 17:10:17 -06:00
Jeremy Hayes
738c09e31b Update release description 
Fix #2978.
 2022-07-25 17:04:26 -06:00
Jeremy Hayes
607771c362
Merge pull request #2979 from spnda/master 
Fix #2658: Properly include all headers in deployments
 2022-07-25 11:39:28 -06:00
sean
7f784c81e9
Fix: Properly include all headers in deployments 2022-07-25 17:54:20 +02:00
Greg Fischer
6ef2e49216
Merge pull request #2974 from thoave-arm/EOpConstructAccStruct 
Make GL_KHR_ray_query provide EOpConstructAccStruct
 2022-07-22 10:51:42 -06:00
Thomas Aven
374c124025 Make GL_KHR_ray_query provide EOpConstructAccStruct 
Previously, GL_KHR_ray_tracing was a required extension to generate
OpConvertUToAccelerationStructureKHR conversion instructions from uint64
and uvec2. However, both GL_KHR_ray_tracing and GL_KHR_ray_query should
provide this construction.

Change-Id: I6564c127fd28d9b527d334958a5adc168f5cdd9a
 2022-07-21 11:00:34 +02:00
dwang102
070863af69 Add SPV_AMD_shader_early_and_late_fragment_tests 2022-07-18 14:20:18 +08:00
Jeremy Hayes
7e6b7c26a2
Merge pull request #2976 from jeremy-lunarg/hayes-fix-2975 
Emit Int64Atomics for imageAtomicStore
 2022-07-14 18:05:46 -06:00
Jeremy Hayes
8bdc3d4d31 Emit Int64Atomics for imageAtomicStore 
This covers a corner case wherein imageAtomicStore is used exclusively.
The proxy type for imageAtomicStore is inferred from the image type.

Fix #2975.
 2022-07-14 17:37:52 -06:00
Greg Fischer
68c1880c09
Merge pull request #2973 from haasn/version_macros 
Fix version check macros
 2022-07-12 10:57:21 -06:00
Niklas Haas
6fdf03e4d1 Fix version check macros 
These were defined backwards to the usual convention.

 #if GLSLANG_VERSION_GREATER_THAN(11, 10, 0)

This reads as "if glslang version is greater than 11.10.0" to any
reasonable sane programmer, and should therefore expand to
"glslang_version > macro_argument".

Yet the check it references was actually written as "macro_argument >
glslang_version", thus expressing the completely opposite condition of
"if glslang version is *less than* 11.10.0". This is definitely
backwards and extremely, dangerously surprising behavior to any
programmer familiar with such version macros.

I'm not sure if anybody actually ever used them. I certainly didn't, on
account of them being backwards. I could not find a single reference to
them on GitHub (other than in copies of this header) - every project I
found just used the GLSLANG_VERSION_MAJOR etc. macros directly.
 2022-07-12 16:59:22 +02:00
Greg Fischer
503dd24378
Merge pull request #2970 from greg-lunarg/i2969 
Fix getEnhancedMsgs to work when HLSL not enabled
 2022-07-07 12:14:29 -06:00
Greg Fischer
8e5f1ac954 Fix getEnhancedMsgs to work when HLSL not enabled 
Fixes #2969
 2022-07-07 11:40:02 -06:00
Greg Fischer
b2d2c9dd3d
Merge pull request #2963 from greg-lunarg/i2956 
Do not generate samplerBuffer for spirv1.6 and beyond
 2022-06-22 13:08:13 -06:00
Greg Fischer
c1ae2f33b5 Do not generate samplerBuffer for spirv1.6 and beyond 
This type was removed from spirv1.6. If samplerBuffer is specified in
GLSL, generate textureBuffer. If samplerBuffer type is constructed,
just return the buffer.

Fixes #2956
 2022-06-21 17:42:53 -06:00
Greg Fischer
bffcf209cb
Merge pull request #2962 from James2022-rgb/feature/c_interface_opsource_support 
Add OpSource support to the C interface.
 2022-06-13 17:28:18 -06:00
James0124
ea024d2bfc CInterface: Add OpSource support. 
Add interface for `TIntermediate::addSourceText` and `TIntermediate::setSourceFile`.
 2022-06-07 01:13:21 +09:00
Greg Fischer
adbf0d3106
Merge pull request #2961 from jeremy-lunarg/hayes-update-changes 
Release 11.10.0
 2022-06-02 18:01:12 -06:00
Jeremy Hayes
c411e58d78 Release 11.10.0 2022-06-02 17:34:26 -06:00
Greg Fischer
1c5f28e655
Merge pull request #2960 from jeremy-lunarg/hayes-update-known-good 
Update known_good.json
 2022-06-02 16:49:28 -06:00
Jeremy Hayes
3f369d4a16 Update known_good.json 2022-06-02 11:51:31 -06:00
Greg Fischer
2be1561b91
Merge pull request #2957 from greg-lunarg/p2933 
Restore legacy interface for remap()
 2022-06-01 17:20:20 -06:00
Greg Fischer
9e2b914722 Restore legacy interface for remap() 
Fixes ABI breakage caused by #2933
 2022-06-01 16:40:29 -06:00
Greg Fischer
4c3e00bf96
Merge pull request #2955 from andfau-arm/duplicate-builtin-clash 
Avoid duplicate BuiltIn variables for ray tracing matrices (fix #2921)
 2022-06-01 14:07:18 -06:00
Andrea Faulds
6cdae46314 Avoid duplicate BuiltIn variables for ray tracing matrices (fix #2921) 
Fixes an issue where invalid SPIR-V was generated when
gl_ObjectToWorldEXT and gl_ObjectToWorld3x4EXT, or
gl_WorldToObjectEXT and gl_WorldToObject3x4EXT, were used in the same
shader. The SPIR-V specification requires that there be at most one
OpVariable decorated with a given BuiltIn value.
 2022-06-01 10:43:13 +02:00
Greg Fischer
316f12ac1d
Merge pull request #2950 from qingyuanzNV/insert_opline_before_opfunction2 
Generate OpLine Before OpFunction
 2022-05-31 13:25:22 -06:00
Qingyuan Zheng
61d244145d avoid using make_unique for c++11 compatibility 2022-05-31 10:40:25 -07:00
Qingyuan Zheng
b6df89b470 use unique_ptr to avoid calling deleted move ctor 2022-05-30 23:08:50 -07:00
Greg Fischer
7dda6a6347
Merge pull request #2952 from stu-s/EXT_fragment_shader_barycentric 
Add support for VK_EXT_fragment_shader_barycentric
 2022-05-26 10:41:25 -06:00
Greg Fischer
abc87e98fd
Merge pull request #2953 from greg-lunarg/mingw0 
Fix build for clang + mingw32-make
 2022-05-25 12:07:12 -06:00
Greg Fischer
25e97a5b06 Fix build for clang + mingw32-make 
Fixes #2951
 2022-05-25 11:02:09 -06:00
stusmith
ebf45697be Add support for VK_EXT_fragment_shader_barycentric 2022-05-25 13:02:02 +01:00