[PATCH 1/6] wined3d: Add wined3d_shader_resource_view_desc.
Józef Kucia
jkucia at codeweavers.com
Mon Jun 6 04:39:02 CDT 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d11/view.c | 107 +++++++++++++++++++++++++++++++++++++++++++++-
dlls/wined3d/view.c | 8 ++--
dlls/wined3d/wined3d.spec | 2 +-
include/wine/wined3d.h | 39 ++++++++++++++++-
4 files changed, 149 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 11f1c67..ab14848 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -1641,9 +1641,111 @@ static const struct ID3D10ShaderResourceView1Vtbl d3d10_shader_resource_view_vtb
d3d10_shader_resource_view_GetDesc1,
};
+static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shader_resource_view_desc *wined3d_desc,
+ const D3D11_SHADER_RESOURCE_VIEW_DESC *desc)
+{
+ wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format);
+
+ switch (desc->ViewDimension)
+ {
+ case D3D11_SRV_DIMENSION_BUFFER:
+ wined3d_desc->view_type = WINED3D_VTYPE_BUFFER;
+ wined3d_desc->u.buffer.start_idx = desc->u.Buffer.u1.FirstElement;
+ wined3d_desc->u.buffer.count = desc->u.Buffer.u2.NumElements;
+ wined3d_desc->u.buffer.flags = 0;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURE1D:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_1D;
+ wined3d_desc->u.texture.level_idx = desc->u.Texture1D.MostDetailedMip;
+ wined3d_desc->u.texture.level_count = desc->u.Texture1D.MipLevels;
+ wined3d_desc->u.texture.layer_idx = 0;
+ wined3d_desc->u.texture.layer_count = 1;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURE1DARRAY:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_1D_ARRAY;
+ wined3d_desc->u.texture.level_idx = desc->u.Texture1DArray.MostDetailedMip;
+ wined3d_desc->u.texture.level_count = desc->u.Texture1DArray.MipLevels;
+ wined3d_desc->u.texture.layer_idx = desc->u.Texture1DArray.FirstArraySlice;
+ wined3d_desc->u.texture.layer_count = desc->u.Texture1DArray.ArraySize;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURE2D:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D;
+ wined3d_desc->u.texture.level_idx = desc->u.Texture2D.MostDetailedMip;
+ wined3d_desc->u.texture.level_count = desc->u.Texture2D.MipLevels;
+ wined3d_desc->u.texture.layer_idx = 0;
+ wined3d_desc->u.texture.layer_count = 1;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURE2DARRAY:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D_ARRAY;
+ wined3d_desc->u.texture.level_idx = desc->u.Texture2DArray.MostDetailedMip;
+ wined3d_desc->u.texture.level_count = desc->u.Texture2DArray.MipLevels;
+ wined3d_desc->u.texture.layer_idx = desc->u.Texture2DArray.FirstArraySlice;
+ wined3d_desc->u.texture.layer_count = desc->u.Texture2DArray.ArraySize;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURE2DMS:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D;
+ wined3d_desc->u.texture.level_idx = 0;
+ wined3d_desc->u.texture.level_count = 1;
+ wined3d_desc->u.texture.layer_idx = 0;
+ wined3d_desc->u.texture.layer_count = 1;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_2D_ARRAY;
+ wined3d_desc->u.texture.level_idx = 0;
+ wined3d_desc->u.texture.level_count = 1;
+ wined3d_desc->u.texture.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice;
+ wined3d_desc->u.texture.layer_count = desc->u.Texture2DMSArray.ArraySize;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURE3D:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_3D;
+ wined3d_desc->u.texture.level_idx = desc->u.Texture3D.MostDetailedMip;
+ wined3d_desc->u.texture.level_count = desc->u.Texture3D.MipLevels;
+ wined3d_desc->u.texture.layer_idx = 0;
+ wined3d_desc->u.texture.layer_count = 1;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURECUBE:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_CUBE;
+ wined3d_desc->u.texture.level_idx = desc->u.TextureCube.MostDetailedMip;
+ wined3d_desc->u.texture.level_count = desc->u.TextureCube.MipLevels;
+ wined3d_desc->u.texture.layer_idx = 0;
+ wined3d_desc->u.texture.layer_count = 6;
+ break;
+
+ case D3D11_SRV_DIMENSION_TEXTURECUBEARRAY:
+ wined3d_desc->view_type = WINED3D_VTYPE_TEXTURE_CUBE_ARRAY;
+ wined3d_desc->u.texture.level_idx = desc->u.TextureCubeArray.MostDetailedMip;
+ wined3d_desc->u.texture.level_count = desc->u.TextureCubeArray.MipLevels;
+ wined3d_desc->u.texture.layer_idx = desc->u.TextureCubeArray.First2DArrayFace;
+ wined3d_desc->u.texture.layer_count = 6 * desc->u.TextureCubeArray.NumCubes;
+ break;
+
+ case D3D11_SRV_DIMENSION_BUFFEREX:
+ wined3d_desc->view_type = WINED3D_VTYPE_BUFFER;
+ wined3d_desc->u.buffer.start_idx = desc->u.BufferEx.FirstElement;
+ wined3d_desc->u.buffer.count = desc->u.BufferEx.NumElements;
+ wined3d_desc->u.buffer.flags = desc->u.BufferEx.Flags;
+ break;
+
+ default:
+ WARN("Unrecognized view dimension %#x.\n", desc->ViewDimension);
+ return E_FAIL;
+ }
+
+ return S_OK;
+}
+
static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device,
ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc)
{
+ struct wined3d_shader_resource_view_desc wined3d_desc;
struct wined3d_resource *wined3d_resource;
HRESULT hr;
@@ -1662,6 +1764,9 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi
normalize_srv_desc(&view->desc, resource);
}
+ if (FAILED(hr = wined3d_shader_resource_view_desc_from_d3d11(&wined3d_desc, &view->desc)))
+ return hr;
+
wined3d_mutex_lock();
if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource)))
{
@@ -1670,7 +1775,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi
return E_FAIL;
}
- if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource,
+ if (FAILED(hr = wined3d_shader_resource_view_create(&wined3d_desc, wined3d_resource,
view, &d3d_null_wined3d_parent_ops, &view->wined3d_view)))
{
wined3d_mutex_unlock();
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 773dccf..b12edec 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -202,12 +202,14 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader
return view->parent;
}
-HRESULT CDECL wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent,
- const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view)
+HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_shader_resource_view_desc *desc,
+ struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,
+ struct wined3d_shader_resource_view **view)
{
struct wined3d_shader_resource_view *object;
- TRACE("resource %p, parent %p, parent_ops %p, view %p.\n", resource, parent, parent_ops, view);
+ TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n",
+ desc, resource, parent, parent_ops, view);
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
return E_OUTOFMEMORY;
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 3b45eea..0a00290 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -211,7 +211,7 @@
@ cdecl wined3d_shader_incref(ptr)
@ cdecl wined3d_shader_set_local_constants_float(ptr long ptr long)
-@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr ptr)
+@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr ptr ptr)
@ cdecl wined3d_shader_resource_view_decref(ptr)
@ cdecl wined3d_shader_resource_view_get_parent(ptr)
@ cdecl wined3d_shader_resource_view_incref(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index f6019c1..3ca9eeb 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -665,6 +665,18 @@ enum wined3d_resource_type
WINED3D_RTYPE_TEXTURE_3D = 3,
};
+enum wined3d_view_type
+{
+ WINED3D_VTYPE_BUFFER = 1,
+ WINED3D_VTYPE_TEXTURE_1D = 2,
+ WINED3D_VTYPE_TEXTURE_1D_ARRAY = 3,
+ WINED3D_VTYPE_TEXTURE_2D = 4,
+ WINED3D_VTYPE_TEXTURE_2D_ARRAY = 5,
+ WINED3D_VTYPE_TEXTURE_3D = 6,
+ WINED3D_VTYPE_TEXTURE_CUBE = 7,
+ WINED3D_VTYPE_TEXTURE_CUBE_ARRAY = 8,
+};
+
enum wined3d_pool
{
WINED3D_POOL_DEFAULT = 0,
@@ -1942,6 +1954,28 @@ struct wined3d_shader_desc
unsigned int max_version;
};
+struct wined3d_shader_resource_view_desc
+{
+ enum wined3d_format_id format_id;
+ enum wined3d_view_type view_type;
+ union
+ {
+ struct
+ {
+ unsigned int start_idx;
+ unsigned int count;
+ unsigned int flags;
+ } buffer;
+ struct
+ {
+ unsigned int level_idx;
+ unsigned int level_count;
+ unsigned int layer_idx;
+ unsigned int layer_count;
+ } texture;
+ } u;
+};
+
struct wined3d_output_desc
{
WCHAR device_name[CCHDEVICENAME];
@@ -2417,8 +2451,9 @@ ULONG __cdecl wined3d_shader_incref(struct wined3d_shader *shader);
HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *shader,
UINT start_idx, const float *src_data, UINT vector4f_count);
-HRESULT __cdecl wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent,
- const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view);
+HRESULT __cdecl wined3d_shader_resource_view_create(const struct wined3d_shader_resource_view_desc *desc,
+ struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops,
+ struct wined3d_shader_resource_view **view);
ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view);
void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view);
ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view);
--
2.7.3
More information about the wine-patches
mailing list