wined3d: Make the FBO blitter a proper blitter.

dlls/wined3d/arb_program_shader.c

@@ -7787,7 +7787,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info,
 }
 
 static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context,
-        struct wined3d_surface *src_surface, const RECT *src_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_color_key *color_key, enum wined3d_texture_filter_type filter)
 {

dlls/wined3d/swapchain.c

@@ -371,8 +371,10 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain,
         if (is_complex_fixup(texture->resource.format->color_fixup))
             filter = WINED3D_TEXF_NONE;
 
-        device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, back_buffer,
-                src_rect, back_buffer, WINED3D_LOCATION_DRAWABLE, dst_rect, NULL, filter);
+        device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context,
+                back_buffer, WINED3D_LOCATION_TEXTURE_RGB, src_rect,
+                back_buffer, WINED3D_LOCATION_DRAWABLE, dst_rect,
+                NULL, filter);
         checkGLcall("Swapchain present blit(manual)\n");
     }
 }

dlls/wined3d/utils.c

@@ -5801,6 +5801,7 @@ const struct wined3d_blitter_ops *wined3d_select_blitter(const struct wined3d_gl
 {
     static const struct wined3d_blitter_ops * const blitters[] =
     {
+        &fbo_blitter_ops,
         &arbfp_blit,
         &ffp_blit,
         &cpu_blit,

dlls/wined3d/wined3d_private.h

@@ -1880,11 +1880,12 @@ struct wined3d_blitter_ops
     HRESULT (*depth_fill)(struct wined3d_device *device, struct wined3d_rendertarget_view *view,
             const RECT *rect, DWORD clear_flags, float depth, DWORD stencil);
     void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context,
-            struct wined3d_surface *src_surface, const RECT *src_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_color_key *color_key, enum wined3d_texture_filter_type filter);
 };
 
+extern const struct wined3d_blitter_ops fbo_blitter_ops DECLSPEC_HIDDEN;
 extern const struct wined3d_blitter_ops arbfp_blit DECLSPEC_HIDDEN;
 extern const struct wined3d_blitter_ops ffp_blit DECLSPEC_HIDDEN;
 extern const struct wined3d_blitter_ops cpu_blit DECLSPEC_HIDDEN;