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

Merge pull request #750 from dgkoch/rename_KHX_to_EXT

Browse Source 
Rename KHX_multiview/device_group to EXT_multiview/device to match the released specs
This commit is contained in:
John Kessenich
2017-03-03 17:23:53 -07:00
committed by GitHub
parent 27ffb29908 efc972799d
commit 322cb1922e
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
glslang/MachineIndependent/Initialize.cpp
View File

@@ -3702,8 +3702,8 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
}
if (profile != EEsProfile) {
commonBuiltins.append("uniform int gl_ViewIndexKHR;");
commonBuiltins.append("uniform int gl_DeviceIndexKHR;"); // GL_KHX_device_group
commonBuiltins.append("uniform int gl_ViewIndex;");
commonBuiltins.append("uniform int gl_DeviceIndex;"); // GL_EXT_device_group
}
// printf("%s\n", commonBuiltins.c_str());
@@ -5318,10 +5318,10 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
}
if (profile != EEsProfile) {
symbolTable.setFunctionExtensions("gl_DeviceIndexKHR", 1, &E_GL_KHX_device_group);
BuiltInVariable("gl_DeviceIndexKHR", EbvDeviceIndex, symbolTable);
symbolTable.setFunctionExtensions("gl_ViewIndexKHR", 1, &E_GL_KHX_multiview);
BuiltInVariable("gl_ViewIndexKHR", EbvViewIndex, symbolTable);
symbolTable.setFunctionExtensions("gl_DeviceIndex", 1, &E_GL_EXT_device_group);
BuiltInVariable("gl_DeviceIndex", EbvDeviceIndex, symbolTable);
symbolTable.setFunctionExtensions("gl_ViewIndex", 1, &E_GL_EXT_multiview);
BuiltInVariable("gl_ViewIndex", EbvViewIndex, symbolTable);
}
break;

6
glslang/MachineIndependent/Versions.cpp
View File

@@ -233,9 +233,9 @@ void TParseVersions::initializeExtensionBehavior()
extensionBehavior[E_GL_OES_texture_buffer] = EBhDisable;
extensionBehavior[E_GL_OES_texture_cube_map_array] = EBhDisable;
// KHX extensions
extensionBehavior[E_GL_KHX_device_group] = EBhDisable;
extensionBehavior[E_GL_KHX_multiview] = EBhDisable;
// EXT extensions
extensionBehavior[E_GL_EXT_device_group] = EBhDisable;
extensionBehavior[E_GL_EXT_multiview] = EBhDisable;
}
// Get code that is not part of a shared symbol table, is specific to this shader,

6
glslang/MachineIndependent/Versions.h
View File

@@ -132,9 +132,9 @@ const char* const E_GL_ARB_sparse_texture_clamp = "GL_ARB_sparse_texture
const char* const E_GL_EXT_shader_non_constant_global_initializers = "GL_EXT_shader_non_constant_global_initializers";
const char* const E_GL_EXT_shader_image_load_formatted = "GL_EXT_shader_image_load_formatted";
// KHX extensions
const char* const E_GL_KHX_device_group = "GL_KHX_device_group";
const char* const E_GL_KHX_multiview = "GL_KHX_multiview";
// EXT extensions
const char* const E_GL_EXT_device_group = "GL_EXT_device_group";
const char* const E_GL_EXT_multiview = "GL_EXT_multiview";
// #line and #include
const char* const E_GL_GOOGLE_cpp_style_line_directive = "GL_GOOGLE_cpp_style_line_directive";