May 2016 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Discard the backbuffer in swapchain_gl_present() with the "discard" swap effect.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: aa475ce23fa295a8f5d0fa120d7b3dac1a5a41b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa475ce23fa295a8f5d0fa120… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 17 14:01:56 2016 +0200 wined3d: Discard the backbuffer in swapchain_gl_present() with the "discard" swap effect. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f982add..7368cda 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -606,6 +606,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE * up to date and hope WGL flipped front and back buffers and read this data into * the FBO. Don't bother about this for now. */ + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], + 0, WINED3D_LOCATION_DISCARDED); if (fb->depth_stencil) {

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc().
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 3a7271655651f1af1323dfca58c6f2a5c6494675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7271655651f1af1323dfca5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 17 14:01:55 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e0d7c80..4fb2251 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4303,11 +4303,3 @@ cpu: return surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, src_texture, src_sub_resource_idx, &src_box, flags, fx, filter); } - -/* Context activation is done by the caller. Context may be NULL in - * WINED3D_NO3D mode. */ -void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) -{ - wined3d_texture_prepare_location(surface->container, - surface_get_sub_resource_idx(surface), context, location); -} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 53dbb2f..e0bb82f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1051,7 +1051,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } else { - wined3d_surface_prepare(surface, NULL, WINED3D_LOCATION_SYSMEM); + wined3d_texture_prepare_location(texture, 0, NULL, WINED3D_LOCATION_SYSMEM); valid_location = WINED3D_LOCATION_SYSMEM; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2f6471..bf43d75 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2713,8 +2713,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; -void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, - DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i().
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: ba840a4c050554fd8f689d732e5fb8a4126dd641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba840a4c050554fd8f689d732… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:50 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 26 ++++++++++++++------------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b0ef724..0c099e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2852,7 +2852,8 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_vs_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a61e1f5..59a5c8c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2419,26 +2419,28 @@ HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_i[start_register], constants, count * sizeof(int) * 4); - for (i = 0; i < count; ++i) - TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(&device->update_state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsI |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 090faed..b648034 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -906,7 +906,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]].x, 1); + 1, &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4eb2470..3831a65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -151,7 +151,7 @@ @ cdecl wined3d_device_set_vs_cb(ptr long ptr) @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index af5cd38..31aba7a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2251,7 +2251,7 @@ HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);

1 0

Henri Verbeet : wined3d: Store pixel shader integer constants as wined3d_ivec4 structures.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: e71a360fcd0a6005953e3ef9bd3633cb1e998b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71a360fcd0a6005953e3ef9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:49 2016 +0200 wined3d: Store pixel shader integer constants as wined3d_ivec4 structures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 14 ++++---------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d75bffd..3a81a17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -595,9 +595,9 @@ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *g if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = (float)state->ps_consts_i[4 * i]; - val[1] = (float)state->ps_consts_i[4 * i + 1]; - val[2] = (float)state->ps_consts_i[4 * i + 2]; + val[0] = (float)state->ps_consts_i[i].x; + val[1] = (float)state->ps_consts_i[i].y; + val[2] = (float)state->ps_consts_i[i].z; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -4598,9 +4598,9 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, } else { - args->loop_ctrl[i][0] = state->ps_consts_i[i * 4]; - args->loop_ctrl[i][1] = state->ps_consts_i[i * 4 + 1]; - args->loop_ctrl[i][2] = state->ps_consts_i[i * 4 + 2]; + args->loop_ctrl[i][0] = state->ps_consts_i[i].x; + args->loop_ctrl[i][1] = state->ps_consts_i[i].y; + args->loop_ctrl[i][2] = state->ps_consts_i[i].z; } } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab87956..a61e1f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2657,7 +2657,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_i[start_register * 4], constants, count * sizeof(int) * 4); + memcpy(&device->update_state->ps_consts_i[start_register], constants, count * sizeof(int) * 4); for (i = 0; i < count; ++i) TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, constants[i * 4], constants[i * 4 + 1], @@ -2687,7 +2687,7 @@ HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_i[start_register * 4], count * sizeof(int) * 4); + memcpy(constants, &device->state.ps_consts_i[start_register], count * sizeof(int) * 4); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9ff2c7b..4075418 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1408,7 +1408,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_PS_I) - shader_glsl_load_constants_i(pshader, gl_info, (const struct wined3d_ivec4 *)state->ps_consts_i, + shader_glsl_load_constants_i(pshader, gl_info, state->ps_consts_i, prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d9547ea..090faed 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -673,16 +673,10 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { unsigned int idx = stateblock->contained_ps_consts_i[i]; - TRACE("Setting ps_consts_i[%u] to {%d, %d, %d, %d}.\n", idx, - src_state->ps_consts_i[idx * 4 + 0], - src_state->ps_consts_i[idx * 4 + 1], - src_state->ps_consts_i[idx * 4 + 2], - src_state->ps_consts_i[idx * 4 + 3]); - stateblock->state.ps_consts_i[idx * 4 + 0] = src_state->ps_consts_i[idx * 4 + 0]; - stateblock->state.ps_consts_i[idx * 4 + 1] = src_state->ps_consts_i[idx * 4 + 1]; - stateblock->state.ps_consts_i[idx * 4 + 2] = src_state->ps_consts_i[idx * 4 + 2]; - stateblock->state.ps_consts_i[idx * 4 + 3] = src_state->ps_consts_i[idx * 4 + 3]; + TRACE("Setting ps_consts_i[%u] to %s.\n", idx, debug_ivec4(&src_state->ps_consts_i[idx])); + + stateblock->state.ps_consts_i[idx] = src_state->ps_consts_i[idx]; } /* Pixel shader boolean constants. */ @@ -934,7 +928,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - stateblock->state.ps_consts_i + stateblock->contained_ps_consts_i[i] * 4, 1); + &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]].x, 1); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3e19ff..c2f6471 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2217,7 +2217,7 @@ struct wined3d_state struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; BOOL ps_consts_b[MAX_CONST_B]; - INT ps_consts_i[WINED3D_MAX_CONSTS_I * 4]; + struct wined3d_ivec4 ps_consts_i[WINED3D_MAX_CONSTS_I]; struct wined3d_vec4 ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS];

1 0

Józef Kucia : ddraw/tests: Test creating flippable cubemaps.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 76d4f54c558c8e3760f730247df3cd8703b806a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d4f54c558c8e3760f730247… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:29 2016 +0200 ddraw/tests: Test creating flippable cubemaps. 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/ddraw/tests/ddraw7.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 424235f..133d105 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5991,6 +5991,8 @@ static void test_flip(void) IDirectDrawSurface7 *frontbuffer, *backbuffer1, *backbuffer2, *backbuffer3, *surface; DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; DDSURFACEDESC2 surface_desc; + D3DDEVICEDESC7 device_desc; + IDirect3DDevice7 *device; BOOL sysmem_primary; IDirectDraw7 *ddraw; DWORD expected_caps; @@ -6227,6 +6229,54 @@ static void test_flip(void) IDirectDrawSurface7_Release(frontbuffer); } + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + goto done; + } + hr = IDirect3DDevice7_GetCaps(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + IDirect3DDevice7_Release(device); + if (!(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Cubemaps are not supported.\n"); + goto done; + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_TEXTURE; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + surface_desc.dwBackBufferCount = 3; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_FLIP; + surface_desc.dwFlags |= DDSD_BACKBUFFERCOUNT; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_COMPLEX; + surface_desc.ddsCaps.dwCaps |= DDSCAPS_FLIP; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.dwBackBufferCount = 1; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.dwBackBufferCount = 0; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + +done: refcount = IDirectDraw7_Release(ddraw); ok(refcount == 0, "The ddraw object was not properly freed, refcount %u.\n", refcount); DestroyWindow(window);

1 0

Henri Verbeet : wined3d: Store vertex shader integer constants as wined3d_ivec4 structures.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 43c31e68bedace55d398bae9dd3dbfd0b2fa057e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c31e68bedace55d398bae9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:48 2016 +0200 wined3d: Store vertex shader integer constants as wined3d_ivec4 structures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 14 +++++++------- dlls/wined3d/stateblock.c | 13 +++---------- dlls/wined3d/utils.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 8 ++++++++ 7 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8c23fe5..d75bffd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -625,9 +625,9 @@ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *g if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = (float)state->vs_consts_i[4 * i]; - val[1] = (float)state->vs_consts_i[4 * i + 1]; - val[2] = (float)state->vs_consts_i[4 * i + 2]; + val[0] = (float)state->vs_consts_i[i].x; + val[1] = (float)state->vs_consts_i[i].y; + val[2] = (float)state->vs_consts_i[i].z; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -4675,9 +4675,9 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, } else { - args->loop_ctrl[i][0] = state->vs_consts_i[i * 4]; - args->loop_ctrl[i][1] = state->vs_consts_i[i * 4 + 1]; - args->loop_ctrl[i][2] = state->vs_consts_i[i * 4 + 2]; + args->loop_ctrl[i][0] = state->vs_consts_i[i].x; + args->loop_ctrl[i][1] = state->vs_consts_i[i].y; + args->loop_ctrl[i][2] = state->vs_consts_i[i].z; } } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2d9fc3..ab87956 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2430,7 +2430,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_i[start_register * 4], constants, count * sizeof(int) * 4); + memcpy(&device->update_state->vs_consts_i[start_register], constants, count * sizeof(int) * 4); for (i = 0; i < count; ++i) TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, constants[i * 4], constants[i * 4 + 1], @@ -2460,7 +2460,7 @@ HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_i[start_register * 4], count * sizeof(int) * 4); + memcpy(constants, &device->state.vs_consts_i[start_register], count * sizeof(int) * 4); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c101c9f..9ff2c7b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -728,8 +728,8 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co } /* Context activation is done by the caller. */ -static void shader_glsl_load_constantsI(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const GLint locations[WINED3D_MAX_CONSTS_I], const int *constants, WORD constants_set) +static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, + const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], WORD constants_set) { unsigned int i; struct list* ptr; @@ -739,7 +739,7 @@ static void shader_glsl_load_constantsI(const struct wined3d_shader *shader, con if (!(constants_set & 1)) continue; /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i * 4])); + GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i].x)); } /* Load immediate constants */ @@ -1335,8 +1335,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_VS_I) - shader_glsl_load_constantsI(vshader, gl_info, prog->vs.uniform_i_locations, state->vs_consts_i, - vshader->reg_maps.integer_constants); + shader_glsl_load_constants_i(vshader, gl_info, state->vs_consts_i, + prog->vs.uniform_i_locations, vshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_VS_B) shader_glsl_load_constantsB(vshader, gl_info, prog->vs.uniform_b_locations, state->vs_consts_b, @@ -1408,8 +1408,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_PS_I) - shader_glsl_load_constantsI(pshader, gl_info, prog->ps.uniform_i_locations, state->ps_consts_i, - pshader->reg_maps.integer_constants); + shader_glsl_load_constants_i(pshader, gl_info, (const struct wined3d_ivec4 *)state->ps_consts_i, + prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) shader_glsl_load_constantsB(pshader, gl_info, prog->ps.uniform_b_locations, state->ps_consts_b, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b29dee4..d9547ea 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -643,16 +643,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_vs_consts_i[i]; - TRACE("Setting vs_consts[%u] to {%d, %d, %d, %d}.\n", idx, - src_state->vs_consts_i[idx * 4 + 0], - src_state->vs_consts_i[idx * 4 + 1], - src_state->vs_consts_i[idx * 4 + 2], - src_state->vs_consts_i[idx * 4 + 3]); + TRACE("Setting vs_consts[%u] to %s.\n", idx, debug_ivec4(&src_state->vs_consts_i[idx])); - stateblock->state.vs_consts_i[idx * 4 + 0] = src_state->vs_consts_i[idx * 4 + 0]; - stateblock->state.vs_consts_i[idx * 4 + 1] = src_state->vs_consts_i[idx * 4 + 1]; - stateblock->state.vs_consts_i[idx * 4 + 2] = src_state->vs_consts_i[idx * 4 + 2]; - stateblock->state.vs_consts_i[idx * 4 + 3] = src_state->vs_consts_i[idx * 4 + 3]; + stateblock->state.vs_consts_i[idx] = src_state->vs_consts_i[idx]; } /* Vertex shader boolean constants. */ @@ -919,7 +912,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - stateblock->state.vs_consts_i + stateblock->contained_vs_consts_i[i] * 4, 1); + &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]].x, 1); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 70a4b03..cbfd368 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3365,6 +3365,14 @@ const char *debug_color(const struct wined3d_color *color) color->r, color->g, color->b, color->a); } +const char *debug_ivec4(const struct wined3d_ivec4 *v) +{ + if (!v) + return "(null)"; + return wine_dbg_sprintf("{%d, %d, %d, %d}", + v->x, v->y, v->z, v->w); +} + const char *debug_vec4(const struct wined3d_vec4 *v) { if (!v) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f753b81..b3e19ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2213,7 +2213,7 @@ struct wined3d_state struct wined3d_shader_resource_view *shader_resource_view[WINED3D_SHADER_TYPE_COUNT][MAX_SHADER_RESOURCE_VIEWS]; BOOL vs_consts_b[MAX_CONST_B]; - INT vs_consts_i[WINED3D_MAX_CONSTS_I * 4]; + struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; BOOL ps_consts_b[MAX_CONST_B]; @@ -3103,6 +3103,7 @@ const char *debug_d3dpool(enum wined3d_pool pool) DECLSPEC_HIDDEN; const char *debug_fboattachment(GLenum attachment) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; +const char *debug_ivec4(const struct wined3d_ivec4 *v) DECLSPEC_HIDDEN; const char *debug_shader_type(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; const char *debug_vec4(const struct wined3d_vec4 *v) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4cfe1e0..af5cd38 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1505,6 +1505,14 @@ struct wined3d_vec4 float w; }; +struct wined3d_ivec4 +{ + int x; + int y; + int z; + int w; +}; + struct wined3d_matrix { float _11, _12, _13, _14;

1 0

Henri Verbeet : wined3d: Rename MAX_CONST_I to WINED3D_MAX_CONSTS_I.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 4f1acfebf5e730197449e3fa9d90c6197f6638fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1acfebf5e730197449e3fa9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:47 2016 +0200 wined3d: Rename MAX_CONST_I to WINED3D_MAX_CONSTS_I. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/glsl_shader.c | 10 +++++----- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 18 +++++++++--------- 5 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1acfebf5e730197449e…

1 0

Henri Verbeet : wined3d: Only allow 224 pixel shader vec4's.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 25b907697a637561a5eac3c1eb92a52976550875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b907697a637561a5eac3c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:46 2016 +0200 wined3d: Only allow 224 pixel shader vec4's. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 24 +++++------------ dlls/wined3d/cs.c | 15 +++-------- dlls/wined3d/device.c | 17 +++++------- dlls/wined3d/glsl_shader.c | 16 +++++------- dlls/wined3d/stateblock.c | 54 ++++----------------------------------- dlls/wined3d/wined3d_private.h | 9 ++++--- 6 files changed, 33 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25b907697a637561a5eac…

1 0

Michael Stefaniuc : wined3d: Initialize a RECT to avoid compiler warnings.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: f22be3afb1d9dfa4e517fe8dcd38aeb9716f5827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22be3afb1d9dfa4e517fe8dc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 16 02:48:03 2016 +0200 wined3d: Initialize a RECT to avoid compiler warnings. 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/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d1f77ca..fa33667 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -302,7 +302,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c GLbitfield clear_mask = 0; BOOL render_offscreen; unsigned int i; - RECT ds_rect; + RECT ds_rect = {0}; context = context_acquire(device, target); if (!context->valid)

1 0

Andrey Gusev : ole32: Fix a typo in comment.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: e6199d6640a67051fc9f9c24d7b969e38e0fb940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6199d6640a67051fc9f9c24d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 17 13:57:42 2016 +0300 ole32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index bdde38b..e0a3c3d 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -766,7 +766,7 @@ static HRESULT proxy_manager_construct( EnterCriticalSection(&apt->cs); /* FIXME: we are dependent on the ordering in here to make sure a proxy's - * IRemUnknown proxy doesn't get destroyed before the regual proxy does + * IRemUnknown proxy doesn't get destroyed before the regular proxy does * because we need the IRemUnknown proxy during the destruction of the * regular proxy. Ideally, we should maintain a separate list for the * IRemUnknown proxies that need late destruction */

1 0