Upgraded API Version to 240021

2 files changed, 9 insertions, 7 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;
diff --git a/RenderScript/src/ShaderParser.cpp b/RenderScript/src/ShaderParser.cpp
index 3ca4981..9f3b1e8 100644
--- a/RenderScript/src/ShaderParser.cpp
+++ b/RenderScript/src/ShaderParser.cpp
@@ -23,7 +23,6 @@
 
 #include "pch.h"
 #include "ShaderParser.h"
-#include "BasicShaderSourceStreamFactory.h"
 
 namespace Diligent
 {
@@ -96,8 +95,9 @@ namespace Diligent
         ShaderCreateInfoWrapper ShaderCreationAttrs;
         ParseLuaTable( L, -1, &ShaderCreationAttrs, m_Bindings );
 
-        BasicShaderSourceStreamFactory BasicSSSFactory(ShaderCreationAttrs.SearchDirectories);
-        ShaderCreationAttrs.pShaderSourceStreamFactory = &BasicSSSFactory;
+        RefCntAutoPtr<IShaderSourceInputStreamFactory> pShaderSourceFactory;
+        m_pRenderDevice->GetEngineFactory()->CreateDefaultShaderSourceStreamFactory(ShaderCreationAttrs.SearchDirectories, &pShaderSourceFactory);
+        ShaderCreationAttrs.pShaderSourceStreamFactory = pShaderSourceFactory;
 
         CHECK_LUA_STACK_HEIGHT();