Merge branch '7.8'

[mesa.git] / src / gallium / auxiliary / util / u_rect.c

diff --git a/src/gallium/auxiliary/util/u_rect.c b/src/gallium/auxiliary/util/u_rect.c
index e73797f1b7e62d64a7837619a777472d9c0d0f71..098cdfd58b12e08a796a822b365d0214911e7484 100644 (file)
--- a/src/gallium/auxiliary/util/u_rect.c
+++ b/src/gallium/auxiliary/util/u_rect.c
@@ -35,6 +35,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_screen.h"
 #include "util/u_format.h"
+#include "util/u_inlines.h"
 #include "util/u_rect.h"
 
 
@@ -181,21 +182,21 @@ util_surface_copy(struct pipe_context *pipe,
    src_format = src->texture->format;
    dst_format = dst->texture->format;
 
-   src_trans = pipe->get_tex_transfer(pipe,
-                                        src->texture,
-                                        src->face,
-                                        src->level,
-                                        src->zslice,
-                                        PIPE_TRANSFER_READ,
-                                        src_x, src_y, w, h);
-
-   dst_trans = pipe->get_tex_transfer(pipe,
-                                        dst->texture,
-                                        dst->face,
-                                        dst->level,
-                                        dst->zslice,
-                                        PIPE_TRANSFER_WRITE,
-                                        dst_x, dst_y, w, h);
+   src_trans = pipe_get_transfer(pipe,
+                                src->texture,
+                                src->face,
+                                src->level,
+                                src->zslice,
+                                PIPE_TRANSFER_READ,
+                                src_x, src_y, w, h);
+
+   dst_trans = pipe_get_transfer(pipe,
+                                dst->texture,
+                                dst->face,
+                                dst->level,
+                                dst->zslice,
+                                PIPE_TRANSFER_WRITE,
+                                dst_x, dst_y, w, h);
 
    assert(util_format_get_blocksize(dst_format) == util_format_get_blocksize(src_format));
    assert(util_format_get_blockwidth(dst_format) == util_format_get_blockwidth(src_format));
@@ -223,8 +224,8 @@ util_surface_copy(struct pipe_context *pipe,
    pipe->transfer_unmap(pipe, src_trans);
    pipe->transfer_unmap(pipe, dst_trans);
 
-   pipe->tex_transfer_destroy(pipe, src_trans);
-   pipe->tex_transfer_destroy(pipe, dst_trans);
+   pipe->transfer_destroy(pipe, src_trans);
+   pipe->transfer_destroy(pipe, dst_trans);
 }
 
 
@@ -248,13 +249,13 @@ util_surface_fill(struct pipe_context *pipe,
    assert(dst->texture);
    if (!dst->texture)
       return;
-   dst_trans = pipe->get_tex_transfer(pipe,
-                                        dst->texture,
-                                        dst->face,
-                                        dst->level,
-                                        dst->zslice,
-                                        PIPE_TRANSFER_WRITE,
-                                        dstx, dsty, width, height);
+   dst_trans = pipe_get_transfer(pipe,
+                                dst->texture,
+                                dst->face,
+                                dst->level,
+                                dst->zslice,
+                                PIPE_TRANSFER_WRITE,
+                                dstx, dsty, width, height);
 
    dst_map = pipe->transfer_map(pipe, dst_trans);
 
@@ -263,37 +264,38 @@ util_surface_fill(struct pipe_context *pipe,
    if (dst_map) {
       assert(dst_trans->stride > 0);
 
-      switch (util_format_get_blocksize(dst_trans->texture->format)) {
+      switch (util_format_get_blocksize(dst->texture->format)) {
       case 1:
       case 2:
       case 4:
-         util_fill_rect(dst_map, dst_trans->texture->format, dst_trans->stride,
+         util_fill_rect(dst_map, dst->texture->format,
+                       dst_trans->stride,
                         0, 0, width, height, value);
          break;
       case 8:
-         {
-            /* expand the 4-byte clear value to an 8-byte value */
-            ushort *row = (ushort *) dst_map;
-            ushort val0 = UBYTE_TO_USHORT((value >>  0) & 0xff);
-            ushort val1 = UBYTE_TO_USHORT((value >>  8) & 0xff);
-            ushort val2 = UBYTE_TO_USHORT((value >> 16) & 0xff);
-            ushort val3 = UBYTE_TO_USHORT((value >> 24) & 0xff);
-            unsigned i, j;
-            val0 = (val0 << 8) | val0;
-            val1 = (val1 << 8) | val1;
-            val2 = (val2 << 8) | val2;
-            val3 = (val3 << 8) | val3;
-            for (i = 0; i < height; i++) {
-               for (j = 0; j < width; j++) {
-                  row[j*4+0] = val0;
-                  row[j*4+1] = val1;
-                  row[j*4+2] = val2;
-                  row[j*4+3] = val3;
-               }
-               row += dst_trans->stride/2;
-            }
-         }
-         break;
+      {
+        /* expand the 4-byte clear value to an 8-byte value */
+        ushort *row = (ushort *) dst_map;
+        ushort val0 = UBYTE_TO_USHORT((value >>  0) & 0xff);
+        ushort val1 = UBYTE_TO_USHORT((value >>  8) & 0xff);
+        ushort val2 = UBYTE_TO_USHORT((value >> 16) & 0xff);
+        ushort val3 = UBYTE_TO_USHORT((value >> 24) & 0xff);
+        unsigned i, j;
+        val0 = (val0 << 8) | val0;
+        val1 = (val1 << 8) | val1;
+        val2 = (val2 << 8) | val2;
+        val3 = (val3 << 8) | val3;
+        for (i = 0; i < height; i++) {
+           for (j = 0; j < width; j++) {
+              row[j*4+0] = val0;
+              row[j*4+1] = val1;
+              row[j*4+2] = val2;
+              row[j*4+3] = val3;
+           }
+           row += dst_trans->stride/2;
+        }
+      }
+      break;
       default:
          assert(0);
          break;
@@ -301,5 +303,5 @@ util_surface_fill(struct pipe_context *pipe,
    }
 
    pipe->transfer_unmap(pipe, dst_trans);
-   pipe->tex_transfer_destroy(pipe, dst_trans);
+   pipe->transfer_destroy(pipe, dst_trans);
 }