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 09726fd892dbd799ae4e445f780d8d8c9cb4e314..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"
@@ -20,8 +20,7 @@
 #define NOUVEAU_TEXTURE_USAGE_LINEAR (1 << 16)
 
 #define NOUVEAU_BUFFER_USAGE_TEXTURE (1 << 16)
-#define NOUVEAU_BUFFER_USAGE_CPU     (1 << 17)
-#define NOUVEAU_BUFFER_USAGE_ZETA    (1 << 18)
+#define NOUVEAU_BUFFER_USAGE_ZETA    (1 << 17)
 
 struct nouveau_winsys {
        struct nouveau_context *nv;
@@ -51,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 *,