radeon/llvm: Remove AMDILMCCodeEmitter.cpp

[mesa.git] / src / gallium / drivers / nouveau / nouveau_screen.h

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.h b/src/gallium/drivers/nouveau/nouveau_screen.h
index a7927d88dfc832fec9011e52e95fa7a5481b0762..4ca286bfe8da60ba145d4ff83f3200dcee1a5999 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_screen.h
+++ b/src/gallium/drivers/nouveau/nouveau_screen.h
@@ -1,39 +1,60 @@
 #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;
-
-       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 sysmem_bindings;
+
+       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