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, 0 insertions, 144 deletions

diff --git a/src/gallium/drivers/nvc0/nvc0_winsys.h b/src/gallium/drivers/nvc0/nvc0_winsys.h
deleted file mode 100644
index 25183a45f20..00000000000
--- a/src/gallium/drivers/nvc0/nvc0_winsys.h
+++ /dev/null
@@ -1,144 +0,0 @@
-
-#ifndef __NVC0_WINSYS_H__
-#define __NVC0_WINSYS_H__
-
-#include <stdint.h>
-#include <unistd.h>
-
-#include "pipe/p_defines.h"
-
-#include "nouveau/nouveau_winsys.h"
-#include "nouveau/nouveau_buffer.h"
-
-#ifndef NV04_PFIFO_MAX_PACKET_LEN
-#define NV04_PFIFO_MAX_PACKET_LEN 2047
-#endif
-
-
-static INLINE void
-nv50_add_bufctx_resident_bo(struct nouveau_bufctx *bufctx, int bin,
-                            unsigned flags, struct nouveau_bo *bo)
-{
-   nouveau_bufctx_refn(bufctx, bin, bo, flags)->priv = NULL;
-}
-
-static INLINE void
-nvc0_add_resident(struct nouveau_bufctx *bufctx, int bin,
-                  struct nv04_resource *res, unsigned flags)
-{
-   struct nouveau_bufref *ref =
-      nouveau_bufctx_refn(bufctx, bin, res->bo, flags | res->domain);
-   ref->priv = res;
-   ref->priv_data = flags;
-}
-
-#define BCTX_REFN_bo(ctx, bin, fl, bo) \
-   nv50_add_bufctx_resident_bo(ctx, NVC0_BIND_##bin, fl, bo);
-
-#define BCTX_REFN(bctx, bin, res, acc) \
-   nvc0_add_resident(bctx, NVC0_BIND_##bin, res, NOUVEAU_BO_##acc)
-
-static INLINE void
-PUSH_REFN(struct nouveau_pushbuf *push, struct nouveau_bo *bo, uint32_t flags)
-{
-   struct nouveau_pushbuf_refn ref = { bo, flags };
-   nouveau_pushbuf_refn(push, &ref, 1);
-}
-
-
-#define SUBC_3D(m) 0, (m)
-#define NVC0_3D(n) SUBC_3D(NVC0_3D_##n)
-#define NVE4_3D(n) SUBC_3D(NVE4_3D_##n)
-
-#define SUBC_COMPUTE(m) 1, (m)
-#define NVC0_COMPUTE(n) SUBC_COMPUTE(NVC0_COMPUTE_##n)
-#define NVE4_COMPUTE(n) SUBC_COMPUTE(NVE4_COMPUTE_##n)
-
-#define SUBC_M2MF(m) 2, (m)
-#define SUBC_P2MF(m) 2, (m)
-#define NVC0_M2MF(n) SUBC_M2MF(NVC0_M2MF_##n)
-#define NVE4_P2MF(n) SUBC_P2MF(NVE4_P2MF_##n)
-
-#define SUBC_2D(m) 3, (m)
-#define NVC0_2D(n) SUBC_2D(NVC0_2D_##n)
-
-#define SUBC_COPY(m) 4, (m)
-#define NVE4_COPY(m) SUBC_COPY(NVE4_COPY_##n)
-
-#define SUBC_SW(m) 7, (m)
-
-static INLINE uint32_t
-NVC0_FIFO_PKHDR_SQ(int subc, int mthd, unsigned size)
-{
-   return 0x20000000 | (size << 16) | (subc << 13) | (mthd >> 2);
-}
-
-static INLINE uint32_t
-NVC0_FIFO_PKHDR_NI(int subc, int mthd, unsigned size)
-{
-   return 0x60000000 | (size << 16) | (subc << 13) | (mthd >> 2);
-}
-
-static INLINE uint32_t
-NVC0_FIFO_PKHDR_IL(int subc, int mthd, uint8_t data)
-{
-   return 0x80000000 | (data << 16) | (subc << 13) | (mthd >> 2);
-}
-
-static INLINE uint32_t
-NVC0_FIFO_PKHDR_1I(int subc, int mthd, unsigned size)
-{
-   return 0xa0000000 | (size << 16) | (subc << 13) | (mthd >> 2);
-}
-
-
-static INLINE uint8_t
-nouveau_bo_memtype(const struct nouveau_bo *bo)
-{
-   return bo->config.nvc0.memtype;
-}
-
-
-static INLINE void
-PUSH_DATAh(struct nouveau_pushbuf *push, uint64_t data)
-{
-   *push->cur++ = (uint32_t)(data >> 32);
-}
-
-static INLINE void
-BEGIN_NVC0(struct nouveau_pushbuf *push, int subc, int mthd, unsigned size)
-{
-#ifndef NVC0_PUSH_EXPLICIT_SPACE_CHECKING
-   PUSH_SPACE(push, size + 1);
-#endif
-   PUSH_DATA (push, NVC0_FIFO_PKHDR_SQ(subc, mthd, size));
-}
-
-static INLINE void
-BEGIN_NIC0(struct nouveau_pushbuf *push, int subc, int mthd, unsigned size)
-{
-#ifndef NVC0_PUSH_EXPLICIT_SPACE_CHECKING
-   PUSH_SPACE(push, size + 1);
-#endif
-   PUSH_DATA (push, NVC0_FIFO_PKHDR_NI(subc, mthd, size));
-}
-
-static INLINE void
-BEGIN_1IC0(struct nouveau_pushbuf *push, int subc, int mthd, unsigned size)
-{
-#ifndef NVC0_PUSH_EXPLICIT_SPACE_CHECKING
-   PUSH_SPACE(push, size + 1);
-#endif
-   PUSH_DATA (push, NVC0_FIFO_PKHDR_1I(subc, mthd, size));
-}
-
-static INLINE void
-IMMED_NVC0(struct nouveau_pushbuf *push, int subc, int mthd, uint8_t data)
-{
-#ifndef NVC0_PUSH_EXPLICIT_SPACE_CHECKING
-   PUSH_SPACE(push, 1);
-#endif
-   PUSH_DATA (push, NVC0_FIFO_PKHDR_IL(subc, mthd, data));
-}
-
-#endif /* __NVC0_WINSYS_H__ */