nouveau: notifier timeout is a float now

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

diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 48feeba309d24c860afcc72e96f877e78fa88bda..e935ffffc1d74864c91d6dc1040e06b5f0396128 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -2,7 +2,7 @@
 #define NOUVEAU_WINSYS_H
 
 #include <stdint.h>
-#include "pipe/p_winsys.h"
+#include "pipe/internal/p_winsys_screen.h"
 #include "pipe/p_defines.h"
 
 #include "nouveau/nouveau_bo.h"
@@ -17,6 +17,8 @@
 #define NOUVEAU_CAP_HW_VTXBUF (0xbeef0000)
 #define NOUVEAU_CAP_HW_IDXBUF (0xbeef0001)
 
+#define NOUVEAU_TEXTURE_USAGE_LINEAR (1 << 16)
+
 #define NOUVEAU_BUFFER_USAGE_TEXTURE (1 << 16)
 #define NOUVEAU_BUFFER_USAGE_ZETA    (1 << 17)
 
@@ -48,7 +50,7 @@ struct nouveau_winsys {
        uint32_t  (*notifier_status)(struct nouveau_notifier *, int id);
        uint32_t  (*notifier_retval)(struct nouveau_notifier *, int id);
        int       (*notifier_wait)(struct nouveau_notifier *, int id,
-                                  int status, int timeout);
+                                  int status, float timeout);
 
        int (*surface_copy)(struct nouveau_winsys *, struct pipe_surface *,
                            unsigned, unsigned, struct pipe_surface *,
@@ -69,6 +71,12 @@ nv10_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *);
 extern struct pipe_context *
 nv10_create(struct pipe_screen *, unsigned pctx_id);
 
+extern struct pipe_screen *
+nv20_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *);
+
+extern struct pipe_context *
+nv20_create(struct pipe_screen *, unsigned pctx_id);
+
 extern struct pipe_screen *
 nv30_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *);