nv30, nv40: unify all structures and headers, except shaders

[mesa.git] / src / gallium / drivers / nv30 / nv30_transfer.c

diff --git a/src/gallium/drivers/nv30/nv30_transfer.c b/src/gallium/drivers/nv30/nv30_transfer.c
index 65598991c689c1a242a7c0d4eb3b8efe9ce70a0f..3d71df52b907eec9b403c7794dacc3149ec51a8e 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_transfer.c
+++ b/src/gallium/drivers/nv30/nv30_transfer.c
@@ -1,13 +1,13 @@
-#include <pipe/p_state.h>
-#include <pipe/p_defines.h>
-#include <pipe/p_inlines.h>
-#include <util/u_format.h>
-#include <util/u_memory.h>
-#include <util/u_math.h>
-#include <nouveau/nouveau_winsys.h>
+#include "pipe/p_state.h"
+#include "pipe/p_defines.h"
+#include "util/u_inlines.h"
+#include "util/u_format.h"
+#include "util/u_memory.h"
+#include "util/u_math.h"
+#include "nouveau/nouveau_winsys.h"
 #include "nv30_context.h"
-#include "nv30_screen.h"
-#include "nv30_state.h"
+#include "nvfx_screen.h"
+#include "nvfx_state.h"
 
 struct nv30_transfer {
        struct pipe_transfer base;
@@ -33,12 +33,13 @@ nv30_compatible_transfer_tex(struct pipe_texture *pt, unsigned width, unsigned h
 }
 
 static struct pipe_transfer *
-nv30_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
+nv30_transfer_new(struct pipe_context *pcontext, struct pipe_texture *pt,
                  unsigned face, unsigned level, unsigned zslice,
                  enum pipe_transfer_usage usage,
                  unsigned x, unsigned y, unsigned w, unsigned h)
 {
-       struct nv30_miptree *mt = (struct nv30_miptree *)pt;
+        struct pipe_screen *pscreen = pcontext->screen;
+       struct nvfx_miptree *mt = (struct nvfx_miptree *)pt;
        struct nv30_transfer *tx;
        struct pipe_texture tx_tex_template, *tx_tex;
 
@@ -80,7 +81,7 @@ nv30_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
                return NULL;
        }
 
-       tx->base.stride = ((struct nv30_miptree*)tx_tex)->level[0].pitch;
+       tx->base.stride = ((struct nvfx_miptree*)tx_tex)->level[0].pitch;
 
        tx->surface = pscreen->get_tex_surface(pscreen, tx_tex,
                                               0, 0, 0,
@@ -96,7 +97,7 @@ nv30_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
        }
 
        if (usage & PIPE_TRANSFER_READ) {
-               struct nv30_screen *nvscreen = nv30_screen(pscreen);
+               struct nvfx_screen *nvscreen = nvfx_screen(pscreen);
                struct pipe_surface *src;
 
                src = pscreen->get_tex_surface(pscreen, pt,
@@ -117,13 +118,14 @@ nv30_transfer_new(struct pipe_screen *pscreen, struct pipe_texture *pt,
 }
 
 static void
-nv30_transfer_del(struct pipe_transfer *ptx)
+nv30_transfer_del(struct pipe_context *pcontext,
+                  struct pipe_transfer *ptx)
 {
        struct nv30_transfer *tx = (struct nv30_transfer *)ptx;
 
        if (!tx->direct && (ptx->usage & PIPE_TRANSFER_WRITE)) {
-               struct pipe_screen *pscreen = ptx->texture->screen;
-               struct nv30_screen *nvscreen = nv30_screen(pscreen);
+               struct pipe_screen *pscreen = pcontext->screen;
+               struct nvfx_screen *nvscreen = nvfx_screen(pscreen);
                struct pipe_surface *dst;
 
                dst = pscreen->get_tex_surface(pscreen, ptx->texture,
@@ -145,11 +147,12 @@ nv30_transfer_del(struct pipe_transfer *ptx)
 }
 
 static void *
-nv30_transfer_map(struct pipe_screen *pscreen, struct pipe_transfer *ptx)
+nv30_transfer_map(struct pipe_context *pcontext, struct pipe_transfer *ptx)
 {
+        struct pipe_screen *pscreen = pcontext->screen;
        struct nv30_transfer *tx = (struct nv30_transfer *)ptx;
        struct nv04_surface *ns = (struct nv04_surface *)tx->surface;
-       struct nv30_miptree *mt = (struct nv30_miptree *)tx->surface->texture;
+       struct nvfx_miptree *mt = (struct nvfx_miptree *)tx->surface->texture;
        void *map = pipe_buffer_map(pscreen, mt->buffer,
                                    pipe_transfer_buffer_flags(ptx));
 
@@ -160,19 +163,20 @@ nv30_transfer_map(struct pipe_screen *pscreen, struct pipe_transfer *ptx)
 }
 
 static void
-nv30_transfer_unmap(struct pipe_screen *pscreen, struct pipe_transfer *ptx)
+nv30_transfer_unmap(struct pipe_context *pcontext, struct pipe_transfer *ptx)
 {
+        struct pipe_screen *pscreen = pcontext->screen;
        struct nv30_transfer *tx = (struct nv30_transfer *)ptx;
-       struct nv30_miptree *mt = (struct nv30_miptree *)tx->surface->texture;
+       struct nvfx_miptree *mt = (struct nvfx_miptree *)tx->surface->texture;
 
        pipe_buffer_unmap(pscreen, mt->buffer);
 }
 
 void
-nv30_screen_init_transfer_functions(struct pipe_screen *pscreen)
+nv30_init_transfer_functions(struct nvfx_context *nvfx)
 {
-       pscreen->get_tex_transfer = nv30_transfer_new;
-       pscreen->tex_transfer_destroy = nv30_transfer_del;
-       pscreen->transfer_map = nv30_transfer_map;
-       pscreen->transfer_unmap = nv30_transfer_unmap;
+       nvfx->pipe.get_tex_transfer = nv30_transfer_new;
+       nvfx->pipe.tex_transfer_destroy = nv30_transfer_del;
+       nvfx->pipe.transfer_map = nv30_transfer_map;
+       nvfx->pipe.transfer_unmap = nv30_transfer_unmap;
 }