svga: emit sampler declarations in the helper function for non vgpu10

[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 77b552af6b0d6f3472e9e8b74b8aa953adc52e16..98b56b2a6d1c420a164ed38e26f4f4542a9aaac1 100644 (file)
--- 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
@@ -30,8 +30,6 @@
 #include "pipe/p_screen.h"
 #include "os/os_thread.h"
 
-#include "util/u_double_list.h"
-
 #include "svga_screen_cache.h"
 
 
@@ -49,7 +47,14 @@ struct svga_screen
 
    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;
@@ -67,6 +72,7 @@ struct svga_screen
    /* which formats to translate depth formats into */
    struct {
      enum SVGA3dSurfaceFormat z16;
+
      /* note gallium order */
      enum SVGA3dSurfaceFormat x8z24;
      enum SVGA3dSurfaceFormat s8z24;
@@ -74,13 +80,17 @@ struct svga_screen
 
    struct svga_host_surface_cache cache;
 
-   /** Memory used by all resources (buffers and surfaces) */
-   uint64_t total_resource_bytes;
+   /** HUD counters */
+   struct {
+      /** Memory used by all resources (buffers and surfaces) */
+      uint64_t total_resource_bytes;
+      uint64_t num_resources;
+   } 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;