uint*t -> u_int*t changes

[mesa.git] / src / mesa / drivers / dri / r200 / r200_screen.c

diff --git a/src/mesa/drivers/dri/r200/r200_screen.c b/src/mesa/drivers/dri/r200/r200_screen.c
index 167e93a6acb9c02ebb3e7650e4117ac673a4c855..6731287d7b7366aefc58296e0eaabf337b6614a0 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_screen.c
+++ b/src/mesa/drivers/dri/r200/r200_screen.c
@@ -50,9 +50,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "utils.h"
 #include "vblank.h"
-#ifndef _SOLO
 #include "GL/internal/dri_interface.h"
-#endif
 
 /* R200 configuration
  */
@@ -65,11 +63,13 @@ DRI_CONF_BEGIN
         DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
         DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
         DRI_CONF_MAX_TEXTURE_UNITS(4,2,6)
+        DRI_CONF_HYPERZ(false)
     DRI_CONF_SECTION_END
     DRI_CONF_SECTION_QUALITY
         DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB)
         DRI_CONF_DEF_MAX_ANISOTROPY(1.0,"1.0,2.0,4.0,8.0,16.0")
         DRI_CONF_NO_NEG_LOD_BIAS(false)
+        DRI_CONF_FORCE_S3TC_ENABLE(false)
         DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER)
         DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC)
         DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF)
@@ -77,8 +77,12 @@ DRI_CONF_BEGIN
     DRI_CONF_SECTION_DEBUG
         DRI_CONF_NO_RAST(false)
     DRI_CONF_SECTION_END
+    DRI_CONF_SECTION_SOFTWARE
+        DRI_CONF_ARB_VERTEX_PROGRAM(true)
+        DRI_CONF_NV_VERTEX_PROGRAM(false)
+    DRI_CONF_SECTION_END
 DRI_CONF_END;
-static const GLuint __driNConfigOptions = 11;
+static const GLuint __driNConfigOptions = 15;
 
 #if 1
 /* Including xf86PciInfo.h introduces a bunch of errors...
@@ -89,7 +93,8 @@ static const GLuint __driNConfigOptions = 11;
 #define PCI_CHIP_R200_QG       0x5147
 #define PCI_CHIP_R200_QY       0x5159
 #define PCI_CHIP_R200_QZ       0x515A
-#define PCI_CHIP_R200_LW       0x4C57 
+#define PCI_CHIP_R200_LW       0x4C57
+#define PCI_CHIP_R200_LX       0x4C58
 #define PCI_CHIP_R200_LY       0x4C59
 #define PCI_CHIP_R200_LZ       0x4C5A
 #define PCI_CHIP_RV200_QW      0x5157 /* Radeon 7500 - not an R200 at all */
@@ -114,8 +119,14 @@ static const GLuint __driNConfigOptions = 11;
 #define PCI_CHIP_R200_QM        0x514D
 #define PCI_CHIP_R200_QN        0x514E
 #define PCI_CHIP_R200_QO        0x514F /* r200 (non-derived) end */
-/* are the R200 Qh (0x5168) and following needed too? They are not in xf86PciInfo.h
-   but in the pci database. Maybe just secondary ports or something ? */
+/* are the R200 Qh (0x5168) and following needed too? They are not in
+   xf86PciInfo.h but in the pci database. Maybe just secondary ports or
+   something ? Ah well, better be safe than sorry */
+#define PCI_CHIP_R200_Qh        0x5168
+#define PCI_CHIP_R200_Qi        0x5169
+#define PCI_CHIP_R200_Qj        0x516A
+#define PCI_CHIP_R200_Qk        0x516B
+#define PCI_CHIP_R200_Ql        0x516C
 
 #endif
 
@@ -149,8 +160,8 @@ r200FillInModes( unsigned pixel_bits, unsigned depth_bits,
        GLX_NONE, GLX_SWAP_UNDEFINED_OML /*, GLX_SWAP_COPY_OML */
     };
 
-    uint8_t depth_bits_array[2];
-    uint8_t stencil_bits_array[2];
+    u_int8_t depth_bits_array[2];
+    u_int8_t stencil_bits_array[2];
 
 
     depth_bits_array[0] = depth_bits;
@@ -239,6 +250,7 @@ r200CreateScreen( __DRIscreenPrivate *sPriv )
    case PCI_CHIP_RV200_QW:
    case PCI_CHIP_RV200_QX:
    case PCI_CHIP_R200_LW:
+   case PCI_CHIP_R200_LX:
    case PCI_CHIP_R200_LY:
    case PCI_CHIP_R200_LZ:
    case PCI_CHIP_RS100_4136:
@@ -267,6 +279,11 @@ r200CreateScreen( __DRIscreenPrivate *sPriv )
    case PCI_CHIP_R200_QM:
    case PCI_CHIP_R200_QN:
    case PCI_CHIP_R200_QO:
+   case PCI_CHIP_R200_Qh:
+   case PCI_CHIP_R200_Qi:
+   case PCI_CHIP_R200_Qj:
+   case PCI_CHIP_R200_Qk:
+   case PCI_CHIP_R200_Ql:
       screen->chipset |= R200_CHIPSET_REAL_R200;
    /* fallthrough */
    default:
@@ -355,7 +372,7 @@ r200CreateScreen( __DRIscreenPrivate *sPriv )
       __driUtilMessage("%s: drmMap (2) failed\n", __FUNCTION__ );
       return NULL;
    }
-   screen->scratch = (__volatile__ uint32_t *)
+   screen->scratch = (__volatile__ u_int32_t *)
       ((GLubyte *)screen->status.map + RADEON_SCRATCH_REG_OFFSET);
 
    screen->buffers = drmMapBufs( sPriv->fd );
@@ -433,7 +450,7 @@ r200CreateScreen( __DRIscreenPrivate *sPriv )
 
    screen->driScreen = sPriv;
    screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
-#ifndef _SOLO
+
    if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) {
       PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
           (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" );
@@ -462,7 +479,6 @@ r200CreateScreen( __DRIscreenPrivate *sPriv )
         }
       }
    }
-#endif
    return screen;
 }
 
@@ -572,7 +588,6 @@ static const struct __DriverAPIRec r200API = {
  *
  */
 #if !defined(DRI_NEW_INTERFACE_ONLY)
-#ifndef _SOLO 
 void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
                         int numConfigs, __GLXvisualConfig *config)
 {
@@ -580,15 +595,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
    psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &r200API);
    return (void *) psp;
 }
-#else
-void *__driCreateScreen(struct DRIDriverRec *driver,
-                        struct DRIDriverContextRec *driverContext)
-{
-   __DRIscreenPrivate *psp;
-   psp = __driUtilCreateScreen(driver, driverContext, &r200API);
-   return (void *) psp;
-}
-#endif
 #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */