gallium: split transfer_inline_write into buffer and texture callbacks

to reduce the call indirections with u_resource_vtbl.

The worst call tree you could get was:
  - u_transfer_inline_write_vtbl
    - u_default_transfer_inline_write
      - u_transfer_map_vtbl
        - driver_transfer_map
      - u_transfer_unmap_vtbl
        - driver_transfer_unmap

That's 6 indirect calls. Some drivers only had 5. The goal is to have
1 indirect call for drivers that care. The resource type can be determined
statically at most call sites.

The new interface is:
  pipe_context::buffer_subdata(ctx, resource, usage, offset, size, data)
  pipe_context::texture_subdata(ctx, resource, level, usage, box, data,
                                stride, layer_stride)

v2: fix whitespace, correct ilo's behavior

Reviewed-by: Nicolai Hähnle <[email protected]>
Acked-by: Roland Scheidegger <[email protected]>

4 files changed, 13 insertions, 14 deletions

diff --git a/src/gallium/state_trackers/nine/buffer9.h b/src/gallium/state_trackers/nine/buffer9.h
index 8bdb4326a4c..c109cf66140 100644
--- a/src/gallium/state_trackers/nine/buffer9.h
+++ b/src/gallium/state_trackers/nine/buffer9.h
@@ -88,10 +88,10 @@ NineBuffer9_Upload( struct NineBuffer9 *This )
     struct pipe_context *pipe = This->pipe;
 
     assert(This->base.pool == D3DPOOL_MANAGED && This->managed.dirty);
-    pipe->transfer_inline_write(pipe, This->base.resource, 0, 0,
-                                &This->managed.dirty_box,
-                                (char *)This->managed.data + This->managed.dirty_box.x,
-                                This->size, This->size);
+    pipe->buffer_subdata(pipe, This->base.resource, 0,
+                         This->managed.dirty_box.x,
+                         This->managed.dirty_box.width,
+                         (char *)This->managed.data + This->managed.dirty_box.x);
     This->managed.dirty = FALSE;
 }
 
diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c
index 6aa63250112..fd098ca68ea 100644
--- a/src/gallium/state_trackers/nine/nine_state.c
+++ b/src/gallium/state_trackers/nine/nine_state.c
@@ -86,8 +86,7 @@ prepare_ps_constants_userbuf(struct NineDevice9 *device);
         DBG("upload ConstantF [%u .. %u]\n", x, (x) + (c) - 1); \
         box.x = (p) * 4 * sizeof(float); \
         box.width = (c) * 4 * sizeof(float); \
-        pipe->transfer_inline_write(pipe, buf, 0, usage, &box, &((d)[p * 4]), \
-                                    0, 0); \
+        pipe->buffer_subdata(pipe, buf, usage, box.x, box.width, &((d)[p * 4])); \
     } while(0)
 
 /* OK, this is a bit ugly ... */
@@ -186,7 +185,7 @@ upload_constants(struct NineDevice9 *device, unsigned shader_type)
        box.x = x;
        box.width = c * 4;
        DBG("upload ConstantB [%u .. %u]\n", x, x + c - 1);
-       pipe->transfer_inline_write(pipe, buf, 0, usage, &box, data_b, 0, 0);
+       pipe->buffer_subdata(pipe, buf, usage, box.x, box.width, data_b);
     }
 
     /* int4 */
@@ -203,7 +202,7 @@ upload_constants(struct NineDevice9 *device, unsigned shader_type)
             box.x += x * 4 * sizeof(int);
             box.width = c * 4 * sizeof(int);
             c = 0;
-            pipe->transfer_inline_write(pipe, buf, 0, usage, &box, data, 0, 0);
+            pipe->buffer_subdata(pipe, buf, usage, box.x, box.width, data);
         }
     }
     if (c) {
@@ -212,7 +211,7 @@ upload_constants(struct NineDevice9 *device, unsigned shader_type)
         box.x  = buf->width0 - (NINE_MAX_CONST_I * 4 + NINE_MAX_CONST_B) * 4;
         box.x += x * 4 * sizeof(int);
         box.width = c * 4 * sizeof(int);
-        pipe->transfer_inline_write(pipe, buf, 0, usage, &box, data, 0, 0);
+        pipe->buffer_subdata(pipe, buf, usage, box.x, box.width, data);
     }
 
     /* TODO: only upload these when shader itself changes */
@@ -224,7 +223,7 @@ upload_constants(struct NineDevice9 *device, unsigned shader_type)
             n += r->end - r->bgn;
             box.width = (r->end - r->bgn) * 4 * sizeof(float);
             data = &lconstf_data[4 * n];
-            pipe->transfer_inline_write(pipe, buf, 0, usage, &box, data, 0, 0);
+            pipe->buffer_subdata(pipe, buf, usage, box.x, box.width, data);
             r = r->next;
         }
     }
diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c
index 2606dbfcfa8..6a4a0d9dc74 100644
--- a/src/gallium/state_trackers/nine/surface9.c
+++ b/src/gallium/state_trackers/nine/surface9.c
@@ -673,8 +673,8 @@ NineSurface9_UploadSelf( struct NineSurface9 *This,
 
     ptr = NineSurface9_GetSystemMemPointer(This, box.x, box.y);
 
-    pipe->transfer_inline_write(pipe, res, This->level, 0,
-                                &box, ptr, This->stride, 0);
+    pipe->texture_subdata(pipe, res, This->level, 0,
+                          &box, ptr, This->stride, 0);
 
     return D3D_OK;
 }
diff --git a/src/gallium/state_trackers/nine/volume9.c b/src/gallium/state_trackers/nine/volume9.c
index 1fdc6388197..0302b099931 100644
--- a/src/gallium/state_trackers/nine/volume9.c
+++ b/src/gallium/state_trackers/nine/volume9.c
@@ -496,8 +496,8 @@ NineVolume9_UploadSelf( struct NineVolume9 *This,
 
     ptr = NineVolume9_GetSystemMemPointer(This, box.x, box.y, box.z);
 
-    pipe->transfer_inline_write(pipe, res, This->level, 0, &box,
-                                ptr, This->stride, This->layer_stride);
+    pipe->texture_subdata(pipe, res, This->level, 0, &box,
+                          ptr, This->stride, This->layer_stride);
 
     return D3D_OK;
 }