Changeset 78341 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130318

Message:

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

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (2 diffs)
• renderspu.h (modified) (3 diffs)
• renderspu_glx.c (modified) (1 diff)
• renderspu_init.c (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -466 +466 @@
     if (window && context)
     {
-#ifdef CHROMIUM_THREADSAFE
         crSetTSD(&_RenderTSD, context);
-#else
-        render_spu.currentContext = context;
-#endif
         context->currentWindow = window;
 
@@ -509 +505 @@
     {
         renderspu_SystemMakeCurrent( NULL, 0, NULL );
-#ifdef CHROMIUM_THREADSAFE
         crSetTSD(&_RenderTSD, NULL);
-#else
-        render_spu.currentContext = NULL;
-#endif
     }
     else

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -232 +232 @@
     ContextInfo *defaultSharedContext;
 
-#ifndef CHROMIUM_THREADSAFE
-    ContextInfo *currentContext;
-#endif
-
     crOpenGLInterface ws;  /**< Window System interface */
 
@@ -306 +302 @@
 extern uint64_t render_spu_parent_window_id;
 
-#ifdef CHROMIUM_THREADSAFE
 extern CRtsd _RenderTSD;
 #define GET_CONTEXT_VAL() ((ContextInfo *) crGetTSD(&_RenderTSD))
@@ -312 +307 @@
         crSetTSD(&_RenderTSD, (_v)); \
     } while (0)
-#else
-#define GET_CONTEXT_VAL() (render_spu.currentContext)
-#define SET_CONTEXT_VAL(_v) do { \
-        render_spu.currentContext = (_v); \
-    } while (0)
-
-#endif
 
 #define GET_CONTEXT(T)  ContextInfo *T = GET_CONTEXT_VAL()

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_glx.c

@@ -1572 +1572 @@
         if (window->BltInfo.width != w || window->BltInfo.height != h) {
             /* Only resize if the new dimensions really are different */
-#ifdef CHROMIUM_THREADSAFE
             ContextInfo *currentContext = (ContextInfo *) crGetTSD(&_RenderTSD);
-#else
-            ContextInfo *currentContext = render_spu.currentContext;
-#endif
             /* Can't resize pbuffers, so destroy it and make a new one */
             render_spu.ws.glXDestroyPbuffer(window->visual->dpy, window->window);

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

@@ -28 +28 @@
 RenderSPU render_spu;
 uint64_t render_spu_parent_window_id = 0;
-
-#ifdef CHROMIUM_THREADSAFE
 CRtsd _RenderTSD;
-#endif
 
 #ifdef RT_OS_WINDOWS
@@ -151 +148 @@
     self->privatePtr = (void *) &render_spu;
 
-#ifdef CHROMIUM_THREADSAFE
     crDebug("Render SPU: thread-safe");
     crInitTSD(&_RenderTSD);
-#endif
 
     crMemZero(&render_spu, sizeof(render_spu));
@@ -498 +493 @@
     crUnloadOpenGL();
 
-#ifdef CHROMIUM_THREADSAFE
     crFreeTSD(&_RenderTSD);
-#endif
-
     return 1;
 }