Fixed class vs struct issues. Implemented HLSL2GLSL Convertor C interfaces

5 files changed, 6 insertions, 9 deletions

diff --git a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
index a0067e3c..0b0ab051 100644
--- a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
@@ -49,7 +49,7 @@ public:
     BufferViewD3D11Impl(IReferenceCounters*    pRefCounters,
                         RenderDeviceD3D11Impl* pDevice,
                         const BufferViewDesc&  ViewDesc,
-                        class IBuffer*         pBuffer,
+                        IBuffer*               pBuffer,
                         ID3D11View*            pD3D11View,
                         bool                   bIsDefaultView);
 
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp
index ef18f9f0..4c7e2c69 100644
--- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.hpp
@@ -30,6 +30,7 @@
 /// \file
 /// Declaration of Diligent::ShaderResourceCacheD3D11 class
 
+#include "MemoryAllocator.h"
 #include "TextureBaseD3D11.hpp"
 #include "BufferD3D11Impl.hpp"
 #include "SamplerD3D11Impl.hpp"
@@ -126,9 +127,9 @@ public:
 
     static size_t GetRequriedMemorySize(const class ShaderResourcesD3D11& Resources);
 
-    void Initialize(const class ShaderResourcesD3D11& Resources, class IMemoryAllocator& MemAllocator);
-    void Initialize(Uint32 CBCount, Uint32 SRVCount, Uint32 SamplerCount, Uint32 UAVCount, class IMemoryAllocator& MemAllocator);
-    void Destroy(class IMemoryAllocator& MemAllocator);
+    void Initialize(const class ShaderResourcesD3D11& Resources, IMemoryAllocator& MemAllocator);
+    void Initialize(Uint32 CBCount, Uint32 SRVCount, Uint32 SamplerCount, Uint32 UAVCount, IMemoryAllocator& MemAllocator);
+    void Destroy(IMemoryAllocator& MemAllocator);
 
 
     __forceinline void SetCB(Uint32 Slot, RefCntAutoPtr<BufferD3D11Impl>&& pBuffD3D11Impl)
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp
index 16de0e28..a5534f3f 100644
--- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp
@@ -41,8 +41,6 @@
 namespace Diligent
 {
 
-class IMemoryAllocator;
-
 /// Diligent::ShaderResourceLayoutD3D11 class
 /// http://diligentgraphics.com/diligent-engine/architecture/d3d11/shader-resource-layout/
 // sizeof(ShaderResourceLayoutD3D11) == 64 (x64)
diff --git a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp
index f40b4b9b..34c372fc 100644
--- a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp
@@ -36,8 +36,6 @@
 namespace Diligent
 {
 
-class IMemoryAllocator;
-
 /// Swap chain implementation in Direct3D11 backend.
 class SwapChainD3D11Impl final : public SwapChainD3DBase<ISwapChainD3D11, IDXGISwapChain>
 {
diff --git a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
index 20c2afbf..dffbb87f 100644
--- a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
@@ -49,7 +49,7 @@ public:
     TextureViewD3D11Impl(IReferenceCounters*    pRefCounters,
                          RenderDeviceD3D11Impl* pDevice,
                          const TextureViewDesc& ViewDesc,
-                         class ITexture*        pTexture,
+                         ITexture*              pTexture,
                          ID3D11View*            pD3D11View,
                          bool                   bIsDefaultView);