From 5658701f7e3534df8a4a4c0fdc2bd500c60a1b2d Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 28 Jan 2020 23:29:59 -0800 Subject: Updates to comply with the new API --- HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp') diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp index 8b1bc5a..8667a80 100644 --- a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp +++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp @@ -4,14 +4,14 @@ #include #include -#include "Errors.h" -#include "HLSL2GLSLConverterImpl.h" -#include "RefCntAutoPtr.h" -#include "Errors.h" +#include "Errors.hpp" +#include "HLSL2GLSLConverterImpl.hpp" +#include "RefCntAutoPtr.hpp" +#include "Errors.hpp" #include "EngineFactoryOpenGL.h" -#include "RefCntAutoPtr.h" -#include "DataBlobImpl.h" -#include "FileWrapper.h" +#include "RefCntAutoPtr.hpp" +#include "DataBlobImpl.hpp" +#include "FileWrapper.hpp" using namespace Diligent; @@ -155,8 +155,8 @@ int main(int argc, char** argv) #if EXPLICITLY_LOAD_ENGINE_GL_DLL // Declare function pointer - GetEngineFactoryOpenGLType GetEngineFactoryOpenGL = nullptr; - if( !LoadGraphicsEngineOpenGL(GetEngineFactoryOpenGL) ) + auto GetEngineFactoryOpenGL = LoadGraphicsEngineOpenGL(); + if (GetEngineFactoryOpenGL == nullptr) { LOG_ERROR_MESSAGE("Failed to load OpenGL engine implementation"); return -1; @@ -174,7 +174,7 @@ int main(int argc, char** argv) return -1; } RefCntAutoPtr pHLSLSourceBlob( MakeNewRCObj()(0) ); - pInputFileStream->Read(pHLSLSourceBlob); + pInputFileStream->ReadBlob(pHLSLSourceBlob); auto *HLSLSource = reinterpret_cast(pHLSLSourceBlob->GetDataPtr()); auto SourceLen = static_cast( pHLSLSourceBlob->GetSize() ); -- cgit v1.2.3