August 2019 - Wine-Commits - list.winehq.org

Jacek Caban : winegcc: Use imported crt DLL instead of msvcrt if specified.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: b64187c99823156af6ff76fb74455c024fe521e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b64187c99823156af6ff76fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 6 12:24:19 2019 +0200 winegcc: Use imported crt DLL instead of msvcrt if specified. Makes winecrt0 use specified crt DLL instead of msvcrt.dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3d1817a..222c750 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -897,6 +897,7 @@ static void build(struct options* opts) const char *spec_o_name; const char *output_name, *spec_file, *lang; int generate_app_loader = 1; + const char* crt_lib = NULL; int fake_module = 0; int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN); unsigned int j; @@ -982,8 +983,15 @@ static void build(struct options* opts) strarray_add(files, strmake("-o%s", file)); break; case file_arh: - strarray_add(files, strmake("-a%s", file)); - break; + if (opts->use_msvcrt) + { + const char *p = strrchr(file, '/'); + if (p) p++; + else p = file; + if (!strncmp(p, "libmsvcr", 8) || !strncmp(p, "libucrt", 7)) crt_lib = file; + } + strarray_add(files, strmake("-a%s", file)); + break; case file_so: strarray_add(files, strmake("-s%s", file)); break; @@ -1018,8 +1026,12 @@ static void build(struct options* opts) if (!opts->nodefaultlibs) { - if (opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); add_library(opts, lib_dirs, files, "winecrt0"); + if (opts->use_msvcrt) + { + if (!crt_lib) add_library(opts, lib_dirs, files, "msvcrt"); + else strarray_add(files, strmake("-a%s", crt_lib)); + } if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel"); add_library(opts, lib_dirs, files, "kernel32"); add_library(opts, lib_dirs, files, "ntdll");

1 0

Alexandre Julliard : ntdll: Silence FIXME for LdrResolveDelayLoadedAPI().
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: 9b6d2d33102ced7724232c40a41c4fb446737a0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6d2d33102ced7724232c40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 6 17:45:18 2019 +0200 ntdll: Silence FIXME for LdrResolveDelayLoadedAPI(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 67efcaf..ae04da6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3227,7 +3227,7 @@ void* WINAPI LdrResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIP FARPROC fp; DWORD id; - FIXME("(%p, %p, %p, %p, %p, 0x%08x), partial stub\n", base, desc, dllhook, syshook, addr, flags); + TRACE( "(%p, %p, %p, %p, %p, 0x%08x)\n", base, desc, dllhook, syshook, addr, flags ); phmod = get_rva(base, desc->ModuleHandleRVA); pIAT = get_rva(base, desc->ImportAddressTableRVA);

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw4.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: da2fdc4cd35c261081521f7c486e99be7dbbe87e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da2fdc4cd35c261081521f7c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:33 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw4. 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/ddraw/tests/ddraw4.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bc58c18..7578444 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9255,11 +9255,12 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface4 *surface; + IDirectDrawSurface4 *surface, *back_buffer; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw4 *ddraw; ULONG refcount; + DDSCAPS2 caps; HRESULT hr; BOOL ret; @@ -9426,9 +9427,23 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface4_Release(back_buffer); + IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Paul Gofman : ddraw: Return DDERR_SURFACELOST from _GetAttachedSurface() if surface is lost.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: 7361c7f2cd9a398a6eab6923faad5e4a2a342238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7361c7f2cd9a398a6eab6923… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:31 2019 +0300 ddraw: Return DDERR_SURFACELOST from _GetAttachedSurface() if surface is lost. 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/ddraw/surface.c | 47 ++++++++++++++++++++++++---------------- dlls/ddraw/tests/ddraw7.c | 55 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 69 insertions(+), 33 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index cf3b31f..411267c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -757,38 +757,47 @@ static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *iface, - DDSCAPS2 *Caps, IDirectDrawSurface7 **Surface) + DDSCAPS2 *caps, IDirectDrawSurface7 **surface) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *head_surface = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *surf; DDSCAPS2 our_caps; int i; - TRACE("iface %p, caps %p, attachment %p.\n", iface, Caps, Surface); + TRACE("iface %p, caps %p, attachment %p.\n", iface, caps, surface); + + if (IDirectDrawSurface7_IsLost(&head_surface->IDirectDrawSurface7_iface) != DD_OK) + { + WARN("Surface %p is lost.\n", head_surface); + + *surface = NULL; + return DDERR_SURFACELOST; + } wined3d_mutex_lock(); - if(This->version < 7) + if(head_surface->version < 7) { /* Earlier dx apps put garbage into these members, clear them */ - our_caps.dwCaps = Caps->dwCaps; + our_caps.dwCaps = caps->dwCaps; our_caps.dwCaps2 = 0; our_caps.dwCaps3 = 0; our_caps.u1.dwCaps4 = 0; } else { - our_caps = *Caps; + our_caps = *caps; } - TRACE("(%p): Looking for caps: %x,%x,%x,%x\n", This, our_caps.dwCaps, our_caps.dwCaps2, our_caps.dwCaps3, our_caps.u1.dwCaps4); /* FIXME: Better debugging */ + TRACE("head_surface %p, looking for caps %#x, %#x, %#x, %#x.\n", head_surface, our_caps.dwCaps, + our_caps.dwCaps2, our_caps.dwCaps3, our_caps.u1.dwCaps4); /* FIXME: Better debugging */ for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { - surf = This->complex_array[i]; + surf = head_surface->complex_array[i]; if(!surf) break; - TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf, surf->surface_desc.ddsCaps.dwCaps, surf->surface_desc.ddsCaps.dwCaps2, surf->surface_desc.ddsCaps.dwCaps3, @@ -803,9 +812,9 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa * Not sure how to test this. */ - TRACE("(%p): Returning surface %p\n", This, surf); - *Surface = &surf->IDirectDrawSurface7_iface; - ddraw_surface7_AddRef(*Surface); + TRACE("head_surface %p, returning surface %p.\n", head_surface, surf); + *surface = &surf->IDirectDrawSurface7_iface; + ddraw_surface7_AddRef(*surface); wined3d_mutex_unlock(); return DD_OK; @@ -813,11 +822,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa } /* Next, look at the attachment chain */ - surf = This; + surf = head_surface; while( (surf = surf->next_attached) ) { - TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + TRACE("Surface %p, caps %#x, %#x, %#x, %#x.\n", surf, surf->surface_desc.ddsCaps.dwCaps, surf->surface_desc.ddsCaps.dwCaps2, surf->surface_desc.ddsCaps.dwCaps3, @@ -826,19 +835,19 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) { - TRACE("(%p): Returning surface %p\n", This, surf); - *Surface = &surf->IDirectDrawSurface7_iface; - ddraw_surface7_AddRef(*Surface); + TRACE("head_surface %p, returning surface %p.\n", head_surface, surf); + *surface = &surf->IDirectDrawSurface7_iface; + ddraw_surface7_AddRef(*surface); wined3d_mutex_unlock(); return DD_OK; } } - TRACE("(%p) Didn't find a valid surface\n", This); + TRACE("head_surface %p, didn't find a valid surface.\n", head_surface); wined3d_mutex_unlock(); - *Surface = NULL; + *surface = NULL; return DDERR_NOTFOUND; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 49aab66..171e6a5 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -997,6 +997,7 @@ static void test_coop_level_d3d_state(void) IDirectDraw7 *ddraw; IDirect3D7 *d3d; D3DCOLOR color; + DDSCAPS2 caps; DWORD value; HWND window; HRESULT hr; @@ -1010,44 +1011,63 @@ static void test_coop_level_d3d_state(void) } hr = IDirect3DDevice7_GetRenderTarget(device, &rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice7_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D7_Release(d3d); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(rt); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_ZBUFFER; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + caps.dwCaps = DDSCAPS_FLIP; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw7_RestoreAllSurfaces(ddraw); - ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + caps.dwCaps = DDSCAPS_ZBUFFER; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); + + caps.dwCaps = DDSCAPS_FLIP; + hr = IDirectDrawSurface7_GetAttachedSurface(rt, &caps, &surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + IDirectDraw7_Release(ddraw); hr = IDirect3DDevice7_GetRenderTarget(device, &surface); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); - ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); @@ -9012,11 +9032,12 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface7 *surface; + IDirectDrawSurface7 *surface, *back_buffer; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw7 *ddraw; ULONG refcount; + DDSCAPS2 caps; HRESULT hr; BOOL ret; @@ -9186,6 +9207,12 @@ static void test_lost_device(void) hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Zebediah Figura : wineqtdecoder: Fix build.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: 0f37157bf95da146e54b9427cb2693e4dc96e965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f37157bf95da146e54b9427… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 18:10:59 2019 -0500 wineqtdecoder: Fix build. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index 1b97740..5591816 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ filter.c \ main.c \ mediatype.c \ + outputqueue.c \ pin.c \ qtdatahandler.c \ qtsplitter.c \

1 0

Henri Verbeet : wined3d: Store sRGB write control support in struct wined3d_d3d_info.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: d4fa7e4cfcfe6e2d4c2bead0d4460dbcdc77366a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4fa7e4cfcfe6e2d4c2bead0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:15 2019 +0430 wined3d: Store sRGB write control support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 31 ++++++++++++++++--------------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8e06bf2..abfa31b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3795,6 +3795,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; + d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1d8540e..ac3de3d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3902,7 +3902,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 unsigned int i; memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb)) + if (!d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb)) { static unsigned int warned = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0872b10..1e99deb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6167,7 +6167,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d break; } } - settings->sRGB_write = !gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, state->fb); + settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(context, state, state->fb); if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe4510e..a21721a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -198,21 +198,22 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; struct wined3d_ffp_attrib_ops ffp_attrib_ops; - unsigned int wined3d_creation_flags; - unsigned int xyzrhw : 1; - unsigned int emulated_flatshading : 1; - unsigned int ffp_generic_attributes : 1; - unsigned int vs_clipping : 1; - unsigned int shader_color_key : 1; - unsigned int shader_double_precision : 1; - unsigned int shader_output_interpolation : 1; - unsigned int viewport_array_index_any_shader : 1; - unsigned int texture_npot : 1; - unsigned int texture_npot_conditional : 1; - unsigned int draw_base_vertex_offset : 1; - unsigned int vertex_bgra : 1; - unsigned int texture_swizzle : 1; - unsigned int srgb_read_control : 1; + uint32_t wined3d_creation_flags; + uint32_t xyzrhw : 1; + uint32_t emulated_flatshading : 1; + uint32_t ffp_generic_attributes : 1; + uint32_t vs_clipping : 1; + uint32_t shader_color_key : 1; + uint32_t shader_double_precision : 1; + uint32_t shader_output_interpolation : 1; + uint32_t viewport_array_index_any_shader : 1; + uint32_t texture_npot : 1; + uint32_t texture_npot_conditional : 1; + uint32_t draw_base_vertex_offset : 1; + uint32_t vertex_bgra : 1; + uint32_t texture_swizzle : 1; + uint32_t srgb_read_control : 1; + uint32_t srgb_write_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Henri Verbeet : wined3d: Store sRGB read control support in struct wined3d_d3d_info.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: 60938b4e941624754fb3729f668989caf2eb6266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60938b4e941624754fb3729f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:14 2019 +0430 wined3d: Store sRGB read control support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 5f6d673..8e06bf2 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3794,6 +3794,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; + d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd68cbd..fe4510e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -212,6 +212,7 @@ struct wined3d_d3d_info unsigned int draw_base_vertex_offset : 1; unsigned int vertex_bgra : 1; unsigned int texture_swizzle : 1; + unsigned int srgb_read_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -4819,7 +4820,7 @@ static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context * unsigned int flags = texture->resource.format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); - return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + return (!context->d3d_info->srgb_read_control || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; }

1 0

Henri Verbeet : wined3d: Store clip control support in struct wined3d_d3d_info.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: e795ddb3d80d7b94d29cf97a24a01bb157b0138d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e795ddb3d80d7b94d29cf97a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:16 2019 +0430 wined3d: Store clip control support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/utils.c | 8 +++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index abfa31b..52fd685 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3796,6 +3796,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; d3d_info->srgb_read_control = !!gl_info->supported[EXT_TEXTURE_SRGB_DECODE]; d3d_info->srgb_write_control = !!gl_info->supported[ARB_FRAMEBUFFER_SRGB]; + d3d_info->clip_control = !!gl_info->supported[ARB_CLIP_CONTROL]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1e99deb..31eca98 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5392,8 +5392,8 @@ void get_modelview_matrix(const struct wined3d_context *context, const struct wi void get_projection_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) { - BOOL clip_control = context->gl_info->supported[ARB_CLIP_CONTROL]; - BOOL flip = !clip_control && context->render_offscreen; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + BOOL clip_control, flip; float center_offset; /* There are a couple of additional things we have to take into account @@ -5411,7 +5411,9 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ - if (!clip_control && context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + clip_control = d3d_info->clip_control; + flip = !clip_control && context->render_offscreen; + if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) center_offset = 63.0f / 64.0f; else center_offset = -1.0f / 64.0f; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a21721a..76a938a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -214,6 +214,7 @@ struct wined3d_d3d_info uint32_t texture_swizzle : 1; uint32_t srgb_read_control : 1; uint32_t srgb_write_control : 1; + uint32_t clip_control : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Henri Verbeet : wined3d: Store the maximum number of "compat" varyings in struct wined3d_d3d_limits.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: c3e2909fd3640dc6209c6e8bdae3ac0f384f2b0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e2909fd3640dc6209c6e8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:18 2019 +0430 wined3d: Store the maximum number of "compat" varyings in struct wined3d_d3d_limits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 20 +++++++++++++++----- dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 16 +++------------- dlls/wined3d/wined3d_private.h | 9 +++++---- 6 files changed, 26 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3e2909fd3640dc6209c…

1 0

Henri Verbeet : wined3d: Store fixed-function alpha test support in struct wined3d_d3d_info.
by Alexandre Julliard Aug. 6, 2019

Aug. 6, 2019

Module: wine Branch: master Commit: ca6cbb73e1808452b3f2a94bc99560520eeffc4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca6cbb73e1808452b3f2a94b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 6 01:41:17 2019 +0430 wined3d: Store fixed-function alpha test support in struct wined3d_d3d_info. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/shader.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 52fd685..90d9ba6 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3777,6 +3777,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe->vp_get_caps(adapter, &vertex_caps); d3d_info->xyzrhw = vertex_caps.xyzrhw; d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; + d3d_info->ffp_alpha_test = !!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; d3d_info->limits.active_light_count = vertex_caps.max_active_lights; d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ac3de3d..116dd56 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4146,7 +4146,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] && state->gl_primitive_type == GL_POINTS; - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (d3d_info->ffp_alpha_test) args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; else args->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 31eca98..1dfb170 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6226,7 +6226,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] && state->gl_primitive_type == GL_POINTS; - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (d3d_info->ffp_alpha_test) settings->alpha_test_func = WINED3D_CMP_ALWAYS - 1; else settings->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76a938a..add1f1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -202,6 +202,7 @@ struct wined3d_d3d_info uint32_t xyzrhw : 1; uint32_t emulated_flatshading : 1; uint32_t ffp_generic_attributes : 1; + uint32_t ffp_alpha_test : 1; uint32_t vs_clipping : 1; uint32_t shader_color_key : 1; uint32_t shader_double_precision : 1;

1 0