summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2005-07-26 21:53:16 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2005-07-26 21:53:16 +0000
commit13613986004fcd43e8079b23d8128c2d572bca76 (patch)
tree6aabf821161a480526ca39d5a467c34981deb4b7
parent5c6fd3dd4c1b8e95c4da8cc4a52aa310ad324d45 (diff)
downloadmesa-13613986004fcd43e8079b23d8128c2d572bca76.tar.gz
Bump the required ddx to 1.4.0 as drmAddress has been removed so that 32/64bit
combinations work.
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 71a8aeba1e8..7c1bb67f91d 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -424,9 +424,17 @@ intelFillInModes( unsigned pixel_bits, unsigned depth_bits,
fprintf( stderr, "[%s:%u] Error creating FBConfig!\n",
__func__, __LINE__ );
return NULL;
- }
-
- /* There's no direct color modes on intel? */
+ }
+#if 0
+ if ( ! driFillInModes( & m, fb_format, fb_type,
+ depth_bits_array, stencil_bits_array, depth_buffer_factor,
+ back_buffer_modes, back_buffer_factor,
+ GLX_DIRECT_COLOR ) ) {
+ fprintf( stderr, "[%s:%u] Error creating FBConfig!\n",
+ __func__, __LINE__ );
+ return NULL;
+ }
+#endif
/* Mark the visual as slow if there are "fake" stencil bits.
*/
@@ -464,7 +472,7 @@ void * __driCreateNewScreen_20050725( __DRInativeDisplay *dpy, int scrn, __DRIsc
{
__DRIscreenPrivate *psp;
- static const __DRIversion ddx_expected = { 1, 0, 0 };
+ static const __DRIversion ddx_expected = { 1, 4, 0 };
static const __DRIversion dri_expected = { 4, 0, 0 };
static const __DRIversion drm_expected = { 1, 1, 0 };