mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2836 from chaoticbob/vulkan_rules_relaxed

Browse Source 
Vulkan rules relaxed for glslang C interface
This commit is contained in:
Greg Fischer 2021-12-07 16:12:05 -07:00 committed by GitHub
commit 542ee69d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glslang/CInterface/glslang_c_interface.cpp
View File

@ -367,6 +367,11 @@ GLSLANG_EXPORT void glslang_shader_set_options(glslang_shader_t* shader, int opt
if (options & GLSLANG_SHADER_AUTO_MAP_LOCATIONS) { if (options & GLSLANG_SHADER_AUTO_MAP_LOCATIONS) {
shader->shader->setAutoMapLocations(true); shader->shader->setAutoMapLocations(true);
} }
if (options & GLSLANG_SHADER_VULKAN_RULES_RELAXED) {
shader->shader->setEnvInputVulkanRulesRelaxed();
}
} }
GLSLANG_EXPORT const char* glslang_shader_get_preprocessed_code(glslang_shader_t* shader) GLSLANG_EXPORT const char* glslang_shader_get_preprocessed_code(glslang_shader_t* shader)

3
glslang/Include/glslang_c_shader_types.h
View File

@ -185,7 +185,8 @@ typedef enum {
typedef enum { typedef enum {
GLSLANG_SHADER_DEFAULT_BIT = 0, GLSLANG_SHADER_DEFAULT_BIT = 0,
GLSLANG_SHADER_AUTO_MAP_BINDINGS = (1 << 0), GLSLANG_SHADER_AUTO_MAP_BINDINGS = (1 << 0),
GLSLANG_SHADER_AUTO_MAP_LOCATIONS = (2 << 0), GLSLANG_SHADER_AUTO_MAP_LOCATIONS = (1 << 1),
GLSLANG_SHADER_VULKAN_RULES_RELAXED = (1 << 2),
LAST_ELEMENT_MARKER(GLSLANG_SHADER_COUNT), LAST_ELEMENT_MARKER(GLSLANG_SHADER_COUNT),
} glslang_shader_options_t; } glslang_shader_options_t;