X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fnouveau%2Fnouveau_screen.h;h=5a3cfab92e993f90f9813e39ab83f8e7ec7916c1;hb=c20e7417992380871261699c2b0123819e7d51fc;hp=f4a7a2bc234cce2715eb29f14a2034330a317ef0;hpb=f60524938e76befd9b14e9ec6506aefece94f995;p=mesa.git

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h
index f4a7a2bc234..5a3cfab92e9 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.h
+++ b/src/gallium/drivers/nouveau/nouveau_screen.h
@@ -1,51 +1,66 @@
 #ifndef __NOUVEAU_SCREEN_H__
 #define __NOUVEAU_SCREEN_H__
 
+#include "pipe/p_screen.h"
+#include "util/u_memory.h"
+
+typedef uint32_t u32;
+
+extern int nouveau_mesa_debug;
+
+struct nouveau_bo;
+
 struct nouveau_screen {
 	struct pipe_screen base;
 	struct nouveau_device *device;
-	struct nouveau_channel *channel;
-
-        /**
-         * Create a new texture object, using the given template info, but on top of
-         * existing memory.
-         * 
-         * It is assumed that the buffer data is layed out according to the expected
-         * by the hardware. NULL will be returned if any inconsistency is found.  
-         */
-        struct pipe_texture * (*texture_blanket)(struct pipe_screen *,
-                                                 const struct pipe_texture *templat,
-                                                 const unsigned *stride,
-                                                 struct pipe_buffer *buffer);
-
-	int (*pre_pipebuffer_map_callback) (struct pipe_screen *pscreen,
-		struct pipe_buffer *pb, unsigned usage);
+	struct nouveau_object *channel;
+	struct nouveau_client *client;
+	struct nouveau_pushbuf *pushbuf;
+
+	unsigned vidmem_bindings; /* PIPE_BIND_* where VRAM placement is desired */
+	unsigned sysmem_bindings; /* PIPE_BIND_* where GART placement is desired */
+	unsigned lowmem_bindings; /* PIPE_BIND_* that require an address < 4 GiB */
+	/*
+	 * For bindings with (vidmem & sysmem) bits set set, PIPE_USAGE_* decides
+	 * placement.
+	 */
+
+	uint16_t class_3d;
+
+	struct {
+		struct nouveau_fence *head;
+		struct nouveau_fence *tail;
+		struct nouveau_fence *current;
+		u32 sequence;
+		u32 sequence_ack;
+		void (*emit)(struct pipe_screen *, u32 *sequence);
+		u32  (*update)(struct pipe_screen *);
+	} fence;
+
+	struct nouveau_mman *mm_VRAM;
+	struct nouveau_mman *mm_GART;
 };
 
-static inline struct nouveau_screen *
+static INLINE struct nouveau_screen *
 nouveau_screen(struct pipe_screen *pscreen)
 {
 	return (struct nouveau_screen *)pscreen;
 }
 
-static inline struct nouveau_bo *
-nouveau_bo(struct pipe_buffer *pb)
-{
-	return pb ? *(struct nouveau_bo **)(pb + 1) : NULL;
-}
+boolean
+nouveau_screen_bo_get_handle(struct pipe_screen *pscreen,
+			     struct nouveau_bo *bo,
+			     unsigned stride,
+			     struct winsys_handle *whandle);
+struct nouveau_bo *
+nouveau_screen_bo_from_handle(struct pipe_screen *pscreen,
+			      struct winsys_handle *whandle,
+			      unsigned *out_stride);
+
 
 int nouveau_screen_init(struct nouveau_screen *, struct nouveau_device *);
 void nouveau_screen_fini(struct nouveau_screen *);
 
-struct nouveau_miptree {
-	struct pipe_texture base;
-	struct nouveau_bo *bo;
-};
-
-static inline struct nouveau_miptree *
-nouveau_miptree(struct pipe_texture *pt)
-{
-	return (struct nouveau_miptree *)pt;
-}
+void nouveau_screen_init_vdec(struct nouveau_screen *);
 
 #endif