From: Keith Whitwell <keithw@vmware.com>
Date: Tue, 10 Feb 2009 19:22:57 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.2' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9c9ba66fbae8089e9423f6b09ad1091cccf9b006;p=mesa.git

Merge commit 'origin/gallium-0.2' into gallium-0.2

Conflicts:

	src/gallium/state_trackers/wgl/icd/stw_icd.c
---

9c9ba66fbae8089e9423f6b09ad1091cccf9b006
diff --cc src/gallium/state_trackers/wgl/icd/stw_icd.c
index 2cefc5c812c,8fa9f4e667f..e4f3c669e20
--- a/src/gallium/state_trackers/wgl/icd/stw_icd.c
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c
@@@ -101,7 -89,10 +101,10 @@@ lookup_context( struct stw_icd *icd
         dhglrc >= DRV_CONTEXT_MAX)
        return NULL;
  
 -   if(!stw_icd)
++   if (icd == NULL)
+       return NULL;
+ 
 -   return stw_icd->ctx_array[dhglrc - 1].ctx;
 +   return icd->ctx_array[dhglrc - 1].ctx;
  }
  
  BOOL APIENTRY