From 5b2da8d2da0a71465a5bcbc9ed4780eb8568c891 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Tue, 5 Mar 2019 20:06:31 -0800
Subject: Fixed minor issues with updated GL backend API

---
 HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp')

diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
index 3a3f566..30b15f3 100644
--- a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
+++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
@@ -8,7 +8,7 @@
 #include "HLSL2GLSLConverterImpl.h"
 #include "RefCntAutoPtr.h"
 #include "Errors.h"
-#include "RenderDeviceFactoryOpenGL.h"
+#include "EngineFactoryOpenGL.h"
 #include "BasicShaderSourceStreamFactory.h"
 #include "RefCntAutoPtr.h"
 #include "DataBlobImpl.h"
@@ -224,27 +224,27 @@ int main(int argc, char** argv)
         RefCntAutoPtr<IRenderDevice> pDevice;
         RefCntAutoPtr<IDeviceContext> pContext;
         RefCntAutoPtr<ISwapChain> pSwapChain;
-        EngineGLAttribs CreationAttribs;
+        EngineGLCreateInfo EngineCI;
         SwapChainDesc SCDesc;
         SCDesc.SamplesCount = 1;
-        CreationAttribs.pNativeWndHandle = wnd;
+        EngineCI.pNativeWndHandle = wnd;
         pFactory->CreateDeviceAndSwapChainGL(
-            CreationAttribs, &pDevice, &pContext, SCDesc, &pSwapChain );
+            EngineCI, &pDevice, &pContext, SCDesc, &pSwapChain );
         if (!pDevice)
         {
             LOG_ERROR_MESSAGE("Failed to create render device");
             return -1;
         }
 
-        ShaderCreationAttribs Attrs;
-        Attrs.EntryPoint = EntryPoint.c_str();
-        Attrs.Desc.ShaderType = ShaderType;
-        Attrs.Desc.Name = "Test shader";
-        Attrs.Source = reinterpret_cast<char*>(pGLSLSourceBlob->GetDataPtr());
-        Attrs.SourceLanguage = SHADER_SOURCE_LANGUAGE_GLSL;
-        Attrs.UseCombinedTextureSamplers = true;
+        ShaderCreateInfo ShaderCI;
+        ShaderCI.EntryPoint = EntryPoint.c_str();
+        ShaderCI.Desc.ShaderType = ShaderType;
+        ShaderCI.Desc.Name = "Test shader";
+        ShaderCI.Source = reinterpret_cast<char*>(pGLSLSourceBlob->GetDataPtr());
+        ShaderCI.SourceLanguage = SHADER_SOURCE_LANGUAGE_GLSL;
+        ShaderCI.UseCombinedTextureSamplers = true;
         RefCntAutoPtr<IShader> pTestShader;
-        pDevice->CreateShader(Attrs, &pTestShader);
+        pDevice->CreateShader(ShaderCI, &pTestShader);
         if(!pTestShader)
         {
             LOG_ERROR_MESSAGE("Failed to compile converted source \'", InputPath, '\'');
-- 
cgit v1.2.3