From a462dc6c35b92a7e04ab7f4f3d19dca863587b61 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 6 Apr 2019 09:02:47 -0700 Subject: Upgraded API Version to 240021 --- HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp') diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp index 30b15f3..dedad47 100644 --- a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp +++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp @@ -9,9 +9,9 @@ #include "RefCntAutoPtr.h" #include "Errors.h" #include "EngineFactoryOpenGL.h" -#include "BasicShaderSourceStreamFactory.h" #include "RefCntAutoPtr.h" #include "DataBlobImpl.h" +#include "FileWrapper.h" using namespace Diligent; @@ -164,9 +164,11 @@ int main(int argc, char** argv) #endif IEngineFactoryOpenGL *pFactory = GetEngineFactoryOpenGL(); - BasicShaderSourceStreamFactory BasicSSSFactory(SearchDirectories.c_str()); + RefCntAutoPtr pShaderSourceFactory; + pFactory->CreateDefaultShaderSourceStreamFactory(SearchDirectories.c_str(), &pShaderSourceFactory); + RefCntAutoPtr pInputFileStream; - BasicSSSFactory.CreateInputStream(InputPath.c_str(), &pInputFileStream); + pShaderSourceFactory->CreateInputStream(InputPath.c_str(), &pInputFileStream); if (!pInputFileStream) { return -1; @@ -178,7 +180,7 @@ int main(int argc, char** argv) const auto &Converter = HLSL2GLSLConverterImpl::GetInstance(); RefCntAutoPtr pStream; - Converter.CreateStream(InputPath.c_str(), &BasicSSSFactory, HLSLSource, SourceLen, &pStream); + Converter.CreateStream(InputPath.c_str(), pShaderSourceFactory, HLSLSource, SourceLen, &pStream); RefCntAutoPtr pGLSLSourceBlob; pStream->Convert(EntryPoint.c_str(), ShaderType, IncludeGLSLDefintions, "_sampler", UseInOutLocations, &pGLSLSourceBlob); if(!pGLSLSourceBlob)return -1; -- cgit v1.2.3