Put some fallback debugging output under DEBUG_FALLBACKS.

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_screen.h

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h
index 4a0f6d47f2add57836051e22d1e72616c9be01f2..b9cbeaac3354f889b5233140511e75a90d468792 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.h
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.h
@@ -37,28 +37,26 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_SCREEN_H__
 #define __RADEON_SCREEN_H__
 
-#ifdef GLX_DIRECT_RENDERING
-
 /*
  * IMPORTS: these headers contain all the DRI, X and kernel-related
  * definitions that we need.
  */
-#include "dri_util.h"
-#include "radeon_common.h"
+/* #include "dri_util.h" */
 #include "radeon_dri.h"
 #include "radeon_reg.h"
-#include "radeon_sarea.h"
+#include "drm_sarea.h"
 #include "xmlconfig.h"
 
 
 typedef struct {
-   drmHandle handle;                   /* Handle to the DRM region */
+   drm_handle_t handle;                        /* Handle to the DRM region */
    drmSize size;                       /* Size of the DRM region */
    drmAddress map;                     /* Mapping of the DRM region */
 } radeonRegionRec, *radeonRegionPtr;
 
 /* chipset features */
 #define RADEON_CHIPSET_TCL     (1 << 0)
+#define RADEON_CHIPSET_BROKEN_STENCIL (1 << 1)
 
 typedef struct {
 
@@ -89,19 +87,17 @@ typedef struct {
 
    drmBufMapPtr buffers;
 
-   __volatile__ CARD32 *scratch;
+   __volatile__ u_int32_t *scratch;
 
    __DRIscreenPrivate *driScreen;
    unsigned int sarea_priv_offset;
    unsigned int gart_buffer_offset;    /* offset in card memory space */
    unsigned int gart_texture_offset;   /* offset in card memory space */
 
+   GLboolean depthHasSurface;
+
    /* Configuration cache with default values for all contexts */
    driOptionCache optionCache;
 } radeonScreenRec, *radeonScreenPtr;
 
-extern radeonScreenPtr radeonCreateScreen( __DRIscreenPrivate *sPriv );
-extern void radeonDestroyScreen( __DRIscreenPrivate *sPriv );
-
-#endif
 #endif /* __RADEON_SCREEN_H__ */