st/mesa/radeonsi: fix race between destruction of types and shader compilation

[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 fc723842c114669983a98e8d25cf4864cca41c7c..93313c2b6db38e1e2977bf89e48cd9207cfd27a2 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_tex_copy.c
@@ -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;