From 900dc223916d3590522b633f93914e8f5d6e1d6e Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Thu, 7 Mar 2019 20:15:47 -0800
Subject: Added IShaderResourceVariableD3D interface plus fixed some include
 paths

---
 Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h  | 10 ++++++++--
 Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'Graphics/GraphicsEngineD3D12')

diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h
index e379eeda..69cc3829 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h
@@ -59,6 +59,7 @@
 
 #include <memory>
 
+#include "ShaderResourceVariableD3D.h"
 #include "ShaderResourceLayoutD3D12.h"
 
 namespace Diligent
@@ -117,7 +118,7 @@ private:
 };
 
 // sizeof(ShaderVariableD3D12Impl) == 24 (x64)
-class ShaderVariableD3D12Impl final : public IShaderResourceVariable
+class ShaderVariableD3D12Impl final : public IShaderResourceVariableD3D
 {
 public:
     ShaderVariableD3D12Impl(ShaderVariableManagerD3D12& ParentManager,
@@ -152,7 +153,7 @@ public:
             return;
 
         *ppInterface = nullptr;
-        if (IID == IID_ShaderResourceVariable || IID == IID_Unknown)
+        if (IID == IID_ShaderResourceVariableD3D || IID == IID_ShaderResourceVariable || IID == IID_Unknown)
         {
             *ppInterface = this;
             (*ppInterface)->AddRef();
@@ -176,6 +177,11 @@ public:
     }
 
     virtual ShaderResourceDesc GetResourceDesc()const override final
+    {
+        return GetHLSLResourceDesc();
+    }
+
+    virtual HLSLShaderResourceDesc GetHLSLResourceDesc()const override final
     {
         return m_Resource.Attribs.GetHLSLResourceDesc();
     }
diff --git a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
index 03b636ff..4c2b9457 100644
--- a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
@@ -28,7 +28,7 @@
 
 #include <sstream>
 
-#include "../../Primitives/interface/Object.h"
+#include "../../../Primitives/interface/Object.h"
 #include "../../GraphicsEngine/interface/RenderDevice.h"
 #include "../../GraphicsEngine/interface/DeviceContext.h"
 #include "../../GraphicsEngine/interface/SwapChain.h"
-- 
cgit v1.2.3