From bfa5a84d781f70abf95391ff3175cff1d9cc078a Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Tue, 28 Jan 2020 11:12:34 -0800
Subject: Fixed few issues in C interface

---
 Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h       | 1 -
 Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h       | 1 -
 Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h         | 1 -
 Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h | 6 +++---
 Graphics/GraphicsEngineVulkan/interface/DeviceContextVk.h         | 1 -
 Graphics/GraphicsEngineVulkan/interface/ShaderResourceBindingVk.h | 4 ++--
 6 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'Graphics')

diff --git a/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h b/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h
index 150aa38c..17a69beb 100644
--- a/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h
@@ -58,7 +58,6 @@ DILIGENT_INTERFACE(IDeviceContextD3D11, IDeviceContext)
 struct IDeviceContextD3D11Vtbl
 {
     struct IObjectMethods             Object;
-    struct IDeviceObjectMethods       DeviceObject;
     struct IDeviceContextMethods      DeviceContext;
     struct IDeviceContextD3D11Methods DeviceContextD3D11;
 };
diff --git a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
index 5bbbc91e..18018d94 100644
--- a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
@@ -113,7 +113,6 @@ DILIGENT_INTERFACE(IDeviceContextD3D12, IDeviceContext)
 struct IDeviceContextD3D12Vtbl
 {
     struct IObjectMethods             Object;
-    struct IDeviceObjectMethods       DeviceObject;
     struct IDeviceContextMethods      DeviceContext;
     struct IDeviceContextD3D12Methods DeviceContextD3D12;
 };
diff --git a/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h b/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
index 523c85a8..e47cb0ab 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
@@ -72,7 +72,6 @@ DILIGENT_INTERFACE(IDeviceContextGL, IDeviceContext)
 struct IDeviceContextGLVtbl
 {
     struct IObjectMethods          Object;
-    struct IDeviceObjectMethods    DeviceObject;
     struct IDeviceContextMethods   DeviceContext;
     struct IDeviceContextGLMethods DeviceContextGL;
 };
diff --git a/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h b/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
index 03c32ff4..821bef77 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
@@ -54,9 +54,9 @@ DILIGENT_INTERFACE(IShaderResourceBindingGL, IShaderResourceBinding){};
 
 struct IShaderResourceBindingGLVtbl
 {
-    struct IObjectMethods       Object;
-    struct IDeviceObjectMethods DeviceObject;
-    struct IShaderMethods       Shader;
+    struct IObjectMethods                Object;
+    struct IDeviceObjectMethods          DeviceObject;
+    struct IShaderResourceBindingMethods ShaderResourceBinding;
     //struct IShaderResourceBindingGLMethods  ShaderResourceBindingGL;
 };
 
diff --git a/Graphics/GraphicsEngineVulkan/interface/DeviceContextVk.h b/Graphics/GraphicsEngineVulkan/interface/DeviceContextVk.h
index 67183f1b..f6650410 100644
--- a/Graphics/GraphicsEngineVulkan/interface/DeviceContextVk.h
+++ b/Graphics/GraphicsEngineVulkan/interface/DeviceContextVk.h
@@ -96,7 +96,6 @@ DILIGENT_INTERFACE(IDeviceContextVk, IDeviceContext)
 struct IDeviceContextVkVtbl
 {
     struct IObjectMethods          Object;
-    struct IDeviceObjectMethods    DeviceObject;
     struct IDeviceContextMethods   DeviceContext;
     struct IDeviceContextVkMethods DeviceContextVk;
 };
diff --git a/Graphics/GraphicsEngineVulkan/interface/ShaderResourceBindingVk.h b/Graphics/GraphicsEngineVulkan/interface/ShaderResourceBindingVk.h
index 886bc73f..ae7faf16 100644
--- a/Graphics/GraphicsEngineVulkan/interface/ShaderResourceBindingVk.h
+++ b/Graphics/GraphicsEngineVulkan/interface/ShaderResourceBindingVk.h
@@ -60,10 +60,10 @@ struct IShaderResourceBindingVkVtbl
     //struct IShaderResourceBindingVkMethods ShaderResourceBindingVk;
 };
 
-struct IShaderResourceBindingVk
+typedef struct IShaderResourceBindingVk
 {
     struct IShaderResourceBindingVkVtbl* pVtbl;
-};
+} IShaderResourceBindingVk;
 
 #endif
 
-- 
cgit v1.2.3