Merge remote branch 'origin/master' into pipe-video

1 files changed, 23 insertions, 16 deletions

diff --git a/src/gallium/drivers/nv50/nv50_transfer.h b/src/gallium/drivers/nv50/nv50_transfer.h
index 6699bf546ea..d3259ef4a5d 100644
--- a/src/gallium/drivers/nv50/nv50_transfer.h
+++ b/src/gallium/drivers/nv50/nv50_transfer.h
@@ -1,31 +1,38 @@
 
-#ifndef NV50_TRANSFER_H
-#define NV50_TRANSFER_H
+#ifndef __NV50_TRANSFER_H__
+#define __NV50_TRANSFER_H__
 
 #include "pipe/p_state.h"
 
-
 struct pipe_transfer *
 nv50_miptree_transfer_new(struct pipe_context *pcontext,
-			  struct pipe_resource *pt,
-			  unsigned level,
-			  unsigned usage,
-			  const struct pipe_box *box);
+                          struct pipe_resource *pt,
+                          unsigned level,
+                          unsigned usage,
+                          const struct pipe_box *box);
 void
 nv50_miptree_transfer_del(struct pipe_context *pcontext,
-			  struct pipe_transfer *ptx);
+                          struct pipe_transfer *ptx);
 void *
 nv50_miptree_transfer_map(struct pipe_context *pcontext,
-			  struct pipe_transfer *ptx);
+                          struct pipe_transfer *ptx);
 void
 nv50_miptree_transfer_unmap(struct pipe_context *pcontext,
-			    struct pipe_transfer *ptx);
+                            struct pipe_transfer *ptx);
 
-extern void
-nv50_upload_sifc(struct nv50_context *nv50,
-		 struct nouveau_bo *bo, unsigned dst_offset, unsigned reloc,
-		 unsigned dst_format, int dst_w, int dst_h, int dst_pitch,
-		 void *src, unsigned src_format, int src_pitch,
-		 int x, int y, int w, int h, int cpp);
+struct nv50_m2mf_rect {
+   struct nouveau_bo *bo;
+   uint32_t base;
+   unsigned domain;
+   uint32_t pitch;
+   uint32_t width;
+   uint32_t x;
+   uint32_t height;
+   uint32_t y;
+   uint16_t depth;
+   uint16_t z;
+   uint16_t tile_mode;
+   uint16_t cpp;
+};
 
 #endif