October 2015 - Wine-commits

Grazvydas Ignotas : include: Use fabsf implementation when available.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: cc902bce5bddca44f2583a00a12541dfd0d89d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc902bce5bddca44f2583a00a… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Oct 18 02:31:04 2015 +0300 include: Use fabsf implementation when available. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index a7cbcc0..4f69b88 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -120,13 +120,13 @@ float __cdecl fmodf(float, float); #define sqrtf(x) ((float)sqrt((double)(x))) #define ceilf(x) ((float)ceil((double)(x))) #define floorf(x) ((float)floor((double)(x))) +#define fabsf(x) ((float)fabs((double)(x))) #define frexpf(x) ((float)frexp((double)(x))) #define modff(x,y) ((float)modf((double)(x), (double*)(y))) #define fmodf(x,y) ((float)fmod((double)(x), (double)(y))) #endif -#define fabsf(x) ((float)fabs((double)(x))) #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) float __cdecl _hypotf(float, float);

1 0

Grazvydas Ignotas : include: Expose some more implemented math functions.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 6c63e9f5d2c5acc786df0fcfc1cd3df736beb3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c63e9f5d2c5acc786df0fcfc… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Oct 18 02:31:05 2015 +0300 include: Expose some more implemented math functions. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 4f69b88..c76fe0d 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -76,6 +76,25 @@ double __cdecl _y0(double); double __cdecl _y1(double); double __cdecl _yn(int, double); +double __cdecl cbrt(double); +double __cdecl exp2(double); +double __cdecl log2(double); +double __cdecl rint(double); +double __cdecl round(double); +double __cdecl trunc(double); + +float __cdecl cbrtf(float); +float __cdecl exp2f(float); +float __cdecl log2f(float); +float __cdecl rintf(float); +float __cdecl roundf(float); +float __cdecl truncf(float); + +long __cdecl lrint(double); +long __cdecl lrintf(float); +long __cdecl lround(double); +long __cdecl lroundf(float); + #if defined(__x86_64__) || defined(__arm__) float __cdecl sinf(float);

1 0

Gerald Pfeifer : d3d8: Adjust D3DCOLOR_ARGB to avoid shift overflow.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: ef837a9c6f1272c58116d24a0460a8bace6c3e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef837a9c6f1272c58116d24a0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 19 22:05:10 2015 +0200 d3d8: Adjust D3DCOLOR_ARGB to avoid shift overflow. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d8types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 9592544..3506805 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -38,7 +38,7 @@ #define D3DCLIPPLANE4 (1 << 4) #define D3DCLIPPLANE5 (1 << 5) -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu))) #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) #define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) #define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b)

1 0

Michael Stefaniuc : ddraw/tests: Test the return of DrawPrimitive().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: f8b306c3a89a6159d618bfbaaca1818aced41554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b306c3a89a6159d618bfbaa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 20 09:49:41 2015 +0200 ddraw/tests: Test the return of DrawPrimitive(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fc119f6..fe02396 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8690,6 +8690,7 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].pos_type | D3DFVF_DIFFUSE, tests[i].quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);

1 0

Andrey Gusev : wined3d: Recognize Radeon HD 3850 AGP.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 9d7cc0768786a2235f3a80f32dd971080dd38706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7cc0768786a2235f3a80f32… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 19 15:30:29 2015 +0300 wined3d: Recognize Radeon HD 3850 AGP. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d51432..a4ccceb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1291,6 +1291,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2600, "ATI Mobility Radeon HD 2600", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2900, "ATI Radeon HD 2900 XT", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3200, "ATI Radeon HD 3200 Graphics", DRIVER_AMD_R600, 128 }, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3850, "ATI Radeon HD 3850 AGP", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4200M, "ATI Mobility Radeon HD 4200", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4350, "ATI Radeon HD 4350", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_AMD_R600, 512 }, @@ -2019,7 +2020,7 @@ cards_amd_mesa[] = /* R600 */ {"R680", CARD_AMD_RADEON_HD2900}, {"R600", CARD_AMD_RADEON_HD2900}, - {"RV670", CARD_AMD_RADEON_HD2900}, + {"RV670", CARD_AMD_RADEON_HD3850}, {"RV635", CARD_AMD_RADEON_HD2600}, {"RV630", CARD_AMD_RADEON_HD2600}, {"RV620", CARD_AMD_RADEON_HD2350}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f4a984..d75169c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1493,6 +1493,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD2600 = 0x9581, CARD_AMD_RADEON_HD2900 = 0x9400, CARD_AMD_RADEON_HD3200 = 0x9620, + CARD_AMD_RADEON_HD3850 = 0x9515, CARD_AMD_RADEON_HD4200M = 0x9712, CARD_AMD_RADEON_HD4350 = 0x954f, CARD_AMD_RADEON_HD4600 = 0x9495,

1 0

Riccardo Bortolato : d3d9: Replace wined3d_surface_preload with wined3d_texture_preload.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 8f03c4413bcb92c60dda9d347603330ccec9b23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f03c4413bcb92c60dda9d347… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 19 19:07:29 2015 +0200 d3d9: Replace wined3d_surface_preload with wined3d_texture_preload. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index ed00f7a..9a9c838 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -176,7 +176,7 @@ static void WINAPI d3d9_surface_PreLoad(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_surface_preload(surface->wined3d_surface); + wined3d_texture_preload(surface->wined3d_texture); wined3d_mutex_unlock(); }

1 0

Riccardo Bortolato : d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: f3c69e40dce9dc764d370d18bc6d957308dba00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c69e40dce9dc764d370d18b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 19 19:07:33 2015 +0200 d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7d9f735..821aa4f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1378,7 +1378,11 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(surface_impl->wined3d_surface); + if (!(wined3d_resource = wined3d_texture_get_sub_resource(surface_impl->wined3d_texture, surface_impl->sub_resource_idx))) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } wined3d_resource_get_desc(wined3d_resource, &desc); if (desc.pool != WINED3D_POOL_DEFAULT)

1 0

Riccardo Bortolato : d3d9: Replace wined3d_surface_blt with wined3d_texture_blt in d3d9_device_StretchRect.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 1da007e75d8daf00233b344e07527a8f33df8753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da007e75d8daf00233b344e0… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 19 19:07:35 2015 +0200 d3d9: Replace wined3d_surface_blt with wined3d_texture_blt in d3d9_device_StretchRect. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 821aa4f..f8ce284 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1349,7 +1349,8 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect } } - hr = wined3d_surface_blt(dst->wined3d_surface, dst_rect, src->wined3d_surface, src_rect, 0, NULL, filter); + hr = wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, dst_rect, + src->wined3d_texture, src->sub_resource_idx, src_rect, 0, NULL, filter); if (hr == WINEDDERR_INVALIDRECT) hr = D3DERR_INVALIDCALL;

1 0

Józef Kucia : d3d11: Implement d3d10_device_CreateShaderResourceView1().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: b90215f3508b82e85951a54c7800ac660843ba81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90215f3508b82e85951a54c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:40 2015 +0200 d3d11: Implement d3d10_device_CreateShaderResourceView1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 981266f..c471810 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3380,8 +3380,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10Device1 *iface, + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC1 *desc, ID3D10ShaderResourceView1 **view) { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_shader_resource_view *object; @@ -3402,11 +3402,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev if (FAILED(hr)) return hr; - *view = (ID3D10ShaderResourceView *)&object->ID3D10ShaderResourceView1_iface; + *view = &object->ID3D10ShaderResourceView1_iface; return S_OK; } +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface, + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) +{ + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + return d3d10_device_CreateShaderResourceView1(iface, resource, + (const D3D10_SHADER_RESOURCE_VIEW_DESC1 *)desc, (ID3D10ShaderResourceView1 **)view); +} + static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { @@ -3784,14 +3793,6 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } -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); - - return E_NOTIMPL; -} - static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface, const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) {

1 0

Józef Kucia : d3d10_1/tests: Port test_create_shader_resource_view() from d3d10core.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 22c05cb59f706f59f25dce66e51f303990f9c0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c05cb59f706f59f25dce66e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:41 2015 +0200 d3d10_1/tests: Port test_create_shader_resource_view() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3d10_1/tests/Makefile.in | 5 ++ dlls/d3d10_1/tests/d3d10_1.c | 153 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+) diff --git a/configure b/configure index 900c9a6..533bf15 100755 --- a/configure +++ b/configure @@ -17353,6 +17353,7 @@ wine_fn_config_test dlls/d2d1/tests d2d1_test wine_fn_config_dll d3d10 enable_d3d10 implib wine_fn_config_test dlls/d3d10/tests d3d10_test wine_fn_config_dll d3d10_1 enable_d3d10_1 implib +wine_fn_config_test dlls/d3d10_1/tests d3d10_1_test wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib diff --git a/configure.ac b/configure.ac index de8cde5..5ab2d69 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_TEST(dlls/d2d1/tests) WINE_CONFIG_DLL(d3d10,,[implib]) WINE_CONFIG_TEST(dlls/d3d10/tests) WINE_CONFIG_DLL(d3d10_1,,[implib]) +WINE_CONFIG_TEST(dlls/d3d10_1/tests) WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) diff --git a/dlls/d3d10_1/tests/Makefile.in b/dlls/d3d10_1/tests/Makefile.in new file mode 100644 index 0000000..f6f17bd --- /dev/null +++ b/dlls/d3d10_1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = d3d10_1.dll +IMPORTS = d3d10_1 + +C_SRCS = \ + d3d10_1.c diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c new file mode 100644 index 0000000..f346cdf --- /dev/null +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -0,0 +1,153 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * Copyright 2015 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "initguid.h" +#include "d3d11.h" +#include "wine/test.h" + +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static ID3D10Device1 *create_device(D3D10_FEATURE_LEVEL1 feature_level) +{ + ID3D10Device1 *device; + + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, + &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, feature_level, D3D10_1_SDK_VERSION, + &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, + &device))) + return device; + + return NULL; +} + +static void test_create_shader_resource_view(void) +{ + D3D10_SHADER_RESOURCE_VIEW_DESC1 srv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + ID3D10ShaderResourceView1 *srview; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *texture; + ID3D10Device *tmp_device; + ID3D10Device1 *device; + ID3D10Buffer *buffer; + IUnknown *iface; + HRESULT hr; + + if (!(device = create_device(D3D10_FEATURE_LEVEL_10_1))) + { + skip("Failed to create device.\n"); + return; + } + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, NULL, &srview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D10_1_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = 0; + U(srv_desc).Buffer.ElementWidth = 64; + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp_device = NULL; + expected_refcount = refcount + 1; + ID3D10ShaderResourceView1_GetDevice(srview, &tmp_device); + ok(tmp_device == (ID3D10Device *)device, "Got unexpected device %p, expected %p.\n", tmp_device, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp_device); + + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); + IUnknown_Release(iface); + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D10ShaderResourceView1_Release(srview); + ID3D10Buffer_Release(buffer); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + + ID3D10ShaderResourceView1_GetDesc1(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D10_1_SRV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2D.MostDetailedMip); + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); + IUnknown_Release(iface); + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D10ShaderResourceView1_Release(srview); + ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +START_TEST(d3d10_1) +{ + test_create_shader_resource_view(); +}

1 0