Skip to content

Commit

Permalink
update glslang
Browse files Browse the repository at this point in the history
  • Loading branch information
slime73 committed Jan 8, 2024
1 parent 501c41e commit a99d5af
Show file tree
Hide file tree
Showing 92 changed files with 17,389 additions and 12,852 deletions.
17 changes: 10 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,7 @@ set(LOVE_SRC_3P_GLSLANG_GLSLANG_MACHINEINDEPENDENT
src/libraries/glslang/glslang/MachineIndependent/Scan.h
src/libraries/glslang/glslang/MachineIndependent/ScanContext.h
src/libraries/glslang/glslang/MachineIndependent/ShaderLang.cpp
src/libraries/glslang/glslang/MachineIndependent/span.h
src/libraries/glslang/glslang/MachineIndependent/SpirvIntrinsics.cpp
src/libraries/glslang/glslang/MachineIndependent/SymbolTable.cpp
src/libraries/glslang/glslang/MachineIndependent/SymbolTable.h
Expand All @@ -1405,7 +1406,6 @@ set(LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT
if(MSVC OR MINGW)
set(LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT
${LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT}
src/libraries/glslang/glslang/OSDependent/Windows/main.cpp
src/libraries/glslang/glslang/OSDependent/Windows/ossource.cpp
)
else()
Expand All @@ -1416,21 +1416,22 @@ else()
endif()

set(LOVE_SRC_3P_GLSLANG_GLSLANG_PUBLIC
src/libraries/glslang/glslang/Public/ResourceLimits.h
src/libraries/glslang/glslang/Public/ShaderLang.h
)

set(LOVE_SRC_3P_GLSLANG_GLSLANG_RESOURCELIMITS
src/libraries/glslang/glslang/ResourceLimits/ResourceLimits.cpp
)

set(LOVE_SRC_3P_GLSLANG_GLSLANG
src/libraries/glslang/glslang/build_info.h
${LOVE_SRC_3P_GLSLANG_GLSLANG_GENERICCODEGEN}
${LOVE_SRC_3P_GLSLANG_GLSLANG_INCLUDE}
${LOVE_SRC_3P_GLSLANG_GLSLANG_MACHINEINDEPENDENT}
${LOVE_SRC_3P_GLSLANG_GLSLANG_OSDEPENDENT}
${LOVE_SRC_3P_GLSLANG_GLSLANG_PUBLIC}
)

set(LOVE_SRC_3P_GLSLANG_OGLCOMPILERSDLL
src/libraries/glslang/OGLCompilersDLL/InitializeDll.cpp
src/libraries/glslang/OGLCompilersDLL/InitializeDll.h
${LOVE_SRC_3P_GLSLANG_GLSLANG_RESOURCELIMITS}
)

set(LOVE_SRC_3P_GLSLANG_SPIRV
Expand All @@ -1440,9 +1441,11 @@ set(LOVE_SRC_3P_GLSLANG_SPIRV
src/libraries/glslang/SPIRV/doc.cpp
src/libraries/glslang/SPIRV/doc.h
src/libraries/glslang/SPIRV/GLSL.ext.AMD.h
src/libraries/glslang/SPIRV/GLSL.ext.ARM.h
src/libraries/glslang/SPIRV/GLSL.ext.EXT.h
src/libraries/glslang/SPIRV/GLSL.ext.KHR.h
src/libraries/glslang/SPIRV/GLSL.ext.NV.h
src/libraries/glslang/SPIRV/GLSL.ext.QCOM.h
src/libraries/glslang/SPIRV/GLSL.std.450.h
src/libraries/glslang/SPIRV/GlslangToSpv.cpp
src/libraries/glslang/SPIRV/GlslangToSpv.h
Expand All @@ -1451,6 +1454,7 @@ set(LOVE_SRC_3P_GLSLANG_SPIRV
src/libraries/glslang/SPIRV/Logger.cpp
src/libraries/glslang/SPIRV/Logger.h
src/libraries/glslang/SPIRV/NonSemanticDebugPrintf.h
src/libraries/glslang/SPIRV/NonSemanticShaderDebugInfo100.h
src/libraries/glslang/SPIRV/spirv.hpp
src/libraries/glslang/SPIRV/SpvBuilder.cpp
src/libraries/glslang/SPIRV/SpvBuilder.h
Expand All @@ -1464,7 +1468,6 @@ set(LOVE_SRC_3P_GLSLANG_SPIRV

set(LOVE_SRC_3P_GLSLANG
${LOVE_SRC_3P_GLSLANG_GLSLANG}
${LOVE_SRC_3P_GLSLANG_OGLCOMPILERSDLL}
${LOVE_SRC_3P_GLSLANG_SPIRV}
)

Expand Down
66 changes: 42 additions & 24 deletions platform/xcode/liblove.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

165 changes: 0 additions & 165 deletions src/libraries/glslang/OGLCompilersDLL/InitializeDll.cpp

This file was deleted.

35 changes: 35 additions & 0 deletions src/libraries/glslang/SPIRV/GLSL.ext.ARM.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
** Copyright (c) 2022 ARM Limited
**
** Permission is hereby granted, free of charge, to any person obtaining a copy
** of this software and/or associated documentation files (the "Materials"),
** to deal in the Materials without restriction, including without limitation
** the rights to use, copy, modify, merge, publish, distribute, sublicense,
** and/or sell copies of the Materials, and to permit persons to whom the
** Materials are furnished to do so, subject to the following conditions:
**
** The above copyright notice and this permission notice shall be included in
** all copies or substantial portions of the Materials.
**
** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
**
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
** THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
** FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
** IN THE MATERIALS.
*/

#ifndef GLSLextARM_H
#define GLSLextARM_H

static const int GLSLextARMVersion = 100;
static const int GLSLextARMRevision = 1;

static const char * const E_SPV_ARM_core_builtins = "SPV_ARM_core_builtins";

#endif // #ifndef GLSLextARM_H
2 changes: 2 additions & 0 deletions src/libraries/glslang/SPIRV/GLSL.ext.EXT.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,7 @@ static const char* const E_SPV_EXT_shader_atomic_float_add = "SPV_EXT_shader_ato
static const char* const E_SPV_EXT_shader_atomic_float16_add = "SPV_EXT_shader_atomic_float16_add";
static const char* const E_SPV_EXT_shader_atomic_float_min_max = "SPV_EXT_shader_atomic_float_min_max";
static const char* const E_SPV_EXT_shader_image_int64 = "SPV_EXT_shader_image_int64";
static const char* const E_SPV_EXT_shader_tile_image = "SPV_EXT_shader_tile_image";
static const char* const E_SPV_EXT_mesh_shader = "SPV_EXT_mesh_shader";

#endif // #ifndef GLSLextEXT_H
6 changes: 5 additions & 1 deletion src/libraries/glslang/SPIRV/GLSL.ext.KHR.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define GLSLextKHR_H

static const int GLSLextKHRVersion = 100;
static const int GLSLextKHRRevision = 2;
static const int GLSLextKHRRevision = 3;

static const char* const E_SPV_KHR_shader_ballot = "SPV_KHR_shader_ballot";
static const char* const E_SPV_KHR_subgroup_vote = "SPV_KHR_subgroup_vote";
Expand All @@ -52,5 +52,9 @@ static const char* const E_SPV_KHR_fragment_shading_rate = "SPV_KHR_fragm
static const char* const E_SPV_KHR_terminate_invocation = "SPV_KHR_terminate_invocation";
static const char* const E_SPV_KHR_workgroup_memory_explicit_layout = "SPV_KHR_workgroup_memory_explicit_layout";
static const char* const E_SPV_KHR_subgroup_uniform_control_flow = "SPV_KHR_subgroup_uniform_control_flow";
static const char* const E_SPV_KHR_fragment_shader_barycentric = "SPV_KHR_fragment_shader_barycentric";
static const char* const E_SPV_AMD_shader_early_and_late_fragment_tests = "SPV_AMD_shader_early_and_late_fragment_tests";
static const char* const E_SPV_KHR_ray_tracing_position_fetch = "SPV_KHR_ray_tracing_position_fetch";
static const char* const E_SPV_KHR_cooperative_matrix = "SPV_KHR_cooperative_matrix";

#endif // #ifndef GLSLextKHR_H
6 changes: 6 additions & 0 deletions src/libraries/glslang/SPIRV/GLSL.ext.NV.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,10 @@ const char* const E_SPV_NV_cooperative_matrix = "SPV_NV_cooperative_matrix";
//SPV_NV_shader_sm_builtins
const char* const E_SPV_NV_shader_sm_builtins = "SPV_NV_shader_sm_builtins";

//SPV_NV_shader_execution_reorder
const char* const E_SPV_NV_shader_invocation_reorder = "SPV_NV_shader_invocation_reorder";

//SPV_NV_displacement_micromap
const char* const E_SPV_NV_displacement_micromap = "SPV_NV_displacement_micromap";

#endif // #ifndef GLSLextNV_H
41 changes: 41 additions & 0 deletions src/libraries/glslang/SPIRV/GLSL.ext.QCOM.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
** Copyright (c) 2021 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a copy
** of this software and/or associated documentation files (the "Materials"),
** to deal in the Materials without restriction, including without limitation
** the rights to use, copy, modify, merge, publish, distribute, sublicense,
** and/or sell copies of the Materials, and to permit persons to whom the
** Materials are furnished to do so, subject to the following conditions:
**
** The above copyright notice and this permission notice shall be included in
** all copies or substantial portions of the Materials.
**
** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
**
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
** THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
** FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
** IN THE MATERIALS.
*/

#ifndef GLSLextQCOM_H
#define GLSLextQCOM_H

enum BuiltIn;
enum Decoration;
enum Op;
enum Capability;

static const int GLSLextQCOMVersion = 100;
static const int GLSLextQCOMRevision = 1;

//SPV_QCOM_image_processing
const char* const E_SPV_QCOM_image_processing = "SPV_QCOM_image_processing";

#endif // #ifndef GLSLextQCOM_H
2 changes: 1 addition & 1 deletion src/libraries/glslang/SPIRV/GLSL.std.450.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
**
** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
**
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
Loading

0 comments on commit a99d5af

Please sign in to comment.