wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Józef Kucia : wined3d: Introduce wined3d_device_set_compute_shader().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: f24dee797c8ecb5c8a8a1c8c149be938c04ff8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24dee797c8ecb5c8a8a1c8c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 25 11:17:58 2017 +0100 wined3d: Introduce wined3d_device_set_compute_shader(). 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/wined3d/device.c | 17 +++++++++++++++++ dlls/wined3d/state.c | 9 ++++++--- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3a24e29..c6467f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2859,6 +2859,23 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 return device->state.sampler[WINED3D_SHADER_TYPE_GEOMETRY][idx]; } +void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + struct wined3d_shader *prev; + + TRACE("device %p, shader %p.\n", device, shader); + + prev = device->update_state->shader[WINED3D_SHADER_TYPE_COMPUTE]; + if (device->recording || shader == prev) + return; + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_COMPUTE] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_COMPUTE, shader); + if (prev) + wined3d_shader_decref(prev); +} + void CDECL wined3d_device_set_unordered_access_view(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c0bb5e..901a97c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3723,9 +3723,10 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } -static void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_GEOMETRY; + enum wined3d_shader_type shader_type = state_id - STATE_SHADER(0); + context->shader_update_mask |= 1u << shader_type; } static void shader_bumpenv(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -5176,7 +5177,8 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, - { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_geometry_shader}, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_shader }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_shader }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; @@ -5958,6 +5960,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), + STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL), diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 34b2d0a..bf41e15 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -109,6 +109,7 @@ @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) +@ cdecl wined3d_device_set_compute_shader(ptr ptr) @ cdecl wined3d_device_set_cursor_position(ptr long long long) @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) @ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7271ec0..4b0ea06 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2235,6 +2235,7 @@ HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status); +void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device,

1 0

Józef Kucia : d3d11/tests: Add optional "rect" parameter to check_texture_sub_resource_* functions.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 6e585b19cfacfd5dc5389bc6dab9fc3df49182f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e585b19cfacfd5dc5389bc6d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 25 11:17:55 2017 +0100 d3d11/tests: Add optional "rect" parameter to check_texture_sub_resource_* functions. 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/tests/d3d11.c | 134 +++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e585b19cfacfd5dc5389…

1 0

Józef Kucia : d3d11/tests: Add test for writing to UAVs.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 542d8390bcc4b41dd551769930958b9b89fe7893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542d8390bcc4b41dd55176993… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 25 11:17:54 2017 +0100 d3d11/tests: Add test for writing to UAVs. 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/tests/d3d11.c | 319 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 319 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=542d8390bcc4b41dd5517…

1 0

Nikolay Sivov : d2d1: Check for NULL pointer when releasing previous render target view.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 621675e8f889c0003e9802ad2000d3332bfe132d URL: http://source.winehq.org/git/wine.git/?a=commit;h=621675e8f889c0003e9802ad2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:47:38 2017 +0300 d2d1: Check for NULL pointer when releasing previous render target view. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 3 ++- dlls/d2d1/tests/d2d1.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0a70897..187e1e0 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -2375,7 +2375,8 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 render_target->pixel_size.width = surface_desc.Width; render_target->pixel_size.height = surface_desc.Height; - ID3D10RenderTargetView_Release(render_target->view); + if (render_target->view) + ID3D10RenderTargetView_Release(render_target->view); render_target->view = view; return S_OK; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index cde8579..5df5b6e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3129,6 +3129,7 @@ static void test_hwnd_target(void) ID2D1HwndRenderTarget *rt; ID2D1Factory *factory; ID3D10Device1 *device; + D2D1_SIZE_U size; HRESULT hr; if (!(device = create_device())) @@ -3166,6 +3167,11 @@ static void test_hwnd_target(void) hr = ID2D1Factory_CreateHwndRenderTarget(factory, &desc, &hwnd_rt_desc, &rt); ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + size.width = 128; + size.height = 64; + hr = ID2D1HwndRenderTarget_Resize(rt, &size); + ok(SUCCEEDED(hr), "Failed to resize render target, hr %#x.\n", hr); + ID2D1HwndRenderTarget_Release(rt); DestroyWindow(hwnd_rt_desc.hwnd);

1 0

Nikolay Sivov : d2d1: Fix ID2D1HwndRenderTarget::Resize() prototype.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 6ab887c057df4a11b2be8aa9eff209a2cd6b144c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab887c057df4a11b2be8aa9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 00:47:37 2017 +0300 d2d1: Fix ID2D1HwndRenderTarget::Resize() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/hwnd_render_target.c | 6 +++--- include/d2d1.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index e9092b6..4f68afd 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -672,17 +672,17 @@ static D2D1_WINDOW_STATE STDMETHODCALLTYPE d2d_hwnd_render_target_CheckWindowSta DXGI_STATUS_OCCLUDED ? D2D1_WINDOW_STATE_OCCLUDED : D2D1_WINDOW_STATE_NONE; } -static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTarget *iface, const D2D1_SIZE_U size) +static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_Resize(ID2D1HwndRenderTarget *iface, const D2D1_SIZE_U *size) { struct d2d_hwnd_render_target *render_target = impl_from_ID2D1HwndRenderTarget(iface); IDXGISurface1 *dxgi_surface; HRESULT hr; - TRACE("iface %p, width %u, height %u.\n", iface, size.width, size.height); + TRACE("iface %p, width %u, height %u.\n", iface, size->width, size->height); d2d_d3d_render_target_create_rtv(render_target->dxgi_target, NULL); - if (SUCCEEDED(hr = IDXGISwapChain_ResizeBuffers(render_target->swapchain, 1, size.width, size.height, + if (SUCCEEDED(hr = IDXGISwapChain_ResizeBuffers(render_target->swapchain, 1, size->width, size->height, DXGI_FORMAT_UNKNOWN, 0))) { if (FAILED(hr = IDXGISwapChain_GetBuffer(render_target->swapchain, 0, &IID_IDXGISurface1, diff --git a/include/d2d1.idl b/include/d2d1.idl index 7a903ca..4a62f7c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1148,7 +1148,7 @@ interface ID2D1HwndRenderTarget : ID2D1RenderTarget { D2D1_WINDOW_STATE CheckWindowState(); HRESULT Resize( - [in] const D2D1_SIZE_U size + [in] const D2D1_SIZE_U *size ); HWND GetHwnd(); }

1 0

İsmail Dönmez : d3d11.idl: Added missing D3D11_CS_* constants.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 230bda70ae4ad28d30ea80814d6a5054ac11f8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=230bda70ae4ad28d30ea80814… Author: İsmail Dönmez <ismail(a)i10z.com> Date: Wed Jan 25 15:53:25 2017 +0100 d3d11.idl: Added missing D3D11_CS_* constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 3ca697b..d2b3836 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -68,6 +68,58 @@ const INT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN = -10; const INT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE = -8; const UINT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE = 7; +const UINT D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 256; +const UINT D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP = 64; +const UINT D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 240; +const UINT D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP = 68; +const UINT D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 224; +const UINT D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP = 72; +const UINT D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 208; +const UINT D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP = 76; +const UINT D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 192; +const UINT D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP = 84; +const UINT D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 176; +const UINT D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP = 92; +const UINT D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 160; +const UINT D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP = 100; +const UINT D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 144; +const UINT D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP = 112; +const UINT D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 128; +const UINT D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP = 128; +const UINT D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 112; +const UINT D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP = 144; +const UINT D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 96; +const UINT D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP = 168; +const UINT D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 80; +const UINT D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP = 204; +const UINT D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 64; +const UINT D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP = 256; +const UINT D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 48; +const UINT D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP = 340; +const UINT D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 32; +const UINT D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP = 512; +const UINT D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 16; +const UINT D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP = 768; +const UINT D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION = 1; +const UINT D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT = 256; +const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP = 768; +const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_X = 768; +const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_Y = 768; +const UINT D3D11_CS_4_X_UAV_REGISTER_COUNT = 1; +const UINT D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION = 65535; +const UINT D3D11_CS_TGSM_REGISTER_COUNT = 8192; +const UINT D3D11_CS_TGSM_REGISTER_READS_PER_INST = 1; +const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS = 1; +const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS = 1; +const UINT D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP = 1024; +const UINT D3D11_CS_THREAD_GROUP_MAX_X = 1024; +const UINT D3D11_CS_THREAD_GROUP_MAX_Y = 1024; +const UINT D3D11_CS_THREAD_GROUP_MAX_Z = 64; +const UINT D3D11_CS_THREAD_GROUP_MIN_X = 1; +const UINT D3D11_CS_THREAD_GROUP_MIN_Y = 1; +const UINT D3D11_CS_THREAD_GROUP_MIN_Z = 1; +const UINT D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL = 16384; + const UINT D3D11_DEFAULT_DEPTH_BIAS = 0; cpp_quote("#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f") const UINT D3D11_DEFAULT_MAX_ANISOTROPY = 16;

1 0

Matteo Bruni : d3d8/tests: Add a test for DrawIndexedPrimitiveUP().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 99509cba3287eb6a1b81a9ce2a641f800a48d81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=99509cba3287eb6a1b81a9ce2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 21:35:31 2017 +0100 d3d8/tests: Add a test for DrawIndexedPrimitiveUP(). 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/d3d8/tests/visual.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index c0ecc6a..57c8917 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9700,6 +9700,108 @@ done: DestroyWindow(window); } +static void test_drawindexedprimitiveup(void) +{ + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff0000ff}, + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xff0000ff}, + + {{-1.0f, -1.0f, 0.1f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xff00ff00}, + }; + static const unsigned short indices[] = {0, 1, 2, 3, 4, 5, 6, 7}; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + D3DCOLOR color; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 4, 4, 2, indices + 4, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x0040bf00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0040bf00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00404080, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00bf4000, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x004000bf, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x004000bf, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00408040, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00bf0040, 1), "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9770,4 +9872,5 @@ START_TEST(visual) test_edge_antialiasing_blending(); test_max_index16(); test_backbuffer_resize(); + test_drawindexedprimitiveup(); }

1 0

Matteo Bruni : d3d9/tests: Add a test for DrawIndexedPrimitiveUP().
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: ea11b2752806e7467923de3c982ab2b89512697c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea11b2752806e7467923de3c9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 21:35:30 2017 +0100 d3d9/tests: Add a test for DrawIndexedPrimitiveUP(). 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/visual.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4213779..4bea1e1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22242,6 +22242,99 @@ done: DestroyWindow(window); } +static void test_drawindexedprimitiveup(void) +{ + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff0000ff}, + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xff0000ff}, + + {{-1.0f, -1.0f, 0.1f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xff00ff00}, + }; + static const unsigned short indices[] = {0, 1, 2, 3, 4, 5, 6, 7}; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCOLOR color; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 4, 4, 2, indices + 4, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x0040bf00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x0040bf00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00404080, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00bf4000, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 0, 4, 2, indices, D3DFMT_INDEX16, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x004000bf, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 120); + ok(color_match(color, 0x004000bf, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00408040, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x00bf0040, 1), "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22370,4 +22463,5 @@ START_TEST(visual) test_evict_bound_resources(); test_max_index16(); test_backbuffer_resize(); + test_drawindexedprimitiveup(); }

1 0

Matteo Bruni : d3d8: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: 76686d4cc63e29e7a86335da1070c64f671b33db URL: http://source.winehq.org/git/wine.git/?a=commit;h=76686d4cc63e29e7a86335da1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 21:35:29 2017 +0100 d3d8: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx. 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/d3d8/device.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 43b8e2b..805694b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2124,18 +2124,16 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface UINT primitive_count, const void *index_data, D3DFORMAT index_format, const void *vertex_data, UINT vertex_stride) { - struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; + UINT vtx_size = vertex_count * vertex_stride; UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; - UINT ib_pos; - - UINT vtx_size = vertex_count * vertex_stride; - UINT vb_pos, align; + UINT vb_pos, ib_pos, align; + HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", @@ -2168,7 +2166,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; @@ -2200,7 +2198,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count);

1 0

Matteo Bruni : d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx.
by Alexandre Julliard 25 Jan '17

25 Jan '17

Module: wine Branch: master Commit: bbce5af7d39c54bad156aa0754e7eb4cd03552e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbce5af7d39c54bad156aa075… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 21:35:28 2017 +0100 d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx. 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/device.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e0bc585..e646cb7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2485,18 +2485,16 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa UINT primitive_count, const void *index_data, D3DFORMAT index_format, const void *vertex_data, UINT vertex_stride) { - struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; + UINT vtx_size = vertex_count * vertex_stride; UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; - UINT ib_pos; - - UINT vtx_size = vertex_count * vertex_stride; - UINT vb_pos, align; + UINT vb_pos, ib_pos, align; + HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", @@ -2536,7 +2534,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; @@ -2568,7 +2566,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
50
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 January 2017