wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Henri Verbeet : d3d8: Explicitly translate swap effects.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: f0970916704114c2c5e75b589e7c51d2e4ae27ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0970916704114c2c5e75b58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:16 2018 +0330 d3d8: Explicitly translate swap effects. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 615f8c7..a6363d2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -167,6 +167,24 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static D3DSWAPEFFECT d3dswapeffect_from_wined3dswapeffect(enum wined3d_swap_effect effect) +{ + switch (effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return D3DSWAPEFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return D3DSWAPEFFECT_FLIP; + case WINED3D_SWAP_EFFECT_COPY: + return D3DSWAPEFFECT_COPY; + case WINED3D_SWAP_EFFECT_COPY_VSYNC: + return D3DSWAPEFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return D3DSWAPEFFECT_FLIP; + } +} + static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) { @@ -175,7 +193,7 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; present_parameters->MultiSampleType = swapchain_desc->multisample_type; - present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil; @@ -186,6 +204,24 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; } +static enum wined3d_swap_effect wined3dswapeffect_from_d3dswapeffect(D3DSWAPEFFECT effect) +{ + switch (effect) + { + case D3DSWAPEFFECT_DISCARD: + return WINED3D_SWAP_EFFECT_DISCARD; + case D3DSWAPEFFECT_FLIP: + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + case D3DSWAPEFFECT_COPY: + return WINED3D_SWAP_EFFECT_COPY; + case D3DSWAPEFFECT_COPY_VSYNC: + return WINED3D_SWAP_EFFECT_COPY_VSYNC; + default: + FIXME("Unhandled swap effect %#x.\n", effect); + return WINED3D_SWAP_EFFECT_SEQUENTIAL; + } +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -210,7 +246,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_usage = WINED3DUSAGE_RENDERTARGET; swapchain_desc->multisample_type = present_parameters->MultiSampleType; swapchain_desc->multisample_quality = 0; /* d3d9 only */ - swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; swapchain_desc->windowed = present_parameters->Windowed; swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil;

1 0

Henri Verbeet : wined3d: Print a fixme for unimplemented swap effects during swapchain (re) creation.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: 0cf21e85a531dbdda42b11207be337fc37138421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cf21e85a531dbdda42b1120… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 15 09:53:15 2018 +0330 wined3d: Print a fixme for unimplemented swap effects during swapchain (re)creation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/swapchain.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e412272..89083fc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4797,6 +4797,11 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); + if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", swapchain_desc->swap_effect); + /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c20a692..2729df2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -777,6 +777,11 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 "Please configure the application to use double buffering (1 back buffer) if possible.\n"); } + if (desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD + && desc->swap_effect != WINED3D_SWAP_EFFECT_SEQUENTIAL + && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) + FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); + if (device->wined3d->flags & WINED3D_NO3D) swapchain->swapchain_ops = &swapchain_gdi_ops; else

1 0

Józef Kucia : libs/vkd3d-shader: Translate control point count declarations.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: vkd3d Branch: master Commit: 1fe62703070c98717186000e3b30862c78d93d95 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1fe62703070c98717186000… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:54 2018 +0100 libs/vkd3d-shader: Translate control point count declarations. 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> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5d04b58..89b1187 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5686,6 +5686,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_dcl_stream(compiler, instruction); break; case VKD3DSIH_DCL_VERTICES_OUT: + case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: vkd3d_dxbc_compiler_emit_dcl_vertices_out(compiler, instruction); break; case VKD3DSIH_DCL_INPUT_PRIMITIVE: @@ -5876,7 +5877,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_CUT_STREAM: vkd3d_dxbc_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP: + /* nothing to do */ break; default: FIXME("Unhandled instruction %#x.\n", instruction->handler_idx);

1 0

Józef Kucia : libs/vkd3d-shader: Avoid UINT.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: vkd3d Branch: master Commit: 5ea8cad967e4bf4d19488bc7840296b5ad9032e2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5ea8cad967e4bf4d19488bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:53 2018 +0100 libs/vkd3d-shader: Avoid UINT. 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> --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b3e81a4..9c43a46 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -607,7 +607,7 @@ enum vkd3d_decl_usage struct vkd3d_shader_semantic { enum vkd3d_decl_usage usage; - UINT usage_idx; + unsigned int usage_idx; enum vkd3d_shader_resource_type resource_type; enum vkd3d_data_type resource_data_type; struct vkd3d_shader_dst_param reg;

1 0

Józef Kucia : libs/vkd3d-shader: Avoid Windows data types in public API.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: vkd3d Branch: master Commit: 844c83a83734984fbe0374eaf2fe4bb226df9bbd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=844c83a83734984fbe0374e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:52 2018 +0100 libs/vkd3d-shader: Avoid Windows data types in public API. 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> --- include/vkd3d_shader.h | 26 ++- libs/vkd3d-shader/dxbc.c | 313 +++++++++++++++---------------- libs/vkd3d-shader/spirv.c | 6 +- libs/vkd3d-shader/vkd3d_shader_main.c | 46 +++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- libs/vkd3d/state.c | 35 ++-- libs/vkd3d/utils.c | 20 ++ libs/vkd3d/vkd3d_main.c | 17 +- libs/vkd3d/vkd3d_private.h | 1 + 9 files changed, 252 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=844c83a83734984fbe0…

1 0

Józef Kucia : libs/vkd3d-shader: Remove dependency on D3D12 headers.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: vkd3d Branch: master Commit: fddf86e6ea034837566e2d81ca7f8f0f0f50f70b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fddf86e6ea034837566e2d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:51 2018 +0100 libs/vkd3d-shader: Remove dependency on D3D12 headers. We would like to allow building libvkd3d-shader as a standalone library without our Direct3D translation layers. In the long term, it should be possible to build and use libvkd3d-shader without Win32 data types, Vulkan headers and libs. 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> --- include/vkd3d_shader.h | 183 +++++++++++++++++++++++++- libs/vkd3d-shader/dxbc.c | 238 +++++++++++++++++----------------- libs/vkd3d-shader/vkd3d_shader_main.c | 14 +- libs/vkd3d/state.c | 14 +- libs/vkd3d/vkd3d_main.c | 15 ++- 5 files changed, 325 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=fddf86e6ea034837566…

1 0

Józef Kucia : include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: vkd3d Branch: master Commit: 4c35737940c0487a358160355a2192dea29d8d6d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4c35737940c0487a3581603… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 15 15:43:50 2018 +0100 include: Move D3D_PRIMITIVE_TOPOLOGY to d3dcommon. 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> --- include/vkd3d_d3d12.idl | 10 ---------- include/vkd3d_d3dcommon.idl | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 2ccfa22..5bfc767 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -66,16 +66,6 @@ const UINT D3D12_SHADER_COMPONENT_MAPPING_SHIFT = 3; const UINT D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES = 1 << (D3D12_SHADER_COMPONENT_MAPPING_SHIFT * 4); -typedef enum D3D_PRIMITIVE_TOPOLOGY -{ - D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, - D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, - D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, - D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, - D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, -} D3D_PRIMITIVE_TOPOLOGY; - typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT { D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0x0, diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 1ddfce3..a874b6c 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -20,6 +20,16 @@ import "vkd3d_windows.h"; #include "vkd3d_unknown.idl" +typedef enum D3D_PRIMITIVE_TOPOLOGY +{ + D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, + D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1, + D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, +} D3D_PRIMITIVE_TOPOLOGY; + typedef enum D3D_FEATURE_LEVEL { D3D_FEATURE_LEVEL_9_1 = 0x9100,

1 0

Jeremy Newman : change width of tabs
by Jeremy Newman 15 Feb '18

15 Feb '18

Module: website Branch: master Commit: 50939cab24b6ce5a8a61e0322cae6c217c543e7e URL: https://source.winehq.org/git/website.git/?a=commit;h=50939cab24b6ce5a8a61e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Feb 15 11:22:29 2018 -0600 change width of tabs some translations wrap (KO) due to longer strings --- css/styles.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/css/styles.css b/css/styles.css index ae2481b..e0ff353 100644 --- a/css/styles.css +++ b/css/styles.css @@ -335,7 +335,6 @@ hr } #whq-tabs LI { float: left; - width: 112px; height: 28px; margin: 0px 2px 0px 2px; padding: 0px; @@ -349,9 +348,9 @@ hr #whq-tabs LI:hover { background-color: #832c2c; } #whq-tabs LI A { display: block; - width: 108px; + min-width: 110px; height: 23px; - padding-top: 3px; + padding: 3px 5px 3px 5px; font-size: 16px; color: white; text-decoration: none; }

1 0

Nikolay Sivov : comctl32/button: Fix paint handler check when theming is on.
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 389c3add0ad93f3b2180c636363b25f6c78757a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=389c3add0ad93f3b2180c636… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 14:05:15 2018 +0300 comctl32/button: Fix paint handler check when theming is on. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7184d19..6458ba1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -393,7 +393,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L theme = GetWindowTheme( hWnd ); hdc = wParam ? (HDC)wParam : BeginPaint( hWnd, &ps ); - if (theme && btnPaintFunc[btn_type]) + if (theme && btnThemedPaintFunc[btn_type]) { ButtonState drawState; UINT dtflags;

1 0

Matteo Bruni : d3d9/tests: Extend test_mipmap_gen().
by Alexandre Julliard 14 Feb '18

14 Feb '18

Module: wine Branch: master Commit: 457617d545708d08974616d6267898e7f034a0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457617d545708d08974616d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 13 01:00:45 2018 +0100 d3d9/tests: Extend test_mipmap_gen(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4b6d60e..0ffc1ae 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7065,12 +7065,12 @@ static void test_mipmap_gen(void) IDirect3DTexture9 *texture; IDirect3DSurface9 *surface; IDirect3DDevice9 *device; + unsigned int i, count; D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; BOOL renderable; ULONG refcount; - unsigned int i; DWORD levels; HWND window; HRESULT hr; @@ -7170,8 +7170,74 @@ static void test_mipmap_gen(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); levels = IDirect3DTexture9_GetLevelCount(texture); ok(levels == 1, "Got unexpected levels %u.\n", levels); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); + if (SUCCEEDED(hr)) + { + /* i.e. there is no difference between the D3D_OK and the + * D3DOK_NOAUTOGEN cases. */ + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + formats[i], D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 1, "Unexpected level count %u.\n", count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); + filter_type = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(filter_type == D3DTEXF_LINEAR, "Got unexpected filter_type %#x.\n", filter_type); + hr = IDirect3DTexture9_SetAutoGenFilterType(texture, D3DTEXF_ANISOTROPIC); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + filter_type = IDirect3DTexture9_GetAutoGenFilterType(texture); + ok(filter_type == D3DTEXF_ANISOTROPIC, "Got unexpected filter_type %#x.\n", filter_type); + IDirect3DTexture9_Release(texture); + } + } + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_WRAPANDMIP, D3DRTYPE_TEXTURE, D3DFMT_D16); + if (hr == D3D_OK) + { + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, + D3DFMT_D16, D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 7, "Unexpected level count %u.\n", count); + IDirect3DTexture9_Release(texture); + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_D16); + ok(hr == D3DOK_NOAUTOGEN, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_D16, D3DPOOL_DEFAULT, &texture, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + count = IDirect3DTexture9_GetLevelCount(texture); + ok(count == 1, "Unexpected level count %u.\n", count); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(desc.Usage == D3DUSAGE_AUTOGENMIPMAP, "Got unexpected usage %#x.\n", desc.Usage); + IDirect3DTexture9_Release(texture); + } + else + { + skip("Mipmapping not supported for D3DFMT_D16, skipping test.\n"); + } + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 64, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture9 **)&texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018