diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-07 04:53:34 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-07 04:53:34 +0000 |
| commit | 0c99ee543ef936ef770f4b11fa77e08c2f736c1b (patch) | |
| tree | 9ca3812fd317e3366f975b74e8c67b8cb928fc89 /Graphics/GLSLTools | |
| parent | Added workaround for inteface type mismatch error in GS references VK (diff) | |
| download | DiligentCore-0c99ee543ef936ef770f4b11fa77e08c2f736c1b.tar.gz DiligentCore-0c99ee543ef936ef770f4b11fa77e08c2f736c1b.zip | |
Improved device feature reporting; added flags for query support
Diffstat (limited to 'Graphics/GLSLTools')
| -rw-r--r-- | Graphics/GLSLTools/src/GLSLSourceBuilder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp index 000f660a..8d5f62bd 100644 --- a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp +++ b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp @@ -94,7 +94,7 @@ String BuildGLSLSourceString(const ShaderCreateInfo& CreationAttribs, UNEXPECTED("Unexpected device type"); } - if (deviceCaps.bSeparableProgramSupported && !IsES31OrAbove) + if (deviceCaps.Features.SeparablePrograms && !IsES31OrAbove) GLSLSource.append("#extension GL_EXT_separate_shader_objects : enable\n"); if (deviceCaps.TexCaps.bCubemapArraysSupported && !IsES32OrAbove) @@ -172,7 +172,7 @@ String BuildGLSLSourceString(const ShaderCreateInfo& CreationAttribs, ); // clang-format on } - if (deviceCaps.bComputeShadersSupported) + if (deviceCaps.Features.ComputeShaders) { GLSLSource.append( "precision highp image2D;\n" @@ -200,7 +200,7 @@ String BuildGLSLSourceString(const ShaderCreateInfo& CreationAttribs, } } - if (IsES30 && deviceCaps.bSeparableProgramSupported && ShaderType == SHADER_TYPE_VERTEX) + if (IsES30 && deviceCaps.Features.SeparablePrograms && ShaderType == SHADER_TYPE_VERTEX) { // From https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_separate_shader_objects.gles.txt: // @@ -325,7 +325,7 @@ String BuildGLSLSourceString(const ShaderCreateInfo& CreationAttribs, // all shader stages. // https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_separate_shader_objects.txt // (search for "Input Layout Qualifiers" and "Output Layout Qualifiers"). - Attribs.UseInOutLocationQualifiers = deviceCaps.bSeparableProgramSupported; + Attribs.UseInOutLocationQualifiers = deviceCaps.Features.SeparablePrograms; auto ConvertedSource = Converter.Convert(Attribs); GLSLSource.append(ConvertedSource); |