Squashed commit of the following:

[mesa.git] / src / gallium / drivers / nvfx / nvfx_screen.h

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.h b/src/gallium/drivers/nvfx/nvfx_screen.h
index b56f2d4b3f3ac791b80c9ab589804fc6a13aa804..3302e1aa5865d06f28bbe527679715a018519d29 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_screen.h
+++ b/src/gallium/drivers/nvfx/nvfx_screen.h
@@ -2,7 +2,8 @@
 #define __NVFX_SCREEN_H__
 
 #include "nouveau/nouveau_screen.h"
-#include "nouveau/nv04_surface_2d.h"
+#include "nv04_surface_2d.h"
+#include "nvfx_context.h"
 
 struct nvfx_screen {
        struct nouveau_screen base;
@@ -11,6 +12,9 @@ struct nvfx_screen {
 
        struct nvfx_context *cur_ctx;
 
+       unsigned is_nv4x; /* either 0 or ~0 */
+       int vertex_buffer_flags;
+
        /* HW graphics objects */
        struct nv04_surface_2d *eng2d;
        struct nouveau_grobj *eng3d;