ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Make (wined3d_)surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE.

This commit is contained in:
Matteo Bruni 2013-02-18 13:56:22 +01:00 committed by Alexandre Julliard
parent d50baaa1df
commit 25d0d0876d
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/d3d9/tests/visual.c
View File

@ -13411,14 +13411,9 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9)
for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i)
{ {
D3DCOLOR color = getPixelColorFromSurface(readback, expected_colors[i].x, expected_colors[i].y); D3DCOLOR color = getPixelColorFromSurface(readback, expected_colors[i].x, expected_colors[i].y);
if (i % 4 < 2) ok(color_match(color, expected_colors[i].color, 1),
todo_wine ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n",
"Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color);
expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color);
else
ok(color_match(color, expected_colors[i].color, 1),
"Expected color 0x%08x at (%u, %u), got 0x%08x.\n",
expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color);
} }
hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

42
dlls/wined3d/surface.c
View File

@ -1040,17 +1040,20 @@ static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RE
return TRUE; return TRUE;
} }
static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, static void surface_depth_blt_fbo(const struct wined3d_device *device,
const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect) struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect,
struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect)
{ {
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
struct wined3d_context *context; struct wined3d_context *context;
DWORD src_mask, dst_mask; DWORD src_mask, dst_mask;
GLbitfield gl_mask; GLbitfield gl_mask;
TRACE("device %p, src_surface %p, src_rect %s, dst_surface %p, dst_rect %s.\n", TRACE("device %p\n", device);
device, src_surface, wine_dbgstr_rect(src_rect), TRACE("src_surface %p, src_location %s, src_rect %s,\n",
dst_surface, wine_dbgstr_rect(dst_rect)); src_surface, debug_surflocation(src_location), wine_dbgstr_rect(src_rect));
TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n",
dst_surface, debug_surflocation(dst_location), wine_dbgstr_rect(dst_rect));
src_mask = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); src_mask = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL);
dst_mask = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL);
@ -1078,9 +1081,9 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s
/* Make sure the locations are up-to-date. Loading the destination /* Make sure the locations are up-to-date. Loading the destination
* surface isn't required if the entire surface is overwritten. */ * surface isn't required if the entire surface is overwritten. */
surface_load_location(src_surface, SFLAG_INTEXTURE, NULL); surface_load_location(src_surface, src_location, NULL);
if (!surface_is_full_rect(dst_surface, dst_rect)) if (!surface_is_full_rect(dst_surface, dst_rect))
surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); surface_load_location(dst_surface, dst_location, NULL);
context = context_acquire(device, NULL); context = context_acquire(device, NULL);
if (!context->valid) if (!context->valid)
@ -1092,12 +1095,12 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s
gl_info = context->gl_info; gl_info = context->gl_info;
context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, SFLAG_INTEXTURE); context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location);
gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE);
checkGLcall("glReadBuffer()"); checkGLcall("glReadBuffer()");
context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_check_fbo_status(context, GL_READ_FRAMEBUFFER);
context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location);
context_set_draw_buffer(context, GL_NONE); context_set_draw_buffer(context, GL_NONE);
context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER);
context_invalidate_state(context, STATE_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER);
@ -1404,8 +1407,8 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const
return blitter->depth_fill(device, surface, rect, depth); return blitter->depth_fill(device, surface, rect, depth);
} }
static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, const RECT *src_rect, static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect,
struct wined3d_surface *dst_surface, const RECT *dst_rect) struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect)
{ {
struct wined3d_device *device = src_surface->resource.device; struct wined3d_device *device = src_surface->resource.device;
@ -1414,9 +1417,9 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co
dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
wined3d_surface_depth_blt_fbo(device, src_surface, src_rect, dst_surface, dst_rect); surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect);
surface_modify_ds_location(dst_surface, SFLAG_INTEXTURE, surface_modify_ds_location(dst_surface, dst_location,
dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy);
return WINED3D_OK; return WINED3D_OK;
@ -1612,7 +1615,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->draw_binding, &src_rect,
dst_surface, dst_surface->draw_binding, &dst_rect)))
return WINED3D_OK; return WINED3D_OK;
} }
} }
@ -6168,16 +6172,22 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c
if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)
{ {
if (location == SFLAG_INTEXTURE) if (location == SFLAG_INTEXTURE && surface->flags & SFLAG_INDRAWABLE)
{ {
struct wined3d_context *context = context_acquire(device, NULL); struct wined3d_context *context = context_acquire(device, NULL);
surface_load_ds_location(surface, context, location); surface_load_ds_location(surface, context, location);
context_release(context); context_release(context);
return WINED3D_OK; return WINED3D_OK;
} }
else if (location & surface->flags && surface->draw_binding != SFLAG_INDRAWABLE)
{
/* Already up to date, nothing to do. */
return WINED3D_OK;
}
else else
{ {
FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(location)); FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n",
debug_surflocation(surface->flags & SFLAG_LOCATIONS), debug_surflocation(location));
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
} }