February 2020 - Wine-commits

Paul Gofman : wined3d: Introduce wined3d_bitmap_is_set().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 84cd082495a97aafab7545b75b66c0d409510c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cd082495a97aafab7545b7… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 18 20:40:03 2020 +0330 wined3d: Introduce wined3d_bitmap_is_set(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 +--- dlls/wined3d/device.c | 43 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 14ca883e76..c39694f441 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -807,9 +807,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader for (i = 0; i < shader->limits->constant_float; ++i) { - DWORD idx = i >> 5; - DWORD shift = i & 0x1f; - if (reg_maps->constf[idx] & (1u << shift)) + if (wined3d_bitmap_is_set(reg_maps->constf, i)) highest_constf = i; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8405643741..d709ca189c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3836,19 +3836,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + const struct wined3d_saved_states *changed = &stateblock->changed; unsigned int i, j, count; TRACE("device %p, stateblock %p.\n", device, stateblock); - if (stateblock->changed.vertexShader) + if (changed->vertexShader) wined3d_device_set_vertex_shader(device, state->vs); - if (stateblock->changed.pixelShader) + if (changed->pixelShader) wined3d_device_set_pixel_shader(device, state->ps); count = 0; for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) { - if (stateblock->changed.vs_consts_f[i]) + if (changed->vs_consts_f[i]) ++count; else if (count) { @@ -3862,7 +3863,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) { - if (stateblock->changed.vertexShaderConstantsB & (1u << i)) + if (changed->vertexShaderConstantsB & (1u << i)) ++count; else if (count) { @@ -3876,7 +3877,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) { - if (stateblock->changed.vertexShaderConstantsI & (1u << i)) + if (changed->vertexShaderConstantsI & (1u << i)) ++count; else if (count) { @@ -3890,7 +3891,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) { - if (stateblock->changed.ps_consts_f[i]) + if (changed->ps_consts_f[i]) ++count; else if (count) { @@ -3904,7 +3905,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_B; ++i) { - if (stateblock->changed.pixelShaderConstantsB & (1u << i)) + if (changed->pixelShaderConstantsB & (1u << i)) ++count; else if (count) { @@ -3918,7 +3919,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i) { - if (stateblock->changed.pixelShaderConstantsI & (1u << i)) + if (changed->pixelShaderConstantsI & (1u << i)) ++count; else if (count) { @@ -3942,7 +3943,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(state->rs); ++i) { - if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + if (wined3d_bitmap_is_set(changed->renderState, i)) { if (i == WINED3D_RS_BLENDFACTOR) { @@ -3959,7 +3960,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) { - if (stateblock->changed.textureState[i] & (1u << j)) + if (changed->textureState[i] & (1u << j)) wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); } } @@ -3971,35 +3972,35 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) { - if (stateblock->changed.samplerState[i] & (1 << j)) + if (changed->samplerState[i] & (1 << j)) wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); } } for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) { - if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + if (wined3d_bitmap_is_set(changed->transform, i)) wined3d_device_set_transform(device, i, &state->transforms[i]); } - if (stateblock->changed.indices) + if (changed->indices) wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); wined3d_device_set_base_vertex_index(device, state->base_vertex_index); - if (stateblock->changed.vertexDecl) + if (changed->vertexDecl) wined3d_device_set_vertex_declaration(device, state->vertex_declaration); - if (stateblock->changed.material) + if (changed->material) wined3d_device_set_material(device, &state->material); - if (stateblock->changed.viewport) + if (changed->viewport) wined3d_device_set_viewports(device, 1, &state->viewport); - if (stateblock->changed.scissorRect) + if (changed->scissorRect) wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); for (i = 0; i < ARRAY_SIZE(state->streams); ++i) { - if (stateblock->changed.streamSource & (1u << i)) + if (changed->streamSource & (1u << i)) wined3d_device_set_stream_source(device, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); - if (stateblock->changed.streamFreq & (1u << i)) + if (changed->streamFreq & (1u << i)) wined3d_device_set_stream_source_freq(device, i, state->streams[i].frequency | state->streams[i].flags); } @@ -4009,13 +4010,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, DWORD stage = i; if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - if (stateblock->changed.textures & (1u << i)) + if (changed->textures & (1u << i)) wined3d_device_set_texture(device, stage, state->textures[i]); } for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) { - if (stateblock->changed.clipplane & (1u << i)) + if (changed->clipplane & (1u << i)) wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e1e55d52b..92634b7155 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5327,6 +5327,11 @@ static inline void wined3d_viewport_get_z_range(const struct wined3d_viewport *v *max_z = max(vp->max_z, vp->min_z + 0.001f); } +static inline BOOL wined3d_bitmap_is_set(const uint32_t *map, unsigned int idx) +{ + return map[idx >> 5] & (1u << (idx & 0x1f)); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Paul Gofman : wined3d: Support AMD alpha to coverage state.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: c736321633c6a247b406be50b1780ca0439ef8b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c736321633c6a247b406be50… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 18 20:40:04 2020 +0330 wined3d: Support AMD alpha to coverage state. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 4 +-- dlls/wined3d/device.c | 49 ++++++++++++++++++++++----- dlls/wined3d/stateblock.c | 77 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 7 +++- include/wine/wined3d.h | 1 + 5 files changed, 120 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c736321633c6a247b406…

1 0

Paul Gofman : wined3d: Support NVIDIA alpha to coverage state.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 2a913ecb69d2ddfcab9e9b049e03f0e8ad50a1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a913ecb69d2ddfcab9e9b04… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 18 20:40:05 2020 +0330 wined3d: Support NVIDIA alpha to coverage state. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/device.c | 11 ++++++++--- dlls/wined3d/stateblock.c | 17 +++++++++++------ dlls/wined3d/utils.c | 10 ++++++++++ include/wine/wined3d.h | 1 + 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3151efaf33..8db30467ee 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26604,7 +26604,7 @@ static void test_alpha_to_coverage(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); if (!adapter_is_amd(&identifier)) { - skip("Alpha to coverage is not supported.\n"); + win_skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e6ec5d098..17d71b3b1a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3842,6 +3842,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_blend_state *blend_state; struct wined3d_color colour; unsigned int i, j, count; + BOOL set_blend_state; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3945,14 +3946,18 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - if (changed->blend_state) + if ((set_blend_state = changed->blend_state + || wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_ADAPTIVETESS_Y))) { + blend_state = state->rs[WINED3D_RS_ADAPTIVETESS_Y] == WINED3DFMT_ATOC + ? device->blend_state_atoc_enabled : state->blend_state; + if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[WINED3D_RS_BLENDFACTOR]); else wined3d_device_get_blend_state(device, &colour); - wined3d_device_set_blend_state(device, state->blend_state, &colour); + wined3d_device_set_blend_state(device, blend_state, &colour); } for (i = 0; i < ARRAY_SIZE(state->rs); ++i) @@ -3966,7 +3971,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, continue; } - if (!changed->blend_state) + if (!set_blend_state) { blend_state = wined3d_device_get_blend_state(device, &colour); wined3d_color_from_d3dcolor(&colour, state->rs[i]); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4013ef90cf..d787eef0d9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1052,6 +1052,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, struct wined3d_device *device = stateblock->device; struct wined3d_blend_state *blend_state; struct wined3d_color colour; + BOOL set_blend_state; unsigned int i; DWORD map; @@ -1140,21 +1141,25 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_ps_consts_b(device, idx, 1, &stateblock->stateblock_state.ps_consts_b[idx]); } - if (stateblock->changed.blend_state) + if ((set_blend_state = stateblock->changed.blend_state + || wined3d_bitmap_is_set(stateblock->changed.renderState, WINED3D_RS_ADAPTIVETESS_Y))) { - if (stateblock->stateblock_state.blend_state) - wined3d_blend_state_incref(stateblock->stateblock_state.blend_state); + blend_state = stateblock->stateblock_state.rs[WINED3D_RS_ADAPTIVETESS_Y] == WINED3DFMT_ATOC + ? device->blend_state_atoc_enabled : stateblock->stateblock_state.blend_state; + + if (blend_state) + wined3d_blend_state_incref(blend_state); if (state->blend_state) wined3d_blend_state_decref(state->blend_state); - state->blend_state = stateblock->stateblock_state.blend_state; + state->blend_state = blend_state; if (wined3d_bitmap_is_set(stateblock->changed.renderState, WINED3D_RS_BLENDFACTOR)) wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[WINED3D_RS_BLENDFACTOR]); else wined3d_device_get_blend_state(device, &colour); - wined3d_device_set_blend_state(device, stateblock->stateblock_state.blend_state, &colour); + wined3d_device_set_blend_state(device, blend_state, &colour); } /* Render states. */ @@ -1169,7 +1174,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, continue; } - if (!stateblock->changed.blend_state) + if (!set_blend_state) { blend_state = wined3d_device_get_blend_state(device, &colour); wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[rs]); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd239d7659..f696b92214 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -65,6 +65,7 @@ format_index_remap[] = {WINED3DFMT_R16, WINED3D_FORMAT_FOURCC_BASE + 20}, {WINED3DFMT_AL16, WINED3D_FORMAT_FOURCC_BASE + 21}, {WINED3DFMT_NV12, WINED3D_FORMAT_FOURCC_BASE + 22}, + {WINED3DFMT_ATOC, WINED3D_FORMAT_FOURCC_BASE + 23}, }; #define WINED3D_FORMAT_COUNT (WINED3D_FORMAT_FOURCC_BASE + ARRAY_SIZE(format_index_remap)) @@ -135,6 +136,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {WINED3DFMT_ATOC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, {WINED3DFMT_RESZ, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -339,6 +341,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_INST, WINED3DFMT_FLAG_EXTENSION}, {WINED3DFMT_NULL, WINED3DFMT_FLAG_EXTENSION}, {WINED3DFMT_NVDB, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_ATOC, WINED3DFMT_FLAG_EXTENSION}, {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, }; @@ -3673,6 +3676,12 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format_set_flag(&format->f, WINED3DFMT_FLAG_TEXTURE); } + if (gl_info->supported[ARB_MULTISAMPLE]) + { + format = get_format_gl_internal(adapter, WINED3DFMT_ATOC); + format_set_flag(&format->f, WINED3DFMT_FLAG_TEXTURE); + } + /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ * support by checking for availability of MAKEFOURCC('R','E','S','Z') surfaces with * RENDERTARGET usage. */ @@ -4591,6 +4600,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); FMT_TO_STR(WINED3DFMT_NV12); + FMT_TO_STR(WINED3DFMT_ATOC); #undef FMT_TO_STR default: { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d48241abed..fa5682e5bd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -269,6 +269,7 @@ enum wined3d_format_id WINED3DFMT_NV12 = WINEMAKEFOURCC('N','V','1','2'), WINED3DFMT_DF16 = WINEMAKEFOURCC('D','F','1','6'), WINED3DFMT_DF24 = WINEMAKEFOURCC('D','F','2','4'), + WINED3DFMT_ATOC = WINEMAKEFOURCC('A','T','O','C'), WINED3DFMT_FORCE_DWORD = 0xffffffff };

1 0

Paul Gofman : d3d9/tests: Test alpha to coverage state capture.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: aff810578d8b58babda24c11ad1ffab350bf2de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff810578d8b58babda24c11… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 18 20:40:06 2020 +0330 d3d9/tests: Test alpha to coverage state capture. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8db30467ee..7379d5db5a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26560,6 +26560,7 @@ static void test_alpha_to_coverage(void) D3DADAPTER_IDENTIFIER9 identifier; struct surface_readback rb; IDirect3DTexture9 *texture; + IDirect3DStateBlock9 *sb; IDirect3DDevice9 *device; DWORD quality_levels; BOOL nvidia_mode; @@ -26669,6 +26670,9 @@ static void test_alpha_to_coverage(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_VERTEXSTATE, &sb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fill_surface(surface, 0x40608000, 0); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); @@ -26705,6 +26709,23 @@ static void test_alpha_to_coverage(void) ok(colour == 0x40608000, "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff2000ff, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DStateBlock9_Apply(sb); + IDirect3DStateBlock9_Release(sb); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_StretchRect(device, ms_rt, NULL, rt, NULL, D3DTEXF_POINT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + get_rt_readback(rt, &rb); + colour = get_readback_color(&rb, 64, 64); + ok(color_match(colour, 0x9f404080, 1) || color_match(colour, 0x9f485cbc, 1) /* Nvidia */, + "Got unexpected colour %08x.\n", colour); + release_surface_readback(&rb); + hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Paul Gofman : d3d9/tests: Do not use NVIDIA mode in test_alpha_to_coverage() if the reported GPU is AMD.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: ddd5dbd8e945934c619ea290f3a4618b8a5c4412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd5dbd8e945934c619ea290… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 18 20:40:07 2020 +0330 d3d9/tests: Do not use NVIDIA mode in test_alpha_to_coverage() if the reported GPU is AMD. Otherwise, if Wine exposes the ATOC format the test will always trigger the NVIDIA path regardless of the reported GPU. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7379d5db5a..cb84ef6f28 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26591,19 +26591,20 @@ static void test_alpha_to_coverage(void) return; } - if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_SURFACE, MAKEFOURCC('A','T','O','C')) == D3D_OK) + + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + if (adapter_is_amd(&identifier)) { - /* ATOC pseudo format is introduced by Nvidia. Some Intel GPUs support - * alpha to coverage the same way as Nvidia. */ - nvidia_mode = TRUE; + nvidia_mode = FALSE; } else { - nvidia_mode = FALSE; - hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (!adapter_is_amd(&identifier)) + /* The ATOC pseudo format is introduced by NVIDIA. Some Intel GPUs + * support alpha to coverage the same way as NVIDIA. */ + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, + D3DRTYPE_SURFACE, MAKEFOURCC('A','T','O','C')) != D3D_OK) { win_skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device); @@ -26612,6 +26613,7 @@ static void test_alpha_to_coverage(void) DestroyWindow(window); return; } + nvidia_mode = TRUE; } hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128,

1 0

Dmitry Timoshkov : activeds: Implement ReallocADsMem.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: e8960174644ecafc67c9115b76c075c48513d242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8960174644ecafc67c9115b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 18 19:33:38 2020 +0800 activeds: Implement ReallocADsMem. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 72cfd4d83f..e8955ee815 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -229,8 +229,7 @@ BOOL WINAPI FreeADsMem(LPVOID pMem) */ LPVOID WINAPI ReallocADsMem(LPVOID pOldMem, DWORD cbOld, DWORD cbNew) { - FIXME("(%p,%d,%d)!stub\n", pOldMem, cbOld, cbNew); - return NULL; + return HeapReAlloc(GetProcessHeap(), 0, pOldMem, cbNew); } /*****************************************************

1 0

Dmitry Timoshkov : activeds: Implement AllocADsStr and FreeADsStr.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 9692f48a31cdc750156d3b1d867d3ca9733aa5f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9692f48a31cdc750156d3b1d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 18 19:33:41 2020 +0800 activeds: Implement AllocADsStr and FreeADsStr. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds_main.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index e8955ee815..c997cab912 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -237,8 +237,18 @@ LPVOID WINAPI ReallocADsMem(LPVOID pOldMem, DWORD cbOld, DWORD cbNew) */ LPWSTR WINAPI AllocADsStr(LPWSTR pStr) { - FIXME("(%p)!stub\n",pStr); - return NULL; + LPWSTR ret; + SIZE_T len; + + TRACE("(%p)\n", pStr); + + if (!pStr) return NULL; + + len = (wcslen(pStr) + 1) * sizeof(WCHAR); + ret = AllocADsMem(len); + if (ret) memcpy(ret, pStr, len); + + return ret; } /***************************************************** @@ -246,8 +256,9 @@ LPWSTR WINAPI AllocADsStr(LPWSTR pStr) */ BOOL WINAPI FreeADsStr(LPWSTR pStr) { - FIXME("(%p)!stub\n",pStr); - return FALSE; + TRACE("(%p)\n", pStr); + + return FreeADsMem(pStr); } /*****************************************************

1 0

Roman Pišl : shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: a10267172046fc16aaa1cd1237701f6867b92fc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a10267172046fc16aaa1cd12… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Feb 16 21:10:31 2020 +0100 shell32: Avoid crash on WM_WINDOWPOSCHANGING in BrsFolderDlgProc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48510 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d71ec62099..188524d6a9 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1109,6 +1109,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, return BrsFolder_OnCreate( hWnd, (browse_info*) lParam ); info = GetPropW( hWnd, szBrowseFolderInfo ); + if (!info) + return FALSE; switch (msg) {

1 0

Zebediah Figura : d3d9: Retrieve light state from the primary stateblock.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 66f751f21c365f3857d0fa999918617a21ac9d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66f751f21c365f3857d0fa99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:52 2020 -0600 d3d9: Retrieve light state from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(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 | 10 ++++++---- dlls/wined3d/stateblock.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ac03c7e241..6f37dfddf2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2232,13 +2232,14 @@ static HRESULT WINAPI d3d9_device_SetLight(IDirect3DDevice9Ex *iface, DWORD inde static HRESULT WINAPI d3d9_device_GetLight(IDirect3DDevice9Ex *iface, DWORD index, D3DLIGHT9 *light) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + BOOL enabled; HRESULT hr; TRACE("iface %p, index %u, light %p.\n", iface, index, light); /* Note: D3DLIGHT9 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); - hr = wined3d_device_get_light(device->wined3d_device, index, (struct wined3d_light *)light); + hr = wined3d_stateblock_get_light(device->state, index, (struct wined3d_light *)light, &enabled); wined3d_mutex_unlock(); return hr; @@ -2260,15 +2261,16 @@ static HRESULT WINAPI d3d9_device_LightEnable(IDirect3DDevice9Ex *iface, DWORD i return hr; } -static HRESULT WINAPI d3d9_device_GetLightEnable(IDirect3DDevice9Ex *iface, DWORD index, BOOL *enable) +static HRESULT WINAPI d3d9_device_GetLightEnable(IDirect3DDevice9Ex *iface, DWORD index, BOOL *enabled) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_light light; HRESULT hr; - TRACE("iface %p, index %u, enable %p.\n", iface, index, enable); + TRACE("iface %p, index %u, enabled %p.\n", iface, index, enabled); wined3d_mutex_lock(); - hr = wined3d_device_get_light_enable(device->wined3d_device, index, enable); + hr = wined3d_stateblock_get_light(device->state, index, &light, enabled); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 499d23fbbd..ad1410f1bd 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1699,6 +1699,21 @@ const struct wined3d_stateblock_state * CDECL wined3d_stateblock_get_state(const return &stateblock->stateblock_state; } +HRESULT CDECL wined3d_stateblock_get_light(const struct wined3d_stateblock *stateblock, + UINT light_idx, struct wined3d_light *light, BOOL *enabled) +{ + struct wined3d_light_info *light_info; + + if (!(light_info = wined3d_light_state_get_light(&stateblock->light_state, light_idx))) + { + TRACE("Light %u is not defined.\n", light_idx); + return WINED3DERR_INVALIDCALL; + } + *light = light_info->OriginalParms; + *enabled = light_info->enabled ? 128 : 0; + return WINED3D_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8ef442c72..8538b3dcd6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_capture(ptr ptr) @ cdecl wined3d_stateblock_create(ptr ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) +@ cdecl wined3d_stateblock_get_light(ptr long ptr ptr) @ cdecl wined3d_stateblock_get_state(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_init_contained_states(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d313c7aec8..7fba4ea9f0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2726,6 +2726,8 @@ void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, const struct wined3d_stateblock *device_state, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); +HRESULT __cdecl wined3d_stateblock_get_light(const struct wined3d_stateblock *stateblock, + UINT light_idx, struct wined3d_light *light, BOOL *enabled); const struct wined3d_stateblock_state * __cdecl wined3d_stateblock_get_state(const struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock);

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetLight() and d3d9_device_LightEnable().
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: e804df72a6686f9c9a4c743e60671d5bec636307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e804df72a6686f9c9a4c743e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:53 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetLight() and d3d9_device_LightEnable(). Signed-off-by: Zebediah Figura <z.figura12(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 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6f37dfddf2..3b4c9d5277 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2222,8 +2222,6 @@ static HRESULT WINAPI d3d9_device_SetLight(IDirect3DDevice9Ex *iface, DWORD inde /* Note: D3DLIGHT9 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); hr = wined3d_stateblock_set_light(device->update_state, index, (const struct wined3d_light *)light); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light(device->wined3d_device, index, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr; @@ -2254,8 +2252,6 @@ static HRESULT WINAPI d3d9_device_LightEnable(IDirect3DDevice9Ex *iface, DWORD i wined3d_mutex_lock(); hr = wined3d_stateblock_set_light_enable(device->update_state, index, enable); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); wined3d_mutex_unlock(); return hr;

1 0