Skip to content

Commit 29b57d2

Browse files
committed
updated vulkan to make use of cm2
1 parent 40adb8a commit 29b57d2

File tree

99 files changed

+148317
-86645
lines changed

Some content is hidden

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

99 files changed

+148317
-86645
lines changed

include/vulkan/glslang/Include/glslang_c_interface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ GLSLANG_EXPORT const char* glslang_program_SPIRV_get_messages(glslang_program_t*
284284
GLSLANG_EXPORT const char* glslang_program_get_info_log(glslang_program_t* program);
285285
GLSLANG_EXPORT const char* glslang_program_get_info_debug_log(glslang_program_t* program);
286286

287-
GLSLANG_EXPORT glslang_mapper_t* glslang_glsl_mapper_create();
287+
GLSLANG_EXPORT glslang_mapper_t* glslang_glsl_mapper_create(void);
288288
GLSLANG_EXPORT void glslang_glsl_mapper_delete(glslang_mapper_t* mapper);
289289

290290
GLSLANG_EXPORT glslang_resolver_t* glslang_glsl_resolver_create(glslang_program_t* program, glslang_stage_t stage);

include/vulkan/glslang/Include/glslang_c_shader_types.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,9 @@ typedef enum {
118118
GLSLANG_TARGET_VULKAN_1_1 = (1 << 22) | (1 << 12),
119119
GLSLANG_TARGET_VULKAN_1_2 = (1 << 22) | (2 << 12),
120120
GLSLANG_TARGET_VULKAN_1_3 = (1 << 22) | (3 << 12),
121+
GLSLANG_TARGET_VULKAN_1_4 = (1 << 22) | (4 << 12),
121122
GLSLANG_TARGET_OPENGL_450 = 450,
122-
LAST_ELEMENT_MARKER(GLSLANG_TARGET_CLIENT_VERSION_COUNT = 5),
123+
LAST_ELEMENT_MARKER(GLSLANG_TARGET_CLIENT_VERSION_COUNT = 6),
123124
} glslang_target_client_version_t;
124125

125126
/* SH_TARGET_LanguageVersion counterpart */
@@ -176,6 +177,7 @@ typedef enum {
176177
GLSLANG_MSG_ENHANCED = (1 << 15),
177178
GLSLANG_MSG_ABSOLUTE_PATH = (1 << 16),
178179
GLSLANG_MSG_DISPLAY_ERROR_COLUMN = (1 << 17),
180+
GLSLANG_MSG_LINK_TIME_OPTIMIZATION_BIT = (1 << 18),
179181
LAST_ELEMENT_MARKER(GLSLANG_MSG_COUNT),
180182
} glslang_messages_t;
181183

include/vulkan/glslang/MachineIndependent/Versions.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// Copyright (C) 2017, 2022-2024 Arm Limited.
55
// Copyright (C) 2015-2018 Google, Inc.
66
// Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved.
7+
// Modifications Copyright (C) 2024 Valve Corporation.
78
//
89
// All rights reserved.
910
//
@@ -223,6 +224,8 @@ const char* const E_GL_EXT_maximal_reconvergence = "GL_EXT_maximal_re
223224
const char* const E_GL_EXT_expect_assume = "GL_EXT_expect_assume";
224225
const char* const E_GL_EXT_control_flow_attributes2 = "GL_EXT_control_flow_attributes2";
225226
const char* const E_GL_EXT_spec_constant_composites = "GL_EXT_spec_constant_composites";
227+
const char* const E_GL_EXT_texture_offset_non_const = "GL_EXT_texture_offset_non_const";
228+
const char* const E_GL_EXT_nontemporal_keyword = "GL_EXT_nontemporal_keyword";
226229

227230
// Arrays of extensions for the above viewportEXTs duplications
228231

@@ -282,6 +285,10 @@ const char* const E_GL_NV_shader_invocation_reorder = "GL_NV_shader_
282285
const char* const E_GL_EXT_ray_tracing_position_fetch = "GL_EXT_ray_tracing_position_fetch";
283286
const char* const E_GL_NV_displacement_micromap = "GL_NV_displacement_micromap";
284287
const char* const E_GL_NV_shader_atomic_fp16_vector = "GL_NV_shader_atomic_fp16_vector";
288+
const char* const E_GL_NV_cooperative_matrix2 = "GL_NV_cooperative_matrix2";
289+
const char* const E_GL_NV_cooperative_vector = "GL_NV_cooperative_vector";
290+
const char* const E_GL_NV_cluster_acceleration_structure = "GL_NV_cluster_acceleration_structure";
291+
const char* const E_GL_NV_linear_swept_spheres = "GL_NV_linear_swept_spheres";
285292

286293
// ARM
287294
const char* const E_GL_ARM_shader_core_builtins = "GL_ARM_shader_core_builtins";
@@ -347,6 +354,8 @@ const char* const E_GL_EXT_shader_tile_image = "GL_EXT_shader_tile_image";
347354

348355
const char* const E_GL_EXT_texture_shadow_lod = "GL_EXT_texture_shadow_lod";
349356

357+
const char* const E_GL_EXT_integer_dot_product = "GL_EXT_integer_dot_product";
358+
350359
// Arrays of extensions for the above AEP duplications
351360

352361
const char* const AEP_geometry_shader[] = { E_GL_EXT_geometry_shader, E_GL_OES_geometry_shader };

include/vulkan/glslang/Public/ShaderLang.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,9 @@ typedef enum {
156156
EShTargetVulkan_1_1 = (1 << 22) | (1 << 12), // Vulkan 1.1
157157
EShTargetVulkan_1_2 = (1 << 22) | (2 << 12), // Vulkan 1.2
158158
EShTargetVulkan_1_3 = (1 << 22) | (3 << 12), // Vulkan 1.3
159+
EShTargetVulkan_1_4 = (1 << 22) | (4 << 12), // Vulkan 1.4
159160
EShTargetOpenGL_450 = 450, // OpenGL
160-
LAST_ELEMENT_MARKER(EShTargetClientVersionCount = 5),
161+
LAST_ELEMENT_MARKER(EShTargetClientVersionCount = 6),
161162
} EShTargetClientVersion;
162163

163164
typedef EShTargetClientVersion EshTargetClientVersion;
@@ -271,6 +272,7 @@ enum EShMessages : unsigned {
271272
EShMsgEnhanced = (1 << 15), // enhanced message readability
272273
EShMsgAbsolutePath = (1 << 16), // Output Absolute path for messages
273274
EShMsgDisplayErrorColumn = (1 << 17), // Display error message column aswell as line
275+
EShMsgLinkTimeOptimization = (1 << 18), // perform cross-stage optimizations during linking
274276
LAST_ELEMENT_MARKER(EShMsgCount),
275277
};
276278

0 commit comments

Comments
 (0)