summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Kuehling <fxkuehl@gmx.de>2005-01-16 01:22:09 +0000
committerFelix Kuehling <fxkuehl@gmx.de>2005-01-16 01:22:09 +0000
commit9514ee39f7e5063383b99de580e7e3115645e886 (patch)
tree51e564d2b2bcb2f3bd3c62fb0dac4f959428f8e4
parentffc51f1f32c57a99f2a8b02c0a9aa211362ec9b2 (diff)
Fixed a bug that prevented the driver from ever emitting triangle strips or
fans. Bumped patchlevel and driver date.
-rw-r--r--shared-core/savage_drv.h4
-rw-r--r--shared-core/savage_state.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/shared-core/savage_drv.h b/shared-core/savage_drv.h
index 16211a5a..b69bd82e 100644
--- 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 44034a1c..c70bc6aa 100644
--- 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;