summaryrefslogtreecommitdiffstats
path: root/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-04-06 16:02:47 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-04-06 16:02:47 +0000
commita462dc6c35b92a7e04ab7f4f3d19dca863587b61 (patch)
tree477800c2d7aa5e36a5fc7f6d3f79e7b3255d7eaa /HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
parentChanges to comply with the updated API (diff)
downloadDiligentTools-a462dc6c35b92a7e04ab7f4f3d19dca863587b61.tar.gz
DiligentTools-a462dc6c35b92a7e04ab7f4f3d19dca863587b61.zip
Upgraded API Version to 240021
Diffstat (limited to 'HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp')
-rw-r--r--HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp10
1 files changed, 6 insertions, 4 deletions
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<IShaderSourceInputStreamFactory> pShaderSourceFactory;
+ pFactory->CreateDefaultShaderSourceStreamFactory(SearchDirectories.c_str(), &pShaderSourceFactory);
+
RefCntAutoPtr<IFileStream> 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<IHLSL2GLSLConversionStream> pStream;
- Converter.CreateStream(InputPath.c_str(), &BasicSSSFactory, HLSLSource, SourceLen, &pStream);
+ Converter.CreateStream(InputPath.c_str(), pShaderSourceFactory, HLSLSource, SourceLen, &pStream);
RefCntAutoPtr<Diligent::IDataBlob> pGLSLSourceBlob;
pStream->Convert(EntryPoint.c_str(), ShaderType, IncludeGLSLDefintions, "_sampler", UseInOutLocations, &pGLSLSourceBlob);
if(!pGLSLSourceBlob)return -1;