Mesa (gallium-0.2): wgl: return before locking if stw_icd is NULL

Keith Whitwell keithw at kemper.freedesktop.org
Tue Feb 10 19:39:36 UTC 2009


Module: Mesa
Branch: gallium-0.2
Commit: f54149a3a3dde8056a8db9b9ac7cef32885946d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f54149a3a3dde8056a8db9b9ac7cef32885946d7

Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Tue Feb 10 18:21:41 2009 +0000

wgl: return before locking if stw_icd is NULL

---

 src/gallium/state_trackers/wgl/icd/stw_icd.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/wgl/icd/stw_icd.c b/src/gallium/state_trackers/wgl/icd/stw_icd.c
index e4f3c66..1aa4b8a 100644
--- a/src/gallium/state_trackers/wgl/icd/stw_icd.c
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c
@@ -76,7 +76,7 @@ stw_icd_cleanup(void)
 {
    int i;
 
-   if(!stw_icd)
+   if (!stw_icd)
       return;
    
    pipe_mutex_lock( stw_icd->mutex );
@@ -115,6 +115,9 @@ DrvCopyContext(
 {
    BOOL ret = FALSE;
 
+   if (!stw_icd)
+      return FALSE;
+
    pipe_mutex_lock( stw_icd->mutex );
    {
       struct stw_context *src = lookup_context( stw_icd, dhrcSource );
@@ -136,7 +139,10 @@ DrvCreateLayerContext(
    HDC hdc,
    INT iLayerPlane )
 {
-   DHGLRC handle = 0;;
+   DHGLRC handle = 0;
+
+   if (!stw_icd)
+      return handle;
 
    pipe_mutex_lock( stw_icd->mutex );
    {
@@ -179,6 +185,9 @@ DrvDeleteContext(
 {
    BOOL ret = FALSE;
 
+   if (!stw_icd)
+      return ret;
+
    pipe_mutex_lock( stw_icd->mutex );
    {
       struct stw_context *ctx;
@@ -273,6 +282,9 @@ DrvReleaseContext(
 {
    BOOL ret = FALSE;
 
+   if (!stw_icd)
+      return ret;
+
    pipe_mutex_lock( stw_icd->mutex );
    {
       struct stw_context *ctx;
@@ -661,6 +673,9 @@ DrvSetContext(
 {
    PGLCLTPROCTABLE result = NULL;
 
+   if (!stw_icd)
+      return result;
+
    pipe_mutex_lock( stw_icd->mutex ); 
    {
       struct stw_context *ctx;




More information about the mesa-commit mailing list