Changeset 39602 in vbox for trunk/src/VBox/GuestHost/OpenGL/include

Timestamp:

Dec 14, 2011 11:12:17 AM (13 years ago)

Author:

vboxsync

Message:

wine/XPDM: 1. Additional swapchain creation fixes 2. De-libwine'ize wined3d 3. Single context per swapchain 4. wine & crOgl current context sync fixes 5. Proper Get/ReleaseDC handling

Location:

trunk/src/VBox/GuestHost/OpenGL/include

Files:

• cr_glstate.h (modified) (2 diffs)
• cr_threads.h (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_glstate.h

@@ -47 +47 @@
 
 #ifdef CHROMIUM_THREADSAFE
-#include "cr_threads.h"
+# include <cr_threads.h>
 #endif
 
@@ -133 +133 @@
      * => Thread2 still refers to destroyed ctx1
      * */
-    CRTSDREFDATA
+    VBOXTLSREFDATA
 #endif
 

trunk/src/VBox/GuestHost/OpenGL/include/cr_threads.h

@@ -101 +101 @@
 extern DECLEXPORT(void) crSignalSemaphore(CRsemaphore *s);
 
-typedef DECLCALLBACK(void) FNCRTSDREFDTOR(void*);
-typedef FNCRTSDREFDTOR *PFNCRTSDREFDTOR;
+#define VBoxTlsRefGetImpl(_tls) (crGetTSD((CRtsd*)(_tls)))
+#define VBoxTlsRefSetImpl(_tls, _val) (crSetTSD((CRtsd*)(_tls), (_val)))
+#define VBoxTlsRefAssertImpl CRASSERT
+#include <VBox/VBoxVideo3D.h>
 
-typedef enum {
-    CRTSDREFDATA_STATE_UNDEFINED = 0,
-    CRTSDREFDATA_STATE_INITIALIZED,
-    CRTSDREFDATA_STATE_TOBE_DESTROYED,
-    CRTSDREFDATA_STATE_DESTROYING,
-    CRTSDREFDATA_STATE_32BIT_HACK = 0x7fffffff
-} CRTSDREFDATA_STATE;
-
-#define CRTSDREFDATA \
-    volatile int32_t cTsdRefs; \
-    uint32_t enmTsdRefState; \
-    PFNCRTSDREFDTOR pfnTsdRefDtor; \
-
-#define crTSDRefInit(_p, _pfnDtor) do { \
-        (_p)->cTsdRefs = 1; \
-        (_p)->enmTsdRefState = CRTSDREFDATA_STATE_INITIALIZED; \
-        (_p)->pfnTsdRefDtor = (_pfnDtor); \
-    } while (0)
-
-#define crTSDRefIsFunctional(_p) (!!((_p)->enmTsdRefState == CRTSDREFDATA_STATE_INITIALIZED))
-
-#define crTSDRefAddRef(_p) do { \
-        int cRefs = ASMAtomicIncS32(&(_p)->cTsdRefs); \
-        CRASSERT(cRefs > 1 || (_p)->enmTsdRefState == CRTSDREFDATA_STATE_DESTROYING); \
-    } while (0)
-
-#define crTSDRefRelease(_p) do { \
-        int cRefs = ASMAtomicDecS32(&(_p)->cTsdRefs); \
-        CRASSERT(cRefs >= 0); \
-        if (!cRefs && (_p)->enmTsdRefState != CRTSDREFDATA_STATE_DESTROYING /* <- avoid recursion if crTSDRefAddRef/Release is called from dtor */) { \
-            (_p)->enmTsdRefState = CRTSDREFDATA_STATE_DESTROYING; \
-            (_p)->pfnTsdRefDtor((_p)); \
-        } \
-    } while (0)
-
-#define crTSDRefReleaseMarkDestroy(_p) do { \
-        (_p)->enmTsdRefState = CRTSDREFDATA_STATE_TOBE_DESTROYED; \
-    } while (0)
-
-#define crTSDRefGetCurrent(_t, _pTsd) ((_t*) crGetTSD((_pTsd)))
-
-#define crTSDRefSetCurrent(_t, _pTsd, _p) do { \
-        _t * oldCur = crTSDRefGetCurrent(_t, _pTsd); \
-        if (oldCur != (_p)) { \
-            crSetTSD((_pTsd), (_p)); \
-            if (oldCur) { \
-                crTSDRefRelease(oldCur); \
-            } \
-            if ((_p)) { \
-                crTSDRefAddRef((_t*)(_p)); \
-            } \
-        } \
-    } while (0)
 #ifdef __cplusplus
 }