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

Timestamp:

Apr 28, 2019 4:47:51 PM (6 years ago)

Author:

vboxsync

Message:

Config.kmk,Additions/common/crOpenGL,VBox/GuestHost/OpenGL,HostServices/SharedOpenGL: Remove CHROMIUM_THREADSAFE define and apply the current default

Location:

trunk/src/VBox/GuestHost/OpenGL/include

Files:

• cr_glstate.h (modified) (3 diffs)
• cr_pack.h (modified) (3 diffs)

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

@@ -46 +46 @@
 #include "spu_dispatch_table.h"
 
-#ifdef CHROMIUM_THREADSAFE
-# include <cr_threads.h>
-#endif
+#include "cr_threads.h"
 
 #include <iprt/cdefs.h>
@@ -132 +130 @@
     int id;
 
-#ifdef CHROMIUM_THREADSAFE
     /* we keep reference counting of context's makeCurrent for different threads
      * this is primarily needed to avoid having an invalid memory reference in the TLS
@@ -143 +140 @@
      * */
     VBOXTLSREFDATA
-#endif
 
     CRbitvalue bitid[CR_MAX_BITARRAY];

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

@@ -15 +15 @@
 #include "state/cr_currentpointers.h"
 #include "state/cr_client.h"
-#ifdef CHROMIUM_THREADSAFE
 #include "cr_threads.h"
-#endif
 
 #include <iprt/types.h>
@@ -84 +82 @@
     int updateBBOX;
     CRPackBuffer *currentBuffer;
-#ifdef CHROMIUM_THREADSAFE
     CRmutex mutex;
-#endif
     char *file;  /**< for debugging only */
     int line;    /**< for debugging only */
@@ -97 +93 @@
 # define CR_PACKER_CONTEXT_ARG_NOREF()  do {} while (0)
 # define CR_PACKER_CONTEXT_ARGCTX(C)
-# ifdef CHROMIUM_THREADSAFE
 extern CRtsd _PackerTSD;
-#  define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = (CRPackContext *) crGetTSD(&_PackerTSD)
-#  define CR_LOCK_PACKER_CONTEXT(PC) crLockMutex(&((PC)->mutex))
-#  define CR_UNLOCK_PACKER_CONTEXT(PC) crUnlockMutex(&((PC)->mutex))
-# else
-extern DLLDATA(CRPackContext) cr_packer_globals;
-#  define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = &cr_packer_globals
-#  define CR_LOCK_PACKER_CONTEXT(PC)
-#  define CR_UNLOCK_PACKER_CONTEXT(PC)
-# endif
+# define CR_GET_PACKER_CONTEXT(C) CRPackContext *C = (CRPackContext *) crGetTSD(&_PackerTSD)
+# define CR_LOCK_PACKER_CONTEXT(PC) crLockMutex(&((PC)->mutex))
+# define CR_UNLOCK_PACKER_CONTEXT(PC) crUnlockMutex(&((PC)->mutex))
 extern uint32_t cr_packer_cmd_blocks_enabled;
 #else /* if defined IN_RING0 */