Fix setting indent-tabs-mode in the Emacs .dir-locals.el files

[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 a6c406b2bffc97e72ee80a18d35f5e548cea27e5..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) {
@@ -86,7 +86,7 @@ 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.Base.Width, rrb->base.Base.Height, (uint32_t) src_offset, rrb->pitch/rrb->cpp);
@@ -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;
@@ -136,7 +136,7 @@ do_copy_texsubimage(struct gl_context *ctx,
 void
 radeonCopyTexSubImage(struct gl_context *ctx, GLuint dims,
                       struct gl_texture_image *texImage,
-                      GLint xoffset, GLint yoffset, GLint zoffset,
+                      GLint xoffset, GLint yoffset, GLint slice,
                       struct gl_renderbuffer *rb,
                       GLint x, GLint y,
                       GLsizei width, GLsizei height)
@@ -144,7 +144,7 @@ radeonCopyTexSubImage(struct gl_context *ctx, GLuint dims,
     radeonContextPtr radeon = RADEON_CONTEXT(ctx);
     radeon_prepare_render(radeon);
 
-    if (dims != 2 || !do_copy_texsubimage(ctx,
+    if (slice != 0 || !do_copy_texsubimage(ctx,
                              radeon_tex_obj(texImage->TexObject),
                              (radeon_texture_image *)texImage,
                              xoffset, yoffset,
@@ -154,7 +154,7 @@ radeonCopyTexSubImage(struct gl_context *ctx, GLuint dims,
                      "Falling back to sw for glCopyTexSubImage2D\n");
 
         _mesa_meta_CopyTexSubImage(ctx, dims, texImage,
-                                   xoffset, yoffset, zoffset,
+                                   xoffset, yoffset, slice,
                                      rb, x, y, width, height);
     }
 }