svga: fix resource checking in is_blending_enabled()

[mesa.git] / src / gallium / drivers / svga / svga_pipe_blit.c

diff --git a/src/gallium/drivers/svga/svga_pipe_blit.c b/src/gallium/drivers/svga/svga_pipe_blit.c
index 9ab518314927fd622a5ea66e3ddbe058a68d3474..ab612416c284c6f6d0c110759031fae8c139f131 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_blit.c
+++ b/src/gallium/drivers/svga/svga_pipe_blit.c
@@ -122,39 +122,22 @@ copy_region_vgpu10(struct svga_context *svga, struct pipe_resource *src_tex,
                     unsigned dst_level, unsigned dst_layer_face,
                     unsigned width, unsigned height, unsigned depth)
 {
-   enum pipe_error ret;
    uint32 srcSubResource, dstSubResource;
    struct svga_texture *dtex, *stex;
-   SVGA3dCopyBox box;
 
    stex = svga_texture(src_tex);
    dtex = svga_texture(dst_tex);
 
    svga_surfaces_flush(svga);
 
-   box.x = dst_x;
-   box.y = dst_y;
-   box.z = dst_z;
-   box.w = width;
-   box.h = height;
-   box.d = depth;
-   box.srcx = src_x;
-   box.srcy = src_y;
-   box.srcz = src_z;
-
    srcSubResource = src_layer_face * (src_tex->last_level + 1) + src_level;
    dstSubResource = dst_layer_face * (dst_tex->last_level + 1) + dst_level;
 
-   ret = SVGA3D_vgpu10_PredCopyRegion(svga->swc,
-                                      dtex->handle, dstSubResource,
-                                      stex->handle, srcSubResource, &box);
-   if (ret != PIPE_OK) {
-      svga_context_flush(svga, NULL);
-      ret = SVGA3D_vgpu10_PredCopyRegion(svga->swc,
-                                         dtex->handle, dstSubResource,
-                                         stex->handle, srcSubResource, &box);
-      assert(ret == PIPE_OK);
-   }
+   svga_texture_copy_region(svga, stex->handle, srcSubResource,
+                            src_x, src_y, src_z,
+                            dtex->handle, dstSubResource,
+                            dst_x, dst_y, dst_z,
+                            width, height, depth);
 
    /* Mark the texture subresource as defined. */
    svga_define_texture_level(dtex, dst_layer_face, dst_level);
@@ -191,8 +174,9 @@ static bool
 has_layer_face_index_in_z(enum pipe_texture_target target)
 {
    if (target == PIPE_TEXTURE_CUBE ||
+       target == PIPE_TEXTURE_1D_ARRAY ||
        target == PIPE_TEXTURE_2D_ARRAY ||
-       target == PIPE_TEXTURE_1D_ARRAY)
+       target == PIPE_TEXTURE_CUBE_ARRAY)
       return true;
    else
       return false;
@@ -209,8 +193,9 @@ adjust_z_layer(enum pipe_texture_target target,
                int z_in, unsigned *layer_out, unsigned *z_out)
 {
    if (target == PIPE_TEXTURE_CUBE ||
+       target == PIPE_TEXTURE_1D_ARRAY ||
        target == PIPE_TEXTURE_2D_ARRAY ||
-       target == PIPE_TEXTURE_1D_ARRAY) {
+       target == PIPE_TEXTURE_CUBE_ARRAY) {
       *layer_out = z_in;
       *z_out = 0;
    }
@@ -249,7 +234,8 @@ is_blending_enabled(struct svga_context *svga,
    if (svga->curr.blend) {
       if (svga->curr.blend->independent_blend_enable) {
          for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
-            if (svga->curr.framebuffer.cbufs[i]->texture == blit->dst.resource) {
+            struct pipe_surface *cbuf = svga->curr.framebuffer.cbufs[i];
+            if (cbuf && (cbuf->texture == blit->dst.resource)) {
                if (svga->curr.blend->rt[i].blend_enable) {
                   blend_enable = true;
                }
@@ -364,6 +350,10 @@ can_blit_via_intra_surface_copy(struct svga_context *svga,
    if (!svga_have_vgpu10(svga))
       return false;
 
+   /* src surface cannot be multisample */
+   if (blit_info->src.resource->nr_samples > 1)
+      return false;
+
    if (!sws->have_intra_surface_copy)
       return false;