X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_screen.h;h=12b93468da2eea73f0a6a2bb9541a9c0d5612abb;hb=0e30c6b8a7e84211bb417362ec73f24ef134ae34;hp=b94ca7fc1cad2f66c775a35b3068751e2f00df39;hpb=a3eb0f718e19653a2ad8e49396c904183be456f3;p=mesa.git

diff --git a/src/gallium/drivers/svga/svga_screen.h b/src/gallium/drivers/svga/svga_screen.h
index b94ca7fc1ca..12b93468da2 100644
--- a/src/gallium/drivers/svga/svga_screen.h
+++ b/src/gallium/drivers/svga/svga_screen.h
@@ -1,4 +1,4 @@
-/**********************************************************
+ /**********************************************************
  * Copyright 2008-2009 VMware, Inc.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person
@@ -28,9 +28,7 @@
 
 
 #include "pipe/p_screen.h"
-#include "pipe/p_thread.h"
-
-#include "util/u_double_list.h"
+#include "os/os_thread.h"
 
 #include "svga_screen_cache.h"
 
@@ -39,8 +37,6 @@ struct svga_winsys_screen;
 struct svga_winsys_context;
 struct SVGACmdMemory;
 
-#define SVGA_COMBINE_USERBUFFERS 1
-
 /**
  * Subclass of pipe_screen
  */
@@ -49,37 +45,54 @@ struct svga_screen
    struct pipe_screen screen;
    struct svga_winsys_screen *sws;
 
-   unsigned use_ps30;
-   unsigned use_vs30;
-   
+   SVGA3dHardwareVersion hw_version;
+
+   /** Device caps */
+   boolean haveProvokingVertex;
+   boolean haveLineStipple, haveLineSmooth;
+   float maxLineWidth, maxLineWidthAA;
+   float maxPointSize;
+   unsigned max_color_buffers;
+   unsigned max_const_buffers;
+   unsigned ms_samples;
+
    struct {
       boolean force_level_surface_view;
       boolean force_surface_view;
       boolean no_surface_view;
       boolean force_sampler_view;
       boolean no_sampler_view;
+      boolean no_cache_index_buffers;
    } 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 */
-   
-   /** 
-    * List of buffers with cached GMR. Ordered from the most recently used to
-    * the least recently used 
-    */
-   struct list_head cached_buffers;
-   
+   mtx_t tex_mutex;
+
+   mtx_t 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;
+
+   /** HUD counters */
+   struct {
+      /** Memory used by all resources (buffers and surfaces) */
+      uint64_t total_resource_bytes;
+      uint64_t num_resources;
+      uint64_t num_failed_allocations;
+   } hud;
 };
 
 #ifndef DEBUG
 /** cast wrapper */
-static INLINE struct svga_screen *
+static inline struct svga_screen *
 svga_screen(struct pipe_screen *pscreen)
 {
    return (struct svga_screen *) pscreen;
@@ -89,7 +102,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 */