Fixed a bug that prevented the driver from ever emitting triangle strips or

    fans. Bumped patchlevel and driver date.

diff --git a/shared-core/savage_drv.h b/shared-core/savage_drv.h
index 16211a5..b69bd82 100644 (file)
--- a/shared-core/savage_drv.h
+++ b/shared-core/savage_drv.h
@@ -30,11 +30,11 @@
 
 #define DRIVER_NAME    "savage"
 #define DRIVER_DESC    "Savage3D/MX/IX, Savage4, SuperSavage, Twister, ProSavage[DDR]"
-#define DRIVER_DATE    "20050110"
+#define DRIVER_DATE    "20050115"
 
 #define DRIVER_MAJOR           2
 #define DRIVER_MINOR           1
-#define DRIVER_PATCHLEVEL      2
+#define DRIVER_PATCHLEVEL      3
 /* Interface history:
  *
  * 1.x   The DRM driver from the VIA/S3 code drop, basically a dummy

diff --git a/shared-core/savage_state.c b/shared-core/savage_state.c
index 44034a1..c70bc6a 100644 (file)
--- a/shared-core/savage_state.c
+++ b/shared-core/savage_state.c
@@ -275,8 +275,8 @@ static int savage_dispatch_dma_prim(drm_savage_private_t *dev_priv,
 {
        BCI_LOCALS;
        unsigned char reorder = 0;
-       unsigned char prim = cmd_header->prim.prim;
-       unsigned short skip = cmd_header->prim.skip;
+       unsigned int prim = cmd_header->prim.prim;
+       unsigned int skip = cmd_header->prim.skip;
        unsigned int n = cmd_header->prim.count;
        unsigned int start = cmd_header->prim.start;
        unsigned int i;
@@ -407,8 +407,8 @@ static int savage_dispatch_vb_prim(drm_savage_private_t *dev_priv,
 {
        BCI_LOCALS;
        unsigned char reorder = 0;
-       unsigned char prim = cmd_header->prim.prim;
-       unsigned short skip = cmd_header->prim.skip;
+       unsigned int prim = cmd_header->prim.prim;
+       unsigned int skip = cmd_header->prim.skip;
        unsigned int n = cmd_header->prim.count;
        unsigned int start = cmd_header->prim.start;
        unsigned int vtx_size;