Henri Verbeet : wined3d: Use the texture dimension helpers in surface_load_renderbuffer().

Alexandre Julliard julliard at wine.codeweavers.com
Tue Apr 12 10:20:46 CDT 2016


Module: wine
Branch: master
Commit: c4f7bdcfdd8fff986baa45d04646c2ce321764a5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c4f7bdcfdd8fff986baa45d04646c2ce321764a5

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Apr 11 18:34:39 2016 +0200

wined3d: Use the texture dimension helpers in surface_load_renderbuffer().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/surface.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index aab5d73..af7bf68 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3193,7 +3193,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
 static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context,
         DWORD dst_location)
 {
-    const RECT rect = {0, 0, surface->resource.width, surface->resource.height};
+    struct wined3d_texture *texture = surface->container;
+    const RECT rect = {0, 0,
+            wined3d_texture_get_level_width(texture, surface->texture_level),
+            wined3d_texture_get_level_height(texture, surface->texture_level)};
     DWORD locations = surface_get_sub_resource(surface)->locations;
     DWORD src_location;
 
@@ -3206,7 +3209,7 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi
     else /* surface_blt_fbo will load the source location if necessary. */
         src_location = WINED3D_LOCATION_TEXTURE_RGB;
 
-    surface_blt_fbo(surface->container->resource.device, context, WINED3D_TEXF_POINT,
+    surface_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT,
             surface, src_location, &rect, surface, dst_location, &rect);
 }
 




More information about the wine-cvs mailing list