Commit 7a2debe1 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Use the FBO cache in swapchain_blit().

parent 3345146d
...@@ -841,11 +841,6 @@ static void context_destroy_gl_resources(struct wined3d_context *context) ...@@ -841,11 +841,6 @@ static void context_destroy_gl_resources(struct wined3d_context *context)
if (context->valid) if (context->valid)
{ {
if (context->src_fbo)
{
TRACE("Destroy src FBO %d\n", context->src_fbo);
context_destroy_fbo(context, &context->src_fbo);
}
if (context->dst_fbo) if (context->dst_fbo)
{ {
TRACE("Destroy dst FBO %d\n", context->dst_fbo); TRACE("Destroy dst FBO %d\n", context->dst_fbo);
......
...@@ -117,9 +117,8 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * ...@@ -117,9 +117,8 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *
if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format_desc->color_fixup)) if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format_desc->color_fixup))
{ {
ENTER_GL(); ENTER_GL();
context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, backbuffer, NULL);
context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, backbuffer); glReadBuffer(GL_COLOR_ATTACHMENT0);
context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE);
context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL);
context_set_draw_buffer(context, GL_BACK); context_set_draw_buffer(context, GL_BACK);
......
...@@ -1087,7 +1087,6 @@ struct wined3d_context ...@@ -1087,7 +1087,6 @@ struct wined3d_context
struct list fbo_list; struct list fbo_list;
struct list fbo_destroy_list; struct list fbo_destroy_list;
struct fbo_entry *current_fbo; struct fbo_entry *current_fbo;
GLuint src_fbo;
GLuint dst_fbo; GLuint dst_fbo;
GLuint fbo_read_binding; GLuint fbo_read_binding;
GLuint fbo_draw_binding; GLuint fbo_draw_binding;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment