Module: wine Branch: master Commit: ecba38d5bd9c1406ed45f59c895ab9d3230f17fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecba38d5bd9c1406ed45f59c89...
Author: Stefan Dösinger stefan@codeweavers.com Date: Sun Mar 6 20:59:50 2016 +0100
wined3d: Merge surface_prepare_map_memory() into wined3d_surface_prepare().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/surface.c | 95 ++++++++++++++++++------------------------ dlls/wined3d/texture.c | 8 ++-- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 45 insertions(+), 59 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4ea615e..779febf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -505,39 +505,6 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) ERR("Surface without system memory has WINED3D_LOCATION_SYSMEM set.\n"); }
-void surface_prepare_map_memory(struct wined3d_surface *surface) -{ - struct wined3d_texture *texture = surface->container; - struct wined3d_context *context; - - switch (surface->resource.map_binding) - { - case WINED3D_LOCATION_SYSMEM: - surface_prepare_system_memory(surface); - break; - - case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) - ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); - break; - - case WINED3D_LOCATION_DIB: - if (!surface->dib.bitmap_data) - ERR("Map binding is set to WINED3D_LOCATION_DIB but surface->dib.bitmap_data is NULL.\n"); - break; - - case WINED3D_LOCATION_BUFFER: - context = context_acquire(texture->resource.device, NULL); - wined3d_texture_prepare_buffer_object(texture, - surface_get_sub_resource_idx(surface), context->gl_info); - context_release(context); - break; - - default: - ERR("Unexpected map binding %s.\n", wined3d_debug_location(surface->resource.map_binding)); - } -} - static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: @@ -1053,7 +1020,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { - surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding); } @@ -2180,8 +2147,8 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ 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; + const struct wined3d_gl_info *gl_info = NULL; + struct wined3d_context *context = NULL; BYTE *base_memory;
TRACE("surface %p, map_desc %p, box %s, flags %#x.\n", @@ -2223,7 +2190,13 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } }
- surface_prepare_map_memory(surface); + if (device->d3d_initialized) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + } + + wined3d_surface_prepare(surface, context, surface->resource.map_binding); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", @@ -2232,16 +2205,10 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ } else { - struct wined3d_context *context = NULL; - if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n");
- if (surface->resource.device->d3d_initialized) - context = context_acquire(surface->resource.device, NULL); surface_load_location(surface, context, surface->resource.map_binding); - if (context) - context_release(context); }
if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) @@ -2262,16 +2229,11 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ break;
case WINED3D_LOCATION_BUFFER: - context = context_acquire(device, NULL); - gl_info = context->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object)); base_memory = GL_EXTCALL(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_READ_WRITE)); GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); checkGLcall("map PBO"); - - context_release(context); break;
default: @@ -2279,6 +2241,9 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ base_memory = NULL; }
+ if (context) + context_release(context); + if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) { map_desc->row_pitch = surface->resource.width * format->byte_count; @@ -3615,7 +3580,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3626,7 +3591,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3662,7 +3627,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, else surface->resource.map_binding = WINED3D_LOCATION_SYSMEM;
- surface_prepare_map_memory(surface); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); wined3d_texture_remove_buffer_object(texture, surface_get_sub_resource_idx(surface), gl_info); } @@ -5064,17 +5029,39 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex return hr; }
-/* Context activation is done by the caller. */ +/* Context activation is done by the caller. Context may be NULL in + * WINED3D_NO3D mode. */ void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { + struct wined3d_texture *texture = surface->container; + switch (location) { + case WINED3D_LOCATION_SYSMEM: + surface_prepare_system_memory(surface); + break; + + case WINED3D_LOCATION_USER_MEMORY: + if (!texture->user_memory) + ERR("Map binding is set to WINED3D_LOCATION_USER_MEMORY but surface->user_memory is NULL.\n"); + break; + + case WINED3D_LOCATION_DIB: + if (!surface->dib.bitmap_data) + ERR("Map binding is set to WINED3D_LOCATION_DIB but surface->dib.bitmap_data is NULL.\n"); + break; + + case WINED3D_LOCATION_BUFFER: + wined3d_texture_prepare_buffer_object(texture, + surface_get_sub_resource_idx(surface), context->gl_info); + break; + case WINED3D_LOCATION_TEXTURE_RGB: - wined3d_texture_prepare_texture(surface->container, context, FALSE); + wined3d_texture_prepare_texture(texture, context, FALSE); break;
case WINED3D_LOCATION_TEXTURE_SRGB: - wined3d_texture_prepare_texture(surface->container, context, TRUE); + wined3d_texture_prepare_texture(texture, context, TRUE); break;
case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e126961..f5a7c16 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -852,11 +852,11 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub struct wined3d_surface *surface = surface_from_resource(sub_resource); struct wined3d_context *context;
- surface_prepare_map_memory(surface); - context = context_acquire(surface->resource.device, NULL); - surface_load_location(surface, context, surface->resource.map_binding); + context = context_acquire(surface->container->resource.device, NULL); + wined3d_surface_prepare(surface, context, sub_resource->map_binding); + surface_load_location(surface, context, sub_resource->map_binding); context_release(context); - surface_invalidate_location(surface, ~surface->resource.map_binding); + surface_invalidate_location(surface, ~sub_resource->map_binding); }
static void texture2d_sub_resource_invalidate_location(struct wined3d_resource *sub_resource, DWORD location) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da36985..87c5f9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2604,7 +2604,6 @@ HRESULT wined3d_surface_update_desc(struct wined3d_surface *surface, HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; -void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;