wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Jens Reyer : winemaker: Fix macro-not-defined errors from man.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 93fc6826c210ebb3e8ee11207d39515b954858cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fc6826c210ebb3e8ee11207… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 1 19:49:42 2016 +0100 winemaker: Fix macro-not-defined errors from man. ' characters at the start of a line indicate a groff command. If used in error, the affected lines get ignored. Therefore add a zero-width space and reformat another paragraph to keep the literal meaning. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in index 2446a4f..e4df360 100644 --- a/tools/winemaker/winemaker.de.UTF-8.man.in +++ b/tools/winemaker/winemaker.de.UTF-8.man.in @@ -58,7 +58,7 @@ im Includepfad suchen und die entsprechende Zeile, falls nötig, mit der korrekt Groß-/Kleinschreibweise austauschen. .PP - Winemaker wird ebenso andere, exotischere Probleme wie die Benutzung von -'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. +\&'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. Sollte etwas ungwöhnliches vorkommen, wird Winemaker Sie warnen. .PP - Winemaker kann eine ganze Verzeichnisstruktur auf einmal durchsuchen, @@ -198,9 +198,9 @@ $ winemaker --lower-uppercase -DSTRICT . Damit scannt Winemaker das aktuelle Verzeichnis und die Unterverzeichnisse nach Quellcodedateien. Jede Datei und jedes Verzeichnis, das ganz in Großbuchstaben geschrieben ist, wird in Kleinbuchstaben umbenannt. Danach werden alle Quellcodedateien -an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. -'-DSTRICT' gibt an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode -zu kompilieren. Letztendlich wird Winemaker die globale Makefile erzeugen. +an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. '-DSTRICT' gibt +an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode zu kompilieren. +Letztendlich wird Winemaker die globale Makefile erzeugen. .PP Der nächste Schritt wäre dann: .PP

1 0

Jens Reyer : loader: Fix macro-not-defined error from man.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 486194e41d23b9abaf30d322bf13cdc1bf72920d URL: http://source.winehq.org/git/wine.git/?a=commit;h=486194e41d23b9abaf30d322b… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 1 19:49:41 2016 +0100 loader: Fix macro-not-defined error from man. ' characters at the start of a line indicate a groff command. If used in error, the affected lines get ignored. Therefore reformat the paragraph to keep the literal meaning. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.pl.UTF-8.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 4aebf68..1718d65 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -263,8 +263,8 @@ symboliczene dowiązanie w formie $WINEPREFIX/dosdevices/com1 -> /dev/ttyS0. Napędy DOS również są określone przez dowiązania symboliczne; Dla przykładu jeżeli napęd D: odpowiadałby napędowi CDROM zamontowanemu w /mnt/cdrom, miałbyś dowiązanie symboliczne $WINEPREFIX/dosdevices/d: -> /mnt/cdrom. Urządzenia Uniksowe odpowiadające -napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast -':'. Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane +napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast ':'. +Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane z /dev/hdc, to odpowiadające dowiązanie symboliczne wyglądałoby następująco $WINEPREFIX/dosdevices/d:: -> /dev/hdc. .SH AUTORZY

1 0

Stefan Dösinger : wined3d: Get rid of wined3d_surface_ops.surface_unmap().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: a7316e1927a847e65494caa9fc892e724b81f48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7316e1927a847e65494caa9f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 1 19:31:49 2016 +0100 wined3d: Get rid of wined3d_surface_ops.surface_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 101 +++++++++++++++-------------------------- dlls/wined3d/swapchain.c | 30 +++++++++--- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 60 insertions(+), 75 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1acc3b6..01095e9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -672,55 +672,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) return WINED3D_OK; } -static void surface_unmap(struct wined3d_surface *surface) -{ - struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - struct wined3d_texture *texture; - - TRACE("surface %p.\n", surface); - - switch (surface->resource.map_binding) - { - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_DIB: - break; - - case WINED3D_LOCATION_BUFFER: - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, surface->pbo)); - GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glUnmapBuffer"); - context_release(context); - break; - - default: - ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->resource.map_binding)); - } - - if (surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB)) - { - TRACE("Not dirtified, nothing to do.\n"); - return; - } - - texture = surface->container; - if (texture->swapchain && texture->swapchain->front_buffer == texture) - { - context = context_acquire(device, surface); - surface_load_location(surface, context, texture->resource.draw_binding); - context_release(context); - memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); - } - else if (texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - FIXME("Depth / stencil buffer locking is not implemented.\n"); -} - static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) @@ -1215,7 +1166,6 @@ static const struct wined3d_resource_ops surface_resource_ops = static const struct wined3d_surface_ops surface_ops = { surface_private_setup, - surface_unmap, }; /***************************************************************************** @@ -1259,23 +1209,9 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) return WINED3D_OK; } -static void gdi_surface_unmap(struct wined3d_surface *surface) -{ - struct wined3d_texture *texture = surface->container; - - TRACE("surface %p.\n", surface); - - /* Tell the swapchain to update the screen. */ - if (texture->swapchain && texture == texture->swapchain->front_buffer) - x11_copy_to_screen(texture->swapchain, &texture->swapchain->front_buffer_update); - - memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); -} - static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, - gdi_surface_unmap, }; /* This call just downloads data, the caller is responsible for binding the @@ -2239,6 +2175,11 @@ do { \ HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) { + struct wined3d_device *device = surface->resource.device; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + struct wined3d_texture *texture; + TRACE("surface %p.\n", surface); if (!surface->resource.map_count) @@ -2248,7 +2189,37 @@ HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) } --surface->resource.map_count; - surface->surface_ops->surface_unmap(surface); + switch (surface->resource.map_binding) + { + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_DIB: + break; + + case WINED3D_LOCATION_BUFFER: + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, surface->pbo)); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glUnmapBuffer"); + context_release(context); + break; + + default: + ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->resource.map_binding)); + break; + } + + if (!(surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB))) + { + texture = surface->container; + if (texture->swapchain && texture->swapchain->front_buffer == texture) + texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(texture->swapchain); + else if (texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + FIXME("Depth / stencil buffer locking is not implemented.\n"); + } return WINED3D_OK; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index becad97..9b8d04c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -647,13 +647,25 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT context_release(context); } +static void swapchain_gl_frontbuffer_updated(struct wined3d_swapchain *swapchain) +{ + struct wined3d_surface *surface; + struct wined3d_context *context; + + surface = surface_from_resource(swapchain->front_buffer->sub_resources[0].resource); + context = context_acquire(swapchain->device, surface); + surface_load_location(surface, context, surface->container->resource.draw_binding); + context_release(context); + SetRectEmpty(&swapchain->front_buffer_update); +} + static const struct wined3d_swapchain_ops swapchain_gl_ops = { swapchain_gl_present, + swapchain_gl_frontbuffer_updated, }; -/* Helper function that blits the front buffer contents to the target window. */ -void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) +static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchain) { struct wined3d_surface *front; POINT offset = {0, 0}; @@ -661,7 +673,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r RECT draw_rect; HWND window; - TRACE("swapchain %p, rect %s.\n", swapchain, wine_dbgstr_rect(rect)); + TRACE("swapchain %p.\n", swapchain); front = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); if (swapchain->palette) @@ -689,14 +701,14 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r draw_rect.right = front->resource.width; draw_rect.top = 0; draw_rect.bottom = front->resource.height; - - if (rect) - IntersectRect(&draw_rect, &draw_rect, rect); + IntersectRect(&draw_rect, &draw_rect, &swapchain->front_buffer_update); BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y, draw_rect.right - draw_rect.left, draw_rect.bottom - draw_rect.top, src_dc, draw_rect.left, draw_rect.top, SRCCOPY); ReleaseDC(window, dst_dc); + + SetRectEmpty(&swapchain->front_buffer_update); } static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, @@ -755,12 +767,16 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const REC } } - x11_copy_to_screen(swapchain, NULL); + SetRect(&swapchain->front_buffer_update, 0, 0, + swapchain->front_buffer->resource.width, + swapchain->front_buffer->resource.height); + swapchain_gdi_frontbuffer_updated(swapchain); } static const struct wined3d_swapchain_ops swapchain_gdi_ops = { swapchain_gdi_present, + swapchain_gdi_frontbuffer_updated, }; static void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4066c79..ce2f196 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2500,7 +2500,6 @@ struct fbo_entry struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); - void (*surface_unmap)(struct wined3d_surface *surface); }; struct wined3d_surface @@ -2916,6 +2915,7 @@ struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, const RGNDATA *dirty_region, DWORD flags); + void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swaphchain); }; struct wined3d_swapchain @@ -2948,8 +2948,6 @@ struct wined3d_swapchain HWND backup_wnd; }; -void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; - void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Keep track of front buffer updates in the swapchain.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 29c27b9bab922a485e02ad816a5e34802c1f4227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c27b9bab922a485e02ad816… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:48 2016 +0100 wined3d: Keep track of front buffer updates in the swapchain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 56 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee6588e..1acc3b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -677,11 +677,10 @@ static void surface_unmap(struct wined3d_surface *surface) struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; + struct wined3d_texture *texture; TRACE("surface %p.\n", surface); - memset(&surface->lockedRect, 0, sizeof(surface->lockedRect)); - switch (surface->resource.map_binding) { case WINED3D_LOCATION_SYSMEM: @@ -710,13 +709,15 @@ static void surface_unmap(struct wined3d_surface *surface) return; } - if (surface->container->swapchain && surface->container->swapchain->front_buffer == surface->container) + texture = surface->container; + if (texture->swapchain && texture->swapchain->front_buffer == texture) { context = context_acquire(device, surface); - surface_load_location(surface, context, surface->container->resource.draw_binding); + surface_load_location(surface, context, texture->resource.draw_binding); context_release(context); + memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); } - else if (surface->container->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + else if (texture->resource.format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) FIXME("Depth / stencil buffer locking is not implemented.\n"); } @@ -1260,13 +1261,15 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) static void gdi_surface_unmap(struct wined3d_surface *surface) { + struct wined3d_texture *texture = surface->container; + TRACE("surface %p.\n", surface); /* Tell the swapchain to update the screen. */ - if (surface->container->swapchain && surface->container == surface->container->swapchain->front_buffer) - x11_copy_to_screen(surface->container->swapchain, &surface->lockedRect); + if (texture->swapchain && texture == texture->swapchain->front_buffer) + x11_copy_to_screen(texture->swapchain, &texture->swapchain->front_buffer_update); - memset(&surface->lockedRect, 0, sizeof(RECT)); + memset(&texture->swapchain->front_buffer_update, 0, sizeof(texture->swapchain->front_buffer_update)); } static const struct wined3d_surface_ops gdi_surface_ops = @@ -2253,9 +2256,10 @@ HRESULT wined3d_surface_unmap(struct wined3d_surface *surface) HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - const struct wined3d_format *format = surface->resource.format; - unsigned int fmt_flags = surface->container->resource.format_flags; - struct wined3d_device *device = surface->resource.device; + struct wined3d_texture *texture = surface->container; + const struct wined3d_format *format = texture->resource.format; + struct wined3d_device *device = texture->resource.device; + unsigned int fmt_flags = texture->resource.format_flags; struct wined3d_context *context; const struct wined3d_gl_info *gl_info; BYTE *base_memory; @@ -2270,7 +2274,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } if ((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && box - && !wined3d_texture_check_block_align(surface->container, surface->texture_level, box)) + && !wined3d_texture_check_block_align(texture, surface->texture_level, box)) { WARN("Map box %s is misaligned for %ux%u blocks.\n", debug_box(box), format->block_width, format->block_height); @@ -2289,13 +2293,13 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ * the need to download the surface from OpenGL all the time. The surface * is still downloaded if the OpenGL texture is changed. Note that this * only really makes sense for managed textures.*/ - if (!(surface->container->flags & WINED3D_TEXTURE_DYNAMIC_MAP) + if (!(texture->flags & WINED3D_TEXTURE_DYNAMIC_MAP) && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) { TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - surface->container->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; + texture->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; } } @@ -2330,7 +2334,7 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ break; case WINED3D_LOCATION_USER_MEMORY: - base_memory = surface->container->user_memory; + base_memory = texture->user_memory; break; case WINED3D_LOCATION_DIB: @@ -2361,17 +2365,13 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } else { - wined3d_texture_get_pitch(surface->container, surface->texture_level, + wined3d_texture_get_pitch(texture, surface->texture_level, &map_desc->row_pitch, &map_desc->slice_pitch); } if (!box) { map_desc->data = base_memory; - surface->lockedRect.left = 0; - surface->lockedRect.top = 0; - surface->lockedRect.right = surface->resource.width; - surface->lockedRect.bottom = surface->resource.height; } else { @@ -2389,13 +2389,19 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ + (map_desc->row_pitch * box->top) + (box->left * format->byte_count); } - surface->lockedRect.left = box->left; - surface->lockedRect.top = box->top; - surface->lockedRect.right = box->right; - surface->lockedRect.bottom = box->bottom; } - TRACE("Locked rect %s.\n", wine_dbgstr_rect(&surface->lockedRect)); + if (texture->swapchain && texture->swapchain->front_buffer == texture) + { + RECT *r = &texture->swapchain->front_buffer_update; + + if (!box) + SetRect(r, 0, 0, texture->resource.width, texture->resource.height); + else + SetRect(r, box->left, box->top, box->right, box->bottom); + TRACE("Mapped front buffer %s.\n", wine_dbgstr_rect(r)); + } + TRACE("Returning memory %p, pitch %u.\n", map_desc->data, map_desc->row_pitch); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 409ab36..4066c79 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2522,8 +2522,6 @@ struct wined3d_surface GLenum texture_target; unsigned int texture_level; unsigned int texture_layer; - - RECT lockedRect; int lockCount; /* For GetDC */ @@ -2936,6 +2934,7 @@ struct wined3d_swapchain BOOL render_to_fbo, reapply_mode; const struct wined3d_format *ds_format; struct wined3d_palette *palette; + RECT front_buffer_update; LONG prev_time, frames; /* Performance tracking */

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_cube_GetLevelDesc().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 63256e31b38fc8acec0fb00358843a34e804c1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=63256e31b38fc8acec0fb0035… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:47 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_cube_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index cdb7193..50ef88d 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -675,9 +675,9 @@ static void WINAPI d3d9_texture_cube_GenerateMipSubLevels(IDirect3DCubeTexture9 static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; DWORD level_count; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); @@ -689,15 +689,10 @@ static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *ifac return D3DERR_INVALIDCALL; } - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_2d_GetLevelDesc().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 47c20218b7a57b65d0d2b6894a4c2d9d09f25e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c20218b7a57b65d0d2b6894… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:46 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_2d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 9cf10ae..cdb7193 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -285,21 +285,16 @@ static void WINAPI d3d9_texture_2d_GenerateMipSubLevels(IDirect3DTexture9 *iface static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_volume_GetDesc().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 352667d439941712ab3efedd4b4590e04eea14ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=352667d439941712ab3efedd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:45 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_volume_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/volume.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 52502bf..d92f555 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -116,18 +116,16 @@ static HRESULT WINAPI d3d9_volume_GetContainer(IDirect3DVolume9 *iface, REFIID r static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DESC *desc) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(volume->wined3d_texture, volume->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->Width = wined3d_desc.width;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_surface_GetDesc().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 7fad350ccfb91bf7921895d6e4e80423171764a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fad350ccfb91bf7921895d6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:44 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_surface_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index c3032dc..a0a1f27 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -207,18 +207,16 @@ static HRESULT WINAPI d3d9_surface_GetContainer(IDirect3DSurface9 *iface, REFIID static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_DESC *desc) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_ColorFill().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: fc87c40c3ed3294b3e6efcd3a2f86603fcec6b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc87c40c3ed3294b3e6efcd3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:43 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_ColorFill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 718de91..918e1e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1416,20 +1416,19 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, }; struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *surface_impl = unsafe_impl_from_IDirect3DSurface9(surface); - struct wined3d_resource *wined3d_resource; - struct wined3d_resource_desc desc; + struct wined3d_sub_resource_desc desc; HRESULT hr; TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color); wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_texture_get_sub_resource(surface_impl->wined3d_texture, surface_impl->sub_resource_idx))) + if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture, + surface_impl->sub_resource_idx, &desc))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - wined3d_resource_get_desc(wined3d_resource, &desc); if (desc.pool != WINED3D_POOL_DEFAULT) {

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_StretchRect().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 4917b987531b6fd64cc2c1dfe27050f141919e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4917b987531b6fd64cc2c1dfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:42 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bd94712..718de91 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1335,17 +1335,15 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_sub_resource_desc src_desc, dst_desc; HRESULT hr = D3DERR_INVALIDCALL; - struct wined3d_resource_desc src_desc, dst_desc; - struct wined3d_resource *sub_resource; RECT d, s; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", iface, src_surface, src_rect, dst_surface, dst_rect, filter); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &dst_desc); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc); if (!dst_rect) { d.left = 0; @@ -1355,8 +1353,7 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect dst_rect = &d; } - sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &src_desc); + wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); if (!src_rect) { s.left = 0;

1 0

← Newer
1
...
66
67
68
69
70
71
72
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016