commit bf0146ef4965d1b2c565232058b56878e08825ec
author Tobin Ehlis <tobin@lunarg.com> Wed Feb 11 14:24:02 2015 -0700
committer Tobin Ehlis <tobin@lunarg.com> Wed Feb 11 16:36:56 2015 -0700
tree b066dcf4d40ed6d7ddfa2872027f2fb3eb71a7ff
parent 23bd382d49a63a8ec7346fd3da7256a8f0dc9fbe

layers: Fixes for Windows build

layers/draw_state.c

diff --git a/layers/draw_state.c b/layers/draw_state.c
index a10d949..383211a 100644
--- a/layers/draw_state.c
+++ b/layers/draw_state.c
@@ -421,36 +421,36 @@
 // Return Region node ptr for specified region or else NULL
 static REGION_NODE* getRegionNode(XGL_DESCRIPTOR_REGION region)
 {
-    pthread_mutex_lock(&globalLock);
+    loader_platform_thread_lock_mutex(&globalLock);
     REGION_NODE* pTrav = g_pRegionHead;
     while (pTrav) {
         if (pTrav->region == region) {
-            pthread_mutex_unlock(&globalLock);
+            loader_platform_thread_unlock_mutex(&globalLock);
             return pTrav;
         }
         pTrav = pTrav->pNext;
     }
-    pthread_mutex_unlock(&globalLock);
+    loader_platform_thread_unlock_mutex(&globalLock);
     return NULL;
 }
 
 // Return Set node ptr for specified set or else NULL
 static SET_NODE* getSetNode(XGL_DESCRIPTOR_SET set)
 {
-    pthread_mutex_lock(&globalLock);
+    loader_platform_thread_lock_mutex(&globalLock);
     REGION_NODE* pTrav = g_pRegionHead;
     while (pTrav) {
         SET_NODE* pSet = pTrav->pSets;
         while (pSet) {
             if (pSet->set == set) {
-                pthread_mutex_unlock(&globalLock);
+                loader_platform_thread_unlock_mutex(&globalLock);
                 return pSet;
             }
             pSet = pSet->pNext;
         }
         pTrav = pTrav->pNext;
     }
-    pthread_mutex_unlock(&globalLock);
+    loader_platform_thread_unlock_mutex(&globalLock);
     return NULL;
 }
 
@@ -469,16 +469,16 @@
 }
 
 static LAYOUT_NODE* getLayoutNode(XGL_DESCRIPTOR_SET_LAYOUT layout) {
-    pthread_mutex_lock(&globalLock);
+    loader_platform_thread_lock_mutex(&globalLock);
     LAYOUT_NODE* pTrav = g_pLayoutHead;
     while (pTrav) {
         if (pTrav->layout == layout) {
-            pthread_mutex_unlock(&globalLock);
+            loader_platform_thread_unlock_mutex(&globalLock);
             return pTrav;
         }
         pTrav = pTrav->pNext;
     }
-    pthread_mutex_unlock(&globalLock);
+    loader_platform_thread_unlock_mutex(&globalLock);
     return NULL;
 }
 
@@ -934,7 +934,7 @@
     }
 }
 
-static void initDrawState()
+static void initDrawState(void)
 {
     const char *strOpt;
     // initialize DrawState options
@@ -1262,13 +1262,13 @@
 {
     XGL_RESULT result = nextTable.CreateBuffer(device, pCreateInfo, pBuffer);
     if (XGL_SUCCESS == result) {
-        pthread_mutex_lock(&globalLock);
+        loader_platform_thread_lock_mutex(&globalLock);
         BUFFER_NODE *pNewNode = (BUFFER_NODE*)malloc(sizeof(BUFFER_NODE));
         pNewNode->buffer = *pBuffer;
         memcpy(&pNewNode->createInfo, pCreateInfo, sizeof(XGL_BUFFER_CREATE_INFO));
         pNewNode->pNext = g_pBufferHead;
         g_pBufferHead = pNewNode;
-        pthread_mutex_unlock(&globalLock);
+        loader_platform_thread_unlock_mutex(&globalLock);
     }
     return result;
 }
@@ -1307,13 +1307,13 @@
 {
     XGL_RESULT result = nextTable.CreateImageView(device, pCreateInfo, pView);
     if (XGL_SUCCESS == result) {
-        pthread_mutex_lock(&globalLock);
+        loader_platform_thread_lock_mutex(&globalLock);
         IMAGE_NODE *pNewNode = (IMAGE_NODE*)malloc(sizeof(IMAGE_NODE));
         pNewNode->image = *pView;
         memcpy(&pNewNode->createInfo, pCreateInfo, sizeof(XGL_IMAGE_VIEW_CREATE_INFO));
         pNewNode->pNext = g_pImageHead;
         g_pImageHead = pNewNode;
-        pthread_mutex_unlock(&globalLock);
+        loader_platform_thread_unlock_mutex(&globalLock);
     }
     return result;
 }
@@ -1502,7 +1502,7 @@
         char str[1024];
         sprintf(str, "Created Descriptor Region %p", (void*)*pDescriptorRegion);
         layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, pDescriptorRegion, 0, DRAWSTATE_NONE, "DS", str);
-        pthread_mutex_lock(&globalLock);
+        loader_platform_thread_lock_mutex(&globalLock);
         REGION_NODE* pNewNode = (REGION_NODE*)malloc(sizeof(REGION_NODE));
         if (NULL == pNewNode) {
             char str[1024];
@@ -1524,7 +1524,7 @@
             pNewNode->maxSets      = maxSets;
             pNewNode->region       = *pDescriptorRegion;
         }
-        pthread_mutex_unlock(&globalLock);
+        loader_platform_thread_unlock_mutex(&globalLock);
     }
     else {
         // Need to do anything if region create fails?