[PATCH 2/5] d3d11: Implement d3d10_device_CreateShaderResourceView1().
Józef Kucia
jkucia at codeweavers.com
Sun Oct 18 18:41:59 CDT 2015
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d11/device.c | 48 ++++++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 981266f..06cf085 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -32,6 +32,9 @@ const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
d3d_null_wined3d_object_destroyed,
};
+static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10Device1 *iface,
+ ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC1 *desc, ID3D10ShaderResourceView1 **view);
+
/* ID3D11DeviceContext - immediate context methods */
static inline struct d3d11_immediate_context *impl_from_ID3D11DeviceContext(ID3D11DeviceContext *iface)
@@ -3383,28 +3386,10 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface,
ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view)
{
- struct d3d_device *device = impl_from_ID3D10Device(iface);
- struct d3d_shader_resource_view *object;
- ID3D11Resource *d3d11_resource;
- HRESULT hr;
-
TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
- if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource)))
- {
- ERR("Resource does not implement ID3D11Resource.\n");
- return E_FAIL;
- }
-
- hr = d3d_shader_resource_view_create(device, d3d11_resource, (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc,
- &object);
- ID3D11Resource_Release(d3d11_resource);
- if (FAILED(hr))
- return hr;
-
- *view = (ID3D10ShaderResourceView *)&object->ID3D10ShaderResourceView1_iface;
-
- return S_OK;
+ return d3d10_device_CreateShaderResourceView1(iface, resource,
+ (const D3D10_SHADER_RESOURCE_VIEW_DESC1 *)desc, (ID3D10ShaderResourceView1 **)view);
}
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device1 *iface,
@@ -3787,9 +3772,28 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10Device1 *iface,
ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC1 *desc, ID3D10ShaderResourceView1 **view)
{
- FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view);
+ struct d3d_device *device = impl_from_ID3D10Device(iface);
+ struct d3d_shader_resource_view *object;
+ ID3D11Resource *d3d11_resource;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
+
+ if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource)))
+ {
+ ERR("Resource does not implement ID3D11Resource.\n");
+ return E_FAIL;
+ }
+
+ hr = d3d_shader_resource_view_create(device, d3d11_resource, (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc,
+ &object);
+ ID3D11Resource_Release(d3d11_resource);
+ if (FAILED(hr))
+ return hr;
+
+ *view = &object->ID3D10ShaderResourceView1_iface;
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface,
--
2.4.10
More information about the wine-patches
mailing list