Move nv30, nv50 and nvc0 to nouveau.

It is planned to ship openSUSE 13.1 with -shared libs.
nouveau.la, nv30.la, nv50.la and nvc0.la are currently LIBADDs in all nouveau
related targets.
This change makes it possible to easily build one shared libnouveau.so which is
then LIBADDed.
Also dlopen will be faster for one library instead of three and build time on
-jX will be reduced.

Whitespace fixes were requested by 'git am'.

Signed-off-by: Johannes Obermayr <[email protected]>
Acked-by: Christoph Bumiller <[email protected]>
Acked-by: Ian Romanick <[email protected]>

1 files changed, 40 insertions, 0 deletions

diff --git a/src/gallium/drivers/nouveau/nv30/nv30_transfer.h b/src/gallium/drivers/nouveau/nv30/nv30_transfer.h
new file mode 100644
index 00000000000..3fa6cd0c029
--- /dev/null
+++ b/src/gallium/drivers/nouveau/nv30/nv30_transfer.h
@@ -0,0 +1,40 @@
+#ifndef __NV30_TRANSFER_H__
+#define __NV30_TRANSFER_H__
+
+struct nv30_rect {
+   struct nouveau_bo *bo;
+   unsigned offset;
+   unsigned domain;
+   unsigned pitch;
+   unsigned cpp;
+   unsigned w;
+   unsigned h;
+   unsigned d;
+   unsigned z;
+   unsigned x0;
+   unsigned x1;
+   unsigned y0;
+   unsigned y1;
+};
+
+enum nv30_transfer_filter {
+   NEAREST = 0,
+   BILINEAR
+};
+
+void
+nv30_transfer_rect(struct nv30_context *, enum nv30_transfer_filter filter,
+                   struct nv30_rect *, struct nv30_rect *);
+
+void
+nv30_transfer_push_data(struct nouveau_context *,
+                        struct nouveau_bo *, unsigned offset, unsigned domain,
+                        unsigned size, void *data);
+
+void
+nv30_transfer_copy_data(struct nouveau_context *,
+                        struct nouveau_bo *, unsigned dstoff, unsigned dstdom,
+                        struct nouveau_bo *, unsigned srcoff, unsigned srcdom,
+                        unsigned size);
+
+#endif