March 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : ddraw: Remove some outdated comments from ddraw_surface7_SetSurfaceDesc().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: fbcd01ff1f92dd566a9fa96d75c82c2287531a5e URL: https://gitlab.winehq.org/wine/wine/-/commit/fbcd01ff1f92dd566a9fa96d75c82c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 23 23:31:41 2022 -0600 ddraw: Remove some outdated comments from ddraw_surface7_SetSurfaceDesc(). --- dlls/ddraw/surface.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d7a3abc997a..9cccf89ceb5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4664,22 +4664,6 @@ static HRESULT WINAPI ddraw_surface1_SetClipper(IDirectDrawSurface *iface, IDire return ddraw_surface7_SetClipper(&surface->IDirectDrawSurface7_iface, clipper); } -/***************************************************************************** - * IDirectDrawSurface7::SetSurfaceDesc - * - * Sets the surface description. It can override the pixel format, the surface - * memory, ... - * It's not really tested. - * - * Params: - * DDSD: Pointer to the new surface description to set - * Flags: Some flags - * - * Returns: - * DD_OK on success - * DDERR_INVALIDPARAMS if DDSD is NULL - * - *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, DDSURFACEDESC2 *DDSD, DWORD Flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); @@ -4709,8 +4693,6 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDSURFACETYPE; } - /* Tests show that only LPSURFACE and PIXELFORMAT can be set, and LPSURFACE is required - * for PIXELFORMAT to work */ if (DDSD->dwFlags & ~allowed_flags) { WARN("Invalid flags %#lx set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags);

1 0

Zebediah Figura : ddraw: Rename "is_complex_root" to "is_root".
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 0fb06e8ac7eb362f28a0b029ea74c259f14fa9a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb06e8ac7eb362f28a0b029ea74c2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 17:05:40 2022 -0600 ddraw: Rename "is_complex_root" to "is_root". "is_complex_root" is somewhat misleading, given that it is TRUE for surfaces with no attached surfaces. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 09e8133350b..e3fac63a38f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -206,7 +206,7 @@ struct ddraw_surface /* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there, * but no pointer to prevent temptations to traverse it in the wrong direction. */ - unsigned int is_complex_root : 1; + unsigned int is_root : 1; unsigned int is_lost : 1; unsigned int sysmem_fallback : 1; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a7b3261fbdf..d7a3abc997a 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -579,7 +579,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; - if (!surf->is_complex_root) + if (!surf->is_root) { struct ddraw_texture *texture = wined3d_texture_get_parent(surf->wined3d_texture); struct wined3d_device *wined3d_device = texture->wined3d_device; @@ -629,7 +629,7 @@ static ULONG ddraw_surface_release_iface(struct ddraw_surface *This) /* Complex attached surfaces are destroyed implicitly when the root is released */ wined3d_mutex_lock(); - if(!This->is_complex_root) + if (!This->is_root) { WARN("(%p) Attempt to destroy a surface that is not a complex root\n", This); wined3d_mutex_unlock(); @@ -2628,7 +2628,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); hr = DDERR_INVALIDOBJECT; } - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->is_complex_root) + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->is_root) { WARN("Called on non-managed texture or non-root surface, returning DDERR_INVALIDPARAMS.\n"); hr = DDERR_INVALIDPARAMS; @@ -5001,7 +5001,7 @@ static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD } } - if (surface->is_complex_root) + if (surface->is_root) hr = ddraw_surface_set_wined3d_textures_colour_key(surface, flags, color_key ? (struct wined3d_color_key *)&fixed_color_key : NULL); @@ -6641,7 +6641,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ root = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); - root->is_complex_root = TRUE; + root->is_root = TRUE; root->sysmem_fallback = sysmem_fallback; texture->root = root; wined3d_device_incref(texture->wined3d_device = ddraw->wined3d_device);

1 0

Max Figura : wined3d: Move the WINED3D_RS_EXTENTS stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 37e206558d8c2aa408c63eaef418166aa0f2ec81 URL: https://gitlab.winehq.org/wine/wine/-/commit/37e206558d8c2aa408c63eaef41816… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 08:27:54 2022 -0600 wined3d: Move the WINED3D_RS_EXTENTS stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 8 +------- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f7602644fc2..f7c30fbe2e2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0eb7476a962..08df925a444 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4153,6 +4153,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; } + case WINED3D_RS_EXTENTS: + if (state->rs[WINED3D_RS_EXTENTS]) + FIXME("Render state WINED3D_RS_EXTENTS not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 406554a0a32..66e1574d082 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91010e73a90..c46daab3b90 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2018,12 +2018,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_extents(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_EXTENTS]) - FIXME("Render state WINED3D_RS_EXTENTS not implemented yet.\n"); -} - static void state_ckeyblend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_COLORKEYBLENDENABLE]) @@ -4657,7 +4651,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_patchedgestyle}, WINED3D_GL_EXT_NONE }, @@ -5437,6 +5430,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 135}, + {138, 138}, {149, 150}, {162, 162}, {168, 169},

1 0

Max Figura : wined3d: Move the WINED3D_RS_COLORKEYBLENDENABLE stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 916904f49f5222eee108371d8af8b38ff73e8c19 URL: https://gitlab.winehq.org/wine/wine/-/commit/916904f49f5222eee108371d8af8b3… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Tue Dec 13 08:32:32 2022 -0600 wined3d: Move the WINED3D_RS_COLORKEYBLENDENABLE stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 5 +++++ dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 8 +------- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index f7c30fbe2e2..6e46106a5e6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_nop}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 08df925a444..5d745a6e382 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4158,6 +4158,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_EXTENTS not implemented yet.\n"); break; + case WINED3D_RS_COLORKEYBLENDENABLE: + if (state->rs[WINED3D_RS_COLORKEYBLENDENABLE]) + FIXME("Render state WINED3D_RS_COLORKEYBLENDENABLE not implemented yet.\n"); + break; + default: wined3d_device_set_render_state(device, idx, state->rs[idx]); break; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 66e1574d082..0ec9570e1b6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c46daab3b90..6ef82e9be4c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2018,12 +2018,6 @@ static void state_tessellation(struct wined3d_context *context, const struct win state->render_states[WINED3D_RS_ENABLEADAPTIVETESSELLATION]); } -static void state_ckeyblend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3D_RS_COLORKEYBLENDENABLE]) - FIXME("Render state WINED3D_RS_COLORKEYBLENDENABLE not implemented yet.\n"); -} - static void state_swvp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { static int once; @@ -4651,7 +4645,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), { STATE_RENDER(WINED3D_RS_PATCHEDGESTYLE), state_patchedgestyle}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), { STATE_RENDER(WINED3D_RS_PATCHSEGMENTS), state_patchsegments }, WINED3D_GL_EXT_NONE }, @@ -5431,6 +5424,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 49, 59}, { 61, 135}, {138, 138}, + {144, 144}, {149, 150}, {162, 162}, {168, 169},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP1 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 8f2a2dfb01ff323e64d9b6e8813ccf530ebc3c09 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f2a2dfb01ff323e64d9b6e8813ccf… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:44:24 2022 -0600 wined3d: Move the WINED3D_RS_WRAP1 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index bce4e85dd31..5181d53b33d 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -99,7 +99,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, - {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b42d93c8c7..c4b335f03bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP1: case WINED3D_RS_WRAP2: case WINED3D_RS_WRAP3: case WINED3D_RS_WRAP4: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b8f495f47db..b4d1f54df30 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2812,7 +2812,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bebb35c70ce..fdc466508c7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4682,7 +4682,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5463,7 +5462,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 127}, - {130, 135}, + {129, 135}, {149, 150}, {162, 162}, {168, 169},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP0 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: fc9324f2a915609d96fd5ceea3a7312b2171aa67 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc9324f2a915609d96fd5ceea3a731… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:55:03 2022 -0600 wined3d: Move the WINED3D_RS_WRAP0 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 28 +--------------------------- 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5181d53b33d..f7602644fc2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -98,7 +98,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_INDEXBUFFER, {STATE_INDEXBUFFER, state_nop}}, {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_RENDER(WINED3D_RS_LINEPATTERN), state_nop}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c4b335f03bf..0eb7476a962 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP0: case WINED3D_RS_WRAP1: case WINED3D_RS_WRAP2: case WINED3D_RS_WRAP3: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b4d1f54df30..406554a0a32 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2811,7 +2811,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_LINEPATTERN), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_ZFUNC), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fdc466508c7..91010e73a90 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1816,30 +1816,6 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_sta } } -static void state_wrap(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - static unsigned int once; - - if ((state->render_states[WINED3D_RS_WRAP0] - || state->render_states[WINED3D_RS_WRAP1] - || state->render_states[WINED3D_RS_WRAP2] - || state->render_states[WINED3D_RS_WRAP3] - || state->render_states[WINED3D_RS_WRAP4] - || state->render_states[WINED3D_RS_WRAP5] - || state->render_states[WINED3D_RS_WRAP6] - || state->render_states[WINED3D_RS_WRAP7] - || state->render_states[WINED3D_RS_WRAP8] - || state->render_states[WINED3D_RS_WRAP9] - || state->render_states[WINED3D_RS_WRAP10] - || state->render_states[WINED3D_RS_WRAP11] - || state->render_states[WINED3D_RS_WRAP12] - || state->render_states[WINED3D_RS_WRAP13] - || state->render_states[WINED3D_RS_WRAP14] - || state->render_states[WINED3D_RS_WRAP15]) - && !once++) - FIXME("(WINED3D_RS_WRAP0) Texture wrapping not yet supported.\n"); -} - static void state_msaa_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_MULTISAMPLEANTIALIAS]) @@ -4681,7 +4657,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern }, WINED3D_GL_LEGACY_CONTEXT }, { STATE_RENDER(WINED3D_RS_LINEPATTERN), { STATE_RENDER(WINED3D_RS_LINEPATTERN), state_linepattern_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5461,8 +5436,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 39, 40}, { 42, 47}, { 49, 59}, - { 61, 127}, - {129, 135}, + { 61, 135}, {149, 150}, {162, 162}, {168, 169},

1 0

Max Figura : wined3d: Move the WINED3D_RS_WRAP2 stub to wined3d_device_apply_stateblock.
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 044371508d4a8f36d4ac8082f32d3adc8f92c00f URL: https://gitlab.winehq.org/wine/wine/-/commit/044371508d4a8f36d4ac8082f32d3a… Author: Max Figura <maxfigura5061(a)gmail.com> Date: Mon Dec 12 17:40:18 2022 -0600 wined3d: Move the WINED3D_RS_WRAP2 stub to wined3d_device_apply_stateblock. --- dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 3 +-- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1e225978db6..bce4e85dd31 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -100,7 +100,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_RENDER(WINED3D_RS_DITHERENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, - {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_RENDER(WINED3D_RS_EXTENTS), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_nop}}, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 515d31f62c7..1b42d93c8c7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4129,6 +4129,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, FIXME("Render state WINED3D_RS_TRANSLUCENTSORTINDEPENDENT not implemented yet.\n"); break; + case WINED3D_RS_WRAP2: case WINED3D_RS_WRAP3: case WINED3D_RS_WRAP4: case WINED3D_RS_WRAP5: diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a7a854c2730..b8f495f47db 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2813,7 +2813,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_DITHERENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_EXTENTS), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 77eaf29d1d3..bebb35c70ce 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4683,7 +4683,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_DITHERENABLE), { STATE_RENDER(WINED3D_RS_DITHERENABLE), state_ditherenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_EXTENTS), { STATE_RENDER(WINED3D_RS_EXTENTS), state_extents }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), { STATE_RENDER(WINED3D_RS_COLORKEYBLENDENABLE), state_ckeyblend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), { STATE_RENDER(WINED3D_RS_SOFTWAREVERTEXPROCESSING), state_swvp }, WINED3D_GL_EXT_NONE }, @@ -5464,7 +5463,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 42, 47}, { 49, 59}, { 61, 127}, - {131, 135}, + {130, 135}, {149, 150}, {162, 162}, {168, 169},

1 0

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_spirv_scan_shader().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 5925c1d1bb19e8ddd641bbcbe9a0e0a399f8ca90 URL: https://gitlab.winehq.org/wine/wine/-/commit/5925c1d1bb19e8ddd641bbcbe9a0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:59 2023 +0100 wined3d: Use wined3d_get_line() in shader_spirv_scan_shader(). --- dlls/wined3d/shader_spirv.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 7c8351453a1..1dff25cc6a6 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -202,22 +202,6 @@ static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_a } } -static const char *get_line(const char **ptr) -{ - const char *p, *q; - - p = *ptr; - if (!(q = strstr(p, "\n"))) - { - if (!*p) return NULL; - *ptr += strlen(p); - return p; - } - *ptr = q + 1; - - return p; -} - static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_shader_interface *iface, const struct shader_spirv_resource_bindings *b, const struct wined3d_stream_output_desc *so_desc) { @@ -720,11 +704,12 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader, ERR("Failed to scan shader, ret %d.\n", ret); if (messages && *messages && FIXME_ON(d3d_shader)) { - const char *ptr = messages; - const char *line; + const char *ptr, *end, *line; FIXME("Shader log:\n"); - while ((line = get_line(&ptr))) + ptr = messages; + end = ptr + strlen(ptr); + while ((line = wined3d_get_line(&ptr, end))) { FIXME(" %.*s", (int)(ptr - line), line); }

1 0

Henri Verbeet : wined3d: Don't bother explicitly terminating the GLSL info log in print_glsl_info_log().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 4144f2e864f1f54bd63fb6fe389a75b6247fd9f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4144f2e864f1f54bd63fb6fe389a75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:58 2023 +0100 wined3d: Don't bother explicitly terminating the GLSL info log in print_glsl_info_log(). --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++++-------- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 594fdf73f46..1c037b78b84 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -518,29 +518,35 @@ void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL * that if there are errors. */ if (length > 1) { - const char *ptr, *line; + const char *ptr, *end, *line; log = heap_alloc(length); - /* The info log is supposed to be zero-terminated, but at least some - * versions of fglrx don't terminate the string properly. The reported - * length does include the terminator, so explicitly set it to zero - * here. */ - log[length - 1] = 0; if (program) GL_EXTCALL(glGetProgramInfoLog(id, length, NULL, log)); else GL_EXTCALL(glGetShaderInfoLog(id, length, NULL, log)); ptr = log; + /* The info log is supposed to be zero-terminated. Note that at least + * some versions of fglrx don't terminate the string properly. The + * reported length does include the supposed terminator though, so we + * don't care here. */ + end = &ptr[length - 1]; if (gl_info->quirks & WINED3D_QUIRK_INFO_LOG_SPAM) { WARN("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) WARN(" %.*s", (int)(ptr - line), line); + while ((line = wined3d_get_line(&ptr, end))) + { + WARN(" %.*s", (int)(ptr - line), line); + } } else { FIXME("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); + while ((line = wined3d_get_line(&ptr, end))) + { + FIXME(" %.*s", (int)(ptr - line), line); + } } heap_free(log); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 425261a195e..0c8cc03738a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -74,6 +74,20 @@ static inline float int_to_float(uint32_t i) return u.f; } +static inline const char *wined3d_get_line(const char **ptr, const char *end) +{ + const char *p, *q; + + if ((p = *ptr) >= end) + return NULL; + + if (!(q = memchr(p, '\n', end - p))) + *ptr = end; + else + *ptr = q + 1; + return p; +} + #define MAKEDWORD_VERSION(maj, min) (((maj & 0xffffu) << 16) | (min & 0xffffu)) /* Driver quirks */

1 0

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_glsl_dump_program_source().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: eb31dcf04d25d3f40326fb8dde0630e7a6a6cd3b URL: https://gitlab.winehq.org/wine/wine/-/commit/eb31dcf04d25d3f40326fb8dde0630… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:59 2023 +0100 wined3d: Use wined3d_get_line() in shader_glsl_dump_program_source(). Thereby removing the last user of get_info_log_line(). --- dlls/wined3d/glsl_shader.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 69b15c7421d..451e023d5fb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -484,22 +484,6 @@ static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, shader_addline(buffer, ")"); } -static const char *get_info_log_line(const char **ptr) -{ - const char *p, *q; - - p = *ptr; - if (!(q = strstr(p, "\n"))) - { - if (!*p) return NULL; - *ptr += strlen(p); - return p; - } - *ptr = q + 1; - - return p; -} - /* Context activation is done by the caller. */ void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program) { @@ -593,7 +577,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetAttachedShaders(program, shader_count, NULL, shaders)); for (i = 0; i < shader_count; ++i) { - const char *ptr, *line; + const char *ptr, *end, *line; GLint tmp; GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_SOURCE_LENGTH, &tmp)); @@ -602,7 +586,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf { heap_free(source); - if (!(source = heap_alloc_zero(tmp))) + if (!(source = heap_alloc(tmp))) { ERR("Failed to allocate %d bytes for shader source.\n", tmp); heap_free(shaders); @@ -611,16 +595,20 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf source_size = tmp; } + GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); + ptr = source; + end = &ptr[tmp - 1]; + FIXME("Shader %u:\n", shaders[i]); GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_TYPE, &tmp)); FIXME(" GL_SHADER_TYPE: %s.\n", debug_gl_shader_type(tmp)); GL_EXTCALL(glGetShaderiv(shaders[i], GL_COMPILE_STATUS, &tmp)); FIXME(" GL_COMPILE_STATUS: %d.\n", tmp); FIXME("\n"); - - ptr = source; - GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); - while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); + while ((line = wined3d_get_line(&ptr, end))) + { + FIXME(" %.*s", (int)(ptr - line), line); + } FIXME("\n"); }

1 0