intel: fix the gen 11 compute shader scratch IDs

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_tex_copy.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_tex_copy.c b/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
index 726692ef241e389471b4c48a11a7027187cdd0d0..93313c2b6db38e1e2977bf89e48cd9207cfd27a2 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
@@ -50,8 +50,8 @@ do_copy_texsubimage(struct gl_context *ctx,
     const GLuint level = timg->base.Base.Level;
     unsigned src_bpp;
     unsigned dst_bpp;
-    gl_format src_mesaformat;
-    gl_format dst_mesaformat;
+    mesa_format src_mesaformat;
+    mesa_format dst_mesaformat;
     unsigned flip_y;
 
     if (!radeon->vtbl.blit) {
@@ -72,7 +72,7 @@ do_copy_texsubimage(struct gl_context *ctx,
     }
 
     if (!timg->mt) {
-        radeon_validate_texture_miptree(ctx, &tobj->base);
+        radeon_validate_texture_miptree(ctx, &tobj->base.Sampler, &tobj->base);
     }
 
     assert(rrb->bo);
@@ -86,15 +86,15 @@ do_copy_texsubimage(struct gl_context *ctx,
 
     if (0) {
         fprintf(stderr, "%s: copying to face %d, level %d\n",
-                __FUNCTION__, face, level);
+                __func__, face, level);
         fprintf(stderr, "to: x %d, y %d, offset %d\n", dstx, dsty, (uint32_t) dst_offset);
         fprintf(stderr, "from (%dx%d) width %d, height %d, offset %d, pitch %d\n",
-                x, y, rrb->base.Width, rrb->base.Height, (uint32_t) src_offset, rrb->pitch/rrb->cpp);
+                x, y, rrb->base.Base.Width, rrb->base.Base.Height, (uint32_t) src_offset, rrb->pitch/rrb->cpp);
         fprintf(stderr, "src size %d, dst size %d\n", rrb->bo->size, timg->mt->bo->size);
 
     }
 
-    src_mesaformat = rrb->base.Format;
+    src_mesaformat = rrb->base.Base.Format;
     dst_mesaformat = timg->base.Base.TexFormat;
     src_bpp = _mesa_get_format_bytes(src_mesaformat);
     dst_bpp = _mesa_get_format_bytes(dst_mesaformat);
@@ -108,16 +108,16 @@ do_copy_texsubimage(struct gl_context *ctx,
 
            switch (dst_bpp) {
            case 2:
-                   src_mesaformat = MESA_FORMAT_RGB565;
-                   dst_mesaformat = MESA_FORMAT_RGB565;
+                   src_mesaformat = MESA_FORMAT_B5G6R5_UNORM;
+                   dst_mesaformat = MESA_FORMAT_B5G6R5_UNORM;
                    break;
            case 4:
-                   src_mesaformat = MESA_FORMAT_ARGB8888;
-                   dst_mesaformat = MESA_FORMAT_ARGB8888;
+                   src_mesaformat = MESA_FORMAT_B8G8R8A8_UNORM;
+                   dst_mesaformat = MESA_FORMAT_B8G8R8A8_UNORM;
                    break;
            case 1:
-                   src_mesaformat = MESA_FORMAT_A8;
-                   dst_mesaformat = MESA_FORMAT_A8;
+                   src_mesaformat = MESA_FORMAT_A_UNORM8;
+                   dst_mesaformat = MESA_FORMAT_A_UNORM8;
                    break;
            default:
                    return GL_FALSE;
@@ -126,7 +126,7 @@ do_copy_texsubimage(struct gl_context *ctx,
 
     /* blit from src buffer to texture */
     return radeon->vtbl.blit(ctx, rrb->bo, src_offset, src_mesaformat, rrb->pitch/rrb->cpp,
-                             rrb->base.Width, rrb->base.Height, x, y,
+                             rrb->base.Base.Width, rrb->base.Base.Height, x, y,
                              timg->mt->bo, dst_offset, dst_mesaformat,
                              timg->mt->levels[level].rowstride / dst_bpp,
                              timg->base.Base.Width, timg->base.Base.Height,
@@ -134,17 +134,17 @@ do_copy_texsubimage(struct gl_context *ctx,
 }
 
 void
-radeonCopyTexSubImage2D(struct gl_context *ctx,
-                        struct gl_texture_image *texImage,
-                        GLint xoffset, GLint yoffset,
-                        struct gl_renderbuffer *rb,
-                        GLint x, GLint y,
-                        GLsizei width, GLsizei height)
+radeonCopyTexSubImage(struct gl_context *ctx, GLuint dims,
+                      struct gl_texture_image *texImage,
+                      GLint xoffset, GLint yoffset, GLint slice,
+                      struct gl_renderbuffer *rb,
+                      GLint x, GLint y,
+                      GLsizei width, GLsizei height)
 {
     radeonContextPtr radeon = RADEON_CONTEXT(ctx);
     radeon_prepare_render(radeon);
 
-    if (!do_copy_texsubimage(ctx,
+    if (slice != 0 || !do_copy_texsubimage(ctx,
                              radeon_tex_obj(texImage->TexObject),
                              (radeon_texture_image *)texImage,
                              xoffset, yoffset,
@@ -153,8 +153,8 @@ radeonCopyTexSubImage2D(struct gl_context *ctx,
         radeon_print(RADEON_FALLBACKS, RADEON_NORMAL,
                      "Falling back to sw for glCopyTexSubImage2D\n");
 
-        _mesa_meta_CopyTexSubImage2D(ctx, texImage,
-                                     xoffset, yoffset,
+        _mesa_meta_CopyTexSubImage(ctx, dims, texImage,
+                                   xoffset, yoffset, slice,
                                      rb, x, y, width, height);
     }
 }