summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2004-06-07 20:18:43 +0000
committerIan Romanick <idr@us.ibm.com>2004-06-07 20:18:43 +0000
commit03d7596b84bbe1e913206ebca91b9d05ed57e0ab (patch)
tree4dc3128ce7de83aa3433b5df2152e9f01804a407
parent635ba1565cfbb02fbdd19de72651dbda9bb3c3b3 (diff)
downloadexternal_mesa3d-03d7596b84bbe1e913206ebca91b9d05ed57e0ab.zip
external_mesa3d-03d7596b84bbe1e913206ebca91b9d05ed57e0ab.tar.gz
external_mesa3d-03d7596b84bbe1e913206ebca91b9d05ed57e0ab.tar.bz2
The required DDX and DRI version numbers were switched. This went unnoticed
on several drivers (i.e., R200, Radeon, R128, Unichrome) becuase the required DRI and DDX versions were 4.0.0. Mach64 was already fixed.
-rw-r--r--src/mesa/drivers/dri/i810/i810screen.c4
-rw-r--r--src/mesa/drivers/dri/i830/i830_screen.c4
-rw-r--r--src/mesa/drivers/dri/mga/mga_xmesa.c4
-rw-r--r--src/mesa/drivers/dri/tdfx/tdfx_screen.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c
index 39acf63..8c0c076 100644
--- a/src/mesa/drivers/dri/i810/i810screen.c
+++ b/src/mesa/drivers/dri/i810/i810screen.c
@@ -426,8 +426,8 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc
{
__DRIscreenPrivate *psp;
- static const __DRIversion ddx_expected = { 4, 0, 0 };
- static const __DRIversion dri_expected = { 1, 0, 0 };
+ static const __DRIversion ddx_expected = { 1, 0, 0 };
+ static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 1, 2, 0 };
if ( ! driCheckDriDdxDrmVersions2( "i810",
diff --git a/src/mesa/drivers/dri/i830/i830_screen.c b/src/mesa/drivers/dri/i830/i830_screen.c
index da4c94d..5a6a49e 100644
--- a/src/mesa/drivers/dri/i830/i830_screen.c
+++ b/src/mesa/drivers/dri/i830/i830_screen.c
@@ -544,8 +544,8 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc
{
__DRIscreenPrivate *psp;
- static const __DRIversion ddx_expected = { 4, 0, 0 };
- static const __DRIversion dri_expected = { 1, 0, 0 };
+ static const __DRIversion ddx_expected = { 1, 0, 0 };
+ static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 1, 3, 0 };
if ( ! driCheckDriDdxDrmVersions2( "i830",
diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index e0f3a02..af96d7c 100644
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -956,8 +956,8 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc
{
__DRIscreenPrivate *psp;
- static const __DRIversion ddx_expected = { 4, 0, 0 };
- static const __DRIversion dri_expected = { 1, 0, 0 };
+ static const __DRIversion ddx_expected = { 1, 0, 0 };
+ static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 3, 0, 0 };
if ( ! driCheckDriDdxDrmVersions2( "MGA",
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.c b/src/mesa/drivers/dri/tdfx/tdfx_screen.c
index d4d5515..3579397 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_screen.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.c
@@ -376,8 +376,8 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc
__GLcontextModes ** driver_modes )
{
__DRIscreenPrivate *psp;
- static const __DRIversion ddx_expected = { 4, 0, 0 };
- static const __DRIversion dri_expected = { 1, 0, 0 };
+ static const __DRIversion ddx_expected = { 1, 0, 0 };
+ static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 1, 0, 0 };
if ( ! driCheckDriDdxDrmVersions2( "tdfx",