diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-10-18 15:41:45 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-10-18 15:41:45 +0000 |
| commit | a63e7f562d6df72472aefd84f60b22954d051b28 (patch) | |
| tree | b43b7a7724829aeb439e01be9f320a39d0b4007f /HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp | |
| parent | Updated SCRIPT_PARSING_ERROR macro (diff) | |
| download | DiligentTools-a63e7f562d6df72472aefd84f60b22954d051b28.tar.gz DiligentTools-a63e7f562d6df72472aefd84f60b22954d051b28.zip | |
Added support for combined texture samplers
Diffstat (limited to 'HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp')
| -rw-r--r-- | HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp index 635ec8d..550569f 100644 --- a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp +++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp @@ -171,7 +171,7 @@ int main(int argc, char** argv) RefCntAutoPtr<IHLSL2GLSLConversionStream> pStream; Converter.CreateStream(InputPath.c_str(), &BasicSSSFactory, HLSLSource, SourceLen, &pStream); RefCntAutoPtr<Diligent::IDataBlob> pGLSLSourceBlob; - pStream->Convert(EntryPoint.c_str(), ShaderType, IncludeGLSLDefintions, &pGLSLSourceBlob); + pStream->Convert(EntryPoint.c_str(), ShaderType, IncludeGLSLDefintions, "_sampler", &pGLSLSourceBlob); if(!pGLSLSourceBlob)return -1; LOG_INFO_MESSAGE("Done"); @@ -233,6 +233,7 @@ int main(int argc, char** argv) Attrs.Desc.Name = "Test shader"; Attrs.Source = reinterpret_cast<char*>(pGLSLSourceBlob->GetDataPtr()); Attrs.SourceLanguage = SHADER_SOURCE_LANGUAGE_GLSL; + Attrs.UseCombinedTextureSamplers = true; RefCntAutoPtr<IShader> pTestShader; pDevice->CreateShader(Attrs, &pTestShader); if(!pTestShader) |