Skip to content

Commit 7d85756

Browse files
baldurkbaldurk
committed
Update to glslang as of commit a459fc81427ac23d32db6341e5f2c1634a8c9e69
1 parent f8e0eeb commit 7d85756

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+13615
-7695
lines changed

‎renderdoc/3rdparty/glslang/OGLCompilersDLL/InitializeDll.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//
2-
//Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
3-
//All rights reserved.
2+
// Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
3+
// All rights reserved.
44
//
5-
//Redistribution and use in source and binary forms, with or without
6-
//modification, are permitted provided that the following conditions
7-
//are met:
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions
7+
// are met:
88
//
99
// Redistributions of source code must retain the above copyright
1010
// notice, this list of conditions and the following disclaimer.
@@ -18,18 +18,18 @@
1818
// contributors may be used to endorse or promote products derived
1919
// from this software without specific prior written permission.
2020
//
21-
//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22-
//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23-
//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
24-
//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25-
//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26-
//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
27-
//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28-
//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29-
//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30-
//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31-
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32-
//POSSIBILITY OF SUCH DAMAGE.
21+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
24+
// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25+
// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26+
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
27+
// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28+
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29+
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30+
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31+
// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32+
// POSSIBILITY OF SUCH DAMAGE.
3333
//
3434

3535
#define SH_EXPORTING

‎renderdoc/3rdparty/glslang/OGLCompilersDLL/InitializeDll.h

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//
2-
//Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
3-
//All rights reserved.
2+
// Copyright (C) 2002-2005 3Dlabs Inc. Ltd.
3+
// All rights reserved.
44
//
5-
//Redistribution and use in source and binary forms, with or without
6-
//modification, are permitted provided that the following conditions
7-
//are met:
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions
7+
// are met:
88
//
99
// Redistributions of source code must retain the above copyright
1010
// notice, this list of conditions and the following disclaimer.
@@ -18,23 +18,22 @@
1818
// contributors may be used to endorse or promote products derived
1919
// from this software without specific prior written permission.
2020
//
21-
//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22-
//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23-
//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
24-
//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25-
//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26-
//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
27-
//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28-
//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29-
//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30-
//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31-
//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32-
//POSSIBILITY OF SUCH DAMAGE.
21+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
24+
// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25+
// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
26+
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
27+
// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
28+
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29+
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30+
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31+
// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32+
// POSSIBILITY OF SUCH DAMAGE.
3333
//
3434
#ifndef __INITIALIZEDLL_H
3535
#define __INITIALIZEDLL_H
3636

37-
3837
#include "../glslang/OSDependent/osinclude.h"
3938

4039
namespace glslang {

‎renderdoc/3rdparty/glslang/SPIRV/GLSL.ext.AMD.h

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,16 @@
2828
#define GLSLextAMD_H
2929

3030
enum BuiltIn;
31+
enum Capability;
3132
enum Decoration;
3233
enum Op;
3334

3435
static const int GLSLextAMDVersion = 100;
35-
static const int GLSLextAMDRevision = 2;
36+
static const int GLSLextAMDRevision = 5;
3637

3738
// SPV_AMD_shader_ballot
3839
static const char* const E_SPV_AMD_shader_ballot = "SPV_AMD_shader_ballot";
3940

40-
static const Op OpGroupIAddNonUniformAMD = static_cast<Op>(5000);
41-
static const Op OpGroupFAddNonUniformAMD = static_cast<Op>(5001);
42-
static const Op OpGroupFMinNonUniformAMD = static_cast<Op>(5002);
43-
static const Op OpGroupUMinNonUniformAMD = static_cast<Op>(5003);
44-
static const Op OpGroupSMinNonUniformAMD = static_cast<Op>(5004);
45-
static const Op OpGroupFMaxNonUniformAMD = static_cast<Op>(5005);
46-
static const Op OpGroupUMaxNonUniformAMD = static_cast<Op>(5006);
47-
static const Op OpGroupSMaxNonUniformAMD = static_cast<Op>(5007);
48-
4941
enum ShaderBallotAMD {
5042
ShaderBallotBadAMD = 0, // Don't use
5143

@@ -79,16 +71,6 @@ enum ShaderTrinaryMinMaxAMD {
7971
// SPV_AMD_shader_explicit_vertex_parameter
8072
static const char* const E_SPV_AMD_shader_explicit_vertex_parameter = "SPV_AMD_shader_explicit_vertex_parameter";
8173

82-
static const BuiltIn BuiltInBaryCoordNoPerspAMD = static_cast<BuiltIn>(4992);
83-
static const BuiltIn BuiltInBaryCoordNoPerspCentroidAMD = static_cast<BuiltIn>(4993);
84-
static const BuiltIn BuiltInBaryCoordNoPerspSampleAMD = static_cast<BuiltIn>(4994);
85-
static const BuiltIn BuiltInBaryCoordSmoothAMD = static_cast<BuiltIn>(4995);
86-
static const BuiltIn BuiltInBaryCoordSmoothCentroidAMD = static_cast<BuiltIn>(4996);
87-
static const BuiltIn BuiltInBaryCoordSmoothSampleAMD = static_cast<BuiltIn>(4997);
88-
static const BuiltIn BuiltInBaryCoordPullModelAMD = static_cast<BuiltIn>(4998);
89-
90-
static const Decoration DecorationExplicitInterpAMD = static_cast<Decoration>(4999);
91-
9274
enum ShaderExplicitVertexParameterAMD {
9375
ShaderExplicitVertexParameterBadAMD = 0, // Don't use
9476

@@ -113,4 +95,15 @@ enum GcnShaderAMD {
11395
// SPV_AMD_gpu_shader_half_float
11496
static const char* const E_SPV_AMD_gpu_shader_half_float = "SPV_AMD_gpu_shader_half_float";
11597

98+
// SPV_AMD_texture_gather_bias_lod
99+
static const char* const E_SPV_AMD_texture_gather_bias_lod = "SPV_AMD_texture_gather_bias_lod";
100+
101+
// SPV_AMD_gpu_shader_int16
102+
static const char* const E_SPV_AMD_gpu_shader_int16 = "SPV_AMD_gpu_shader_int16";
103+
104+
// SPV_AMD_shader_image_load_store_lod
105+
static const char* const E_SPV_AMD_shader_image_load_store_lod = "SPV_AMD_shader_image_load_store_lod";
106+
107+
static const Capability CapabilityImageReadWriteLodAMD = static_cast<Capability>(5015);
108+
116109
#endif // #ifndef GLSLextAMD_H

‎renderdoc/3rdparty/glslang/SPIRV/GLSL.ext.KHR.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,17 @@ enum Op;
3232
enum Capability;
3333

3434
static const int GLSLextKHRVersion = 100;
35-
static const int GLSLextKHRRevision = 1;
35+
static const int GLSLextKHRRevision = 2;
3636

37-
static const char* const E_SPV_KHR_shader_ballot = "SPV_KHR_shader_ballot";
38-
static const char* const E_SPV_KHR_subgroup_vote = "SPV_KHR_subgroup_vote";
39-
static const char* const E_SPV_KHR_device_group = "SPV_KHR_device_group";
40-
static const char* const E_SPV_KHR_multiview = "SPV_KHR_multiview";
41-
static const char* const E_SPV_KHR_shader_draw_parameters = "SPV_KHR_shader_draw_parameters";
37+
static const char* const E_SPV_KHR_shader_ballot = "SPV_KHR_shader_ballot";
38+
static const char* const E_SPV_KHR_subgroup_vote = "SPV_KHR_subgroup_vote";
39+
static const char* const E_SPV_KHR_device_group = "SPV_KHR_device_group";
40+
static const char* const E_SPV_KHR_multiview = "SPV_KHR_multiview";
41+
static const char* const E_SPV_KHR_shader_draw_parameters = "SPV_KHR_shader_draw_parameters";
42+
static const char* const E_SPV_KHR_16bit_storage = "SPV_KHR_16bit_storage";
43+
static const char* const E_SPV_KHR_storage_buffer_storage_class = "SPV_KHR_storage_buffer_storage_class";
44+
static const char* const E_SPV_KHR_post_depth_coverage = "SPV_KHR_post_depth_coverage";
45+
static const char* const E_SPV_EXT_shader_stencil_export = "SPV_EXT_shader_stencil_export";
46+
static const char* const E_SPV_EXT_shader_viewport_index_layer = "SPV_EXT_shader_viewport_index_layer";
4247

4348
#endif // #ifndef GLSLextKHR_H

0 commit comments

Comments
 (0)