llvmpipe: Implement logic ops for the AoS path.

[mesa.git] / src / gallium / drivers / svga / svga_screen.h

diff --git a/src/gallium/drivers/svga/svga_screen.h b/src/gallium/drivers/svga/svga_screen.h
index 9dc229b0a8789bbe35610d5c8cee5ecdb717f3dc..d7d2c7563598293b0a84f900881d8fa501a5ae7e 100644 (file)
--- a/src/gallium/drivers/svga/svga_screen.h
+++ b/src/gallium/drivers/svga/svga_screen.h
@@ -39,8 +39,6 @@ struct svga_winsys_screen;
 struct svga_winsys_context;
 struct SVGACmdMemory;
 
-#define SVGA_COMBINE_USERBUFFERS 1
-
 /**
  * Subclass of pipe_screen
  */
@@ -49,9 +47,10 @@ struct svga_screen
    struct pipe_screen screen;
    struct svga_winsys_screen *sws;
 
-   unsigned use_ps30;
-   unsigned use_vs30;
-   
+   SVGA3dHardwareVersion hw_version;
+
+   float maxPointSize;
+
    struct {
       boolean force_level_surface_view;
       boolean force_surface_view;
@@ -60,14 +59,19 @@ struct svga_screen
       boolean no_sampler_view;
    } debug;
 
-   /* The screen needs its own context */
-   struct svga_winsys_context *swc;
-   struct SVGACmdMemory *fifo;
-
    unsigned texture_timestamp;
    pipe_mutex tex_mutex; 
-   pipe_mutex swc_mutex; /* Protects the use of swc and dirty_buffers */
-   
+
+   pipe_mutex swc_mutex; /* Used for buffer uploads */
+
+   /* which formats to translate depth formats into */
+   struct {
+     enum SVGA3dSurfaceFormat z16;
+     /* note gallium order */
+     enum SVGA3dSurfaceFormat x8z24;
+     enum SVGA3dSurfaceFormat s8z24;
+   } depth;
+
    struct svga_host_surface_cache cache;
 };
 
@@ -83,7 +87,4 @@ struct svga_screen *
 svga_screen(struct pipe_screen *screen);
 #endif
 
-void svga_screen_flush( struct svga_screen *svga_screen, 
-                        struct pipe_fence_handle **pfence );
-
 #endif /* SVGA_SCREEN_H */