d3d1x: adapt to resource_resolve interface change
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Sun, 7 Aug 2011 13:34:07 +0000 (15:34 +0200)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Sun, 7 Aug 2011 13:34:34 +0000 (15:34 +0200)
src/gallium/state_trackers/d3d1x/gd3d11/d3d11_context.h

index 12f2aaddc916e624fa8baa09df3515d51a9019c8..aedf82a43816ad60edd446ff531e1ecacf3e3687 100644 (file)
@@ -1726,9 +1726,26 @@ changed:
                SYNCHRONIZED;
                GalliumD3D11Resource<>* dst = (GalliumD3D11Resource<>*)dst_resource;
                GalliumD3D11Resource<>* src = (GalliumD3D11Resource<>*)src_resource;
-               unsigned dst_layer = d3d11_subresource_to_face(dst->resource, dst_subresource);
-               unsigned src_layer = d3d11_subresource_to_face(src->resource, src_subresource);
-               pipe->resource_resolve(pipe, dst->resource, dst_layer, src->resource, src_layer);
+               struct pipe_resolve_info info;
+
+               info.dst.res = dst->resource;
+               info.src.res = src->resource;
+               info.dst.level = 0;
+               info.dst.layer = d3d11_subresource_to_face(dst->resource, dst_subresource);
+               info.src.layer = d3d11_subresource_to_face(src->resource, src_subresource);
+
+               info.src.x0 = 0;
+               info.src.x1 = info.src.res->width0;
+               info.src.y0 = 0;
+               info.src.y1 = info.src.res->height0;
+               info.dst.x0 = 0;
+               info.dst.x1 = info.dst.res->width0;
+               info.dst.y0 = 0;
+               info.dst.y1 = info.dst.res->height0;
+
+               info.mask = PIPE_MASK_RGBA | PIPE_MASK_ZS;
+
+               pipe->resource_resolve(pipe, &info);
        }
 
 #if API >= 11