Merge pull request #2038 from corporateshark/c_interface
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Fri, 24 Jan 2020 11:10:09 +0000 (04:10 -0700)
committerGitHub <noreply@github.com>
Fri, 24 Jan 2020 11:10:09 +0000 (04:10 -0700)
Implemented C-language interface for glslang

1  2 
glslang/MachineIndependent/Versions.h
glslang/Public/ShaderLang.h

Simple merge
@@@ -145,8 -149,8 +149,9 @@@ typedef enum 
  typedef enum {
      EShTargetVulkan_1_0 = (1 << 22),                  // Vulkan 1.0
      EShTargetVulkan_1_1 = (1 << 22) | (1 << 12),      // Vulkan 1.1
 +    EShTargetVulkan_1_2 = (1 << 22) | (2 << 12),      // Vulkan 1.2
      EShTargetOpenGL_450 = 450,                        // OpenGL
+     LAST_ELEMENT_MARKER(EShTargetClientVersionCount),
  } EShTargetClientVersion;
  
  typedef EShTargetClientVersion EshTargetClientVersion;