xf86-video-intel: Branch 'dri2' - src/i830_batchbuffer.c src/i830_driver.c

[Keith Packard]

 src/i830_batchbuffer.c |    2 +-
 src/i830_driver.c      |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8a54e3be5c5057fe8e3c52c03401fdada7978c45
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Sep 12 12:47:13 2008 -0700

    Fix mis-merge of DRI2 changes related to pI830->directRenderingType
    
    The old code had a directRendering boolean, the new one has an enum. A bunch
    of the merges failed to remove the '!' in front of the old name, breaking a
    bunch of 'we don't have DRI' tests.

diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 6e71b50..47fc331 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -124,7 +124,7 @@ intel_batch_init(ScrnInfoPtr pScrn)
 
     intel_next_batch(pScrn);
 
-    if (!pI830->directRenderingType <= DRI_NONE) {
+    if (pI830->directRenderingType <= DRI_NONE) {
 	if (IS_I830(pI830) || IS_845G(pI830)) {
 	    intel_bufmgr_fake_set_exec_callback(pI830->bufmgr,
 						intel_nondrm_exec_i830,
diff --git a/src/i830_driver.c b/src/i830_driver.c
index a8bf925..9f76b7c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1715,7 +1715,7 @@ I830XvInit(ScrnInfoPtr pScrn)
 #endif
 #ifdef INTEL_XVMC
     pI830->XvMCEnabled = FALSE;
-    from =  (!pI830->directRenderingType != DRI_DISABLED &&
+    from =  (pI830->directRenderingType != DRI_DISABLED &&
 	     xf86GetOptValBool(pI830->Options, OPTION_XVMC,
 			       &pI830->XvMCEnabled)) ? X_CONFIG : X_DEFAULT;
     xf86DrvMsg(pScrn->scrnIndex, from, "Intel XvMC decoder %sabled\n",
@@ -1731,7 +1731,7 @@ I830DriOptsInit(ScrnInfoPtr pScrn)
     MessageType from = X_PROBED;
 
     pI830->allowPageFlip = FALSE;
-    from = (!pI830->directRenderingType != DRI_DISABLED &&
+    from = (pI830->directRenderingType != DRI_DISABLED &&
 	    xf86GetOptValBool(pI830->Options, OPTION_PAGEFLIP,
 			      &pI830->allowPageFlip)) ? X_CONFIG : X_DEFAULT;
 
@@ -1739,7 +1739,7 @@ I830DriOptsInit(ScrnInfoPtr pScrn)
 	       pI830->allowPageFlip ? "" : " not");
 
     pI830->TripleBuffer = FALSE;
-    from =  (!pI830->directRenderingType != DRI_DISABLED &&
+    from =  (pI830->directRenderingType != DRI_DISABLED &&
 	     xf86GetOptValBool(pI830->Options, OPTION_TRIPLEBUFFER,
 			       &pI830->TripleBuffer)) ? X_CONFIG : X_DEFAULT;
 
@@ -2008,7 +2008,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
 #if defined(XF86DRI)
    /* Load the dri module if requested. */
    if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI, FALSE) &&
-       !pI830->directRenderingType != DRI_DISABLED) {
+       pI830->directRenderingType != DRI_DISABLED) {
       if (xf86LoadSubModule(pScrn, "dri")) {
 	 xf86LoaderReqSymLists(I810driSymbols, I810drmSymbols, NULL);
       }