[PATCH 1/2] d3d11: Handle 3D textures in wined3d_resource_from_d3d10_resource().
Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 8 ++++++++ dlls/d3d11/utils.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4d9f34ea42ff..e7fd3a7f4c79 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -152,6 +152,7 @@ struct d3d_texture3d HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN; +struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) DECLSPEC_HIDDEN; /* ID3D11Buffer, ID3D10Buffer */ struct d3d_buffer diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 177c0cc93912..17fb4b1da37c 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -924,6 +924,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = d3d10_texture3d_GetDesc, }; +struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_texture3d_vtbl); + return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D10Texture3D_iface); +} + struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) { if (!iface) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index e919c58da452..c9e137c66e57 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -637,6 +637,10 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D( (ID3D10Texture2D *)resource)->wined3d_texture); + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture3D( + (ID3D10Texture3D *)resource)->wined3d_texture); + default: FIXME("Unhandled resource dimension %#x.\n", dimension); return NULL; -- 2.13.6
Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader_sm4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7c3e8b8aa53c..f3208c879c97 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -341,7 +341,7 @@ enum wined3d_sm4_register_type enum wined3d_sm4_output_primitive_type { WINED3D_SM4_OUTPUT_PT_POINTLIST = 0x1, - WINED3D_SM4_OUTPUT_PT_LINELIST = 0x3, + WINED3D_SM4_OUTPUT_PT_LINESTRIP = 0x3, WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP = 0x5, }; @@ -470,7 +470,7 @@ static const enum wined3d_primitive_type output_primitive_type_table[] = /* UNKNOWN */ WINED3D_PT_UNDEFINED, /* WINED3D_SM4_OUTPUT_PT_POINTLIST */ WINED3D_PT_POINTLIST, /* UNKNOWN */ WINED3D_PT_UNDEFINED, - /* WINED3D_SM4_OUTPUT_PT_LINELIST */ WINED3D_PT_LINELIST, + /* WINED3D_SM4_OUTPUT_PT_LINESTRIP*/ WINED3D_PT_LINESTRIP, /* UNKNOWN */ WINED3D_PT_UNDEFINED, /* WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ WINED3D_PT_TRIANGLESTRIP, }; -- 2.13.6
Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader_sm4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7c3e8b8aa53c..3963cbc6af71 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -341,7 +341,7 @@ enum wined3d_sm4_register_type enum wined3d_sm4_output_primitive_type { WINED3D_SM4_OUTPUT_PT_POINTLIST = 0x1, - WINED3D_SM4_OUTPUT_PT_LINELIST = 0x3, + WINED3D_SM4_OUTPUT_PT_LINESTRIP = 0x3, WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP = 0x5, }; @@ -470,7 +470,7 @@ static const enum wined3d_primitive_type output_primitive_type_table[] = /* UNKNOWN */ WINED3D_PT_UNDEFINED, /* WINED3D_SM4_OUTPUT_PT_POINTLIST */ WINED3D_PT_POINTLIST, /* UNKNOWN */ WINED3D_PT_UNDEFINED, - /* WINED3D_SM4_OUTPUT_PT_LINELIST */ WINED3D_PT_LINELIST, + /* WINED3D_SM4_OUTPUT_PT_LINESTRIP */ WINED3D_PT_LINESTRIP, /* UNKNOWN */ WINED3D_PT_UNDEFINED, /* WINED3D_SM4_OUTPUT_PT_TRIANGLESTRIP */ WINED3D_PT_TRIANGLESTRIP, }; -- 2.13.6
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
participants (2)
-
Henri Verbeet -
Józef Kucia