Changeset 69392 in vbox for trunk/src/VBox/GuestHost/OpenGL/util

Timestamp:

Oct 26, 2017 5:24:52 PM (7 years ago)

Author:

vboxsync

Message:

GuestHost/OpenGL: scm updates

Location:

trunk/src/VBox/GuestHost/OpenGL/util

Files:

• blitter.cpp (modified) (4 diffs)
• compositor.cpp (modified) (2 diffs)
• debug_opcodes.py (modified) (1 prop)
• lowercase.py (modified) (1 prop)
• net.c (modified) (1 diff)
• pixel.c (modified) (1 diff)
• util.def (modified) (1 prop)
• vboxhgcm.c (modified) (8 diffs)
• vboxhgsmi.c (modified) (9 diffs)
• vreg.cpp (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp

@@ -17 +17 @@
 
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #ifdef IN_VMSVGA3D
 # include <OpenGL/OpenGL.h>
@@ -833 +833 @@
         crWarning("GL_ARB_pixel_buffer_object not supported");
 
-    /* BlitFramebuffer seems to be buggy on Intel, 
+    /* BlitFramebuffer seems to be buggy on Intel,
      * try always glDrawXxx for now */
     if (!pBlitter->Flags.ForceDrawBlit && crStrstr(pszExtension, "GL_EXT_framebuffer_blit"))
@@ -1001 +1001 @@
     pBlitter->pDispatch->BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, pBlitter->idFBO);
 
-    /* TODO: mag/min filters ? */
+    /** @todo mag/min filters ? */
 
     pBlitter->pDispatch->FramebufferTexture2DEXT(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, pDst->target, pDst->hwid, 0);
@@ -1161 +1161 @@
     crWarning("GLSL unsuported, gl version %d", pCache->iGlVersion);
 
-    /* @todo: we could also check for GL_ARB_shader_objects and GL_ARB_fragment_shader,
+    /** @todo we could also check for GL_ARB_shader_objects and GL_ARB_fragment_shader,
      * but seems like chromium does not support properly gl*Object versions of shader functions used with those extensions */
     return false;

trunk/src/VBox/GuestHost/OpenGL/util/compositor.cpp

@@ -16 +16 @@
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include "../include/cr_compositor.h"
 
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define VBOXVR_SCR_COMPOSITOR_RECTS_UNDEFINED UINT32_MAX
 #ifdef IN_VMSVGA3D
@@ -514 +515 @@
                                                    bool fPosRelated, bool *pfChanged)
 {
-    /* @todo: the fChanged sate calculation is really rough now, this is enough for now though */
+    /** @todo the fChanged sate calculation is really rough now, this is enough for now though */
     bool fChanged = false, fPosChanged = false;
     bool fWasInList = CrVrScrCompositorEntryIsInList(pEntry);

trunk/src/VBox/GuestHost/OpenGL/util/net.c

@@ -441 +441 @@
     {
 #ifdef WINDOWS
-        /* @todo: do we actually need that WSA stuff with VBox at all? */
+        /** @todo do we actually need that WSA stuff with VBox at all? */
         WORD wVersionRequested = MAKEWORD(2, 0);
         WSADATA wsaData;

trunk/src/VBox/GuestHost/OpenGL/util/pixel.c

@@ -1693 +1693 @@
     (void)dstPacking;
 
-    /*@todo this should be implemented properly*/
+    /** @todo this should be implemented properly*/
 
 #ifndef DEBUG_misha

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -46 +46 @@
 #endif
 
-/*@todo move define somewhere else, and make sure it's less than VBGLR0_MAX_HGCM_KERNEL_PARM*/
+/** @todo move define somewhere else, and make sure it's less than VBGLR0_MAX_HGCM_KERNEL_PARM*/
 /*If we fail to pass data in one chunk, send it in chunks of this size instead*/
 #define CR_HGCM_SPLIT_BUFFER_SIZE (8*_1M)
@@ -545 +545 @@
 
 #ifndef IN_GUEST
-/*@todo get rid of it*/
+/** @todo get rid of it*/
 static bool _crVBoxHGCMWriteBytes(CRConnection *conn, const void *buf, uint32_t len)
 {
@@ -593 +593 @@
     else
 # endif
-    {        
+    {
         rc = VbglR3HGCMCall(pData, cbData);
         if (RT_SUCCESS(rc))
@@ -916 +916 @@
     {
 #ifndef IN_GUEST
-            /**@todo remove temp buffer allocation in unpacker*/
+            /** @todo remove temp buffer allocation in unpacker*/
             /* we're at the host side, so just store data until guest polls us */
             _crVBoxHGCMWriteBytes(conn, start, len);
@@ -1023 +1023 @@
     CRASSERT(hgcm_buffer->magic == CR_VBOXHGCM_BUFFER_MAGIC);
 
-    /*@todo wrong len for redir buffers*/
+    /** @todo wrong len for redir buffers*/
     conn->recv_credits += hgcm_buffer->len;
 
@@ -1033 +1033 @@
 #endif
             if (g_crvboxhgcm.bufpool) {
-                /**@todo o'rly? */
+                /** @todo o'rly? */
                 /* pool may have been deallocated just a bit earlier in response
                  * to a SIGPIPE (Broken Pipe) signal.
@@ -1376 +1376 @@
 }
 
-/*@todo same, replace DeviceIoControl with vbglR3DoIOCtl */
+/** @todo same, replace DeviceIoControl with vbglR3DoIOCtl */
 static void crVBoxHGCMDoDisconnect( CRConnection *conn )
 {
@@ -2189 +2189 @@
 
     /* Can't open VBox guest driver here, because it gets called for host side as well */
-    /*@todo as we have 2 dll versions, can do it now.*/
+    /** @todo as we have 2 dll versions, can do it now.*/
 
 #ifdef RT_OS_WINDOWS

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c

@@ -618 +618 @@
         {
             _crVBoxHGSMIWaitCmd(pClient);
-                /* @todo: do we need to wait for completion actually?
+                /** @todo do we need to wait for completion actually?
                  * NOTE: in case we do not need completion,
                  * we MUST specify bDoNotSignalCompletion flag for the command buffer */
@@ -652 +652 @@
         {
             _crVBoxHGSMIWaitCmd(pClient);
-                /* @todo: do we need to wait for completion actually?
+                /** @todo do we need to wait for completion actually?
                  * NOTE: in case we do not need completion,
                  * we MUST specify bDoNotSignalCompletion flag for the command buffer */
@@ -924 +924 @@
         pClient = _crVBoxHGSMIClientGet();
 #ifndef IN_GUEST
-            //@todo remove temp buffer allocation in unpacker
+            /// @todo remove temp buffer allocation in unpacker
             /* we're at the host side, so just store data until guest polls us */
             _crVBoxHGCMWriteBytes(conn, start, len);
@@ -1010 +1010 @@
     else
     {
-        /*@todo wrong len for redir buffers*/
+        /** @todo wrong len for redir buffers*/
         conn->recv_credits += hgsmi_buffer->u32Len;
 
@@ -1245 +1245 @@
 }
 
-/*@todo same, replace DeviceIoControl with vbglR3DoIOCtl */
+/** @todo same, replace DeviceIoControl with vbglR3DoIOCtl */
 static void crVBoxHGSMIDoDisconnect( CRConnection *conn )
 {
@@ -1261 +1261 @@
     conn->cbBuffer = 0;
 
-    //@todo hold lock here?
+    /// @todo hold lock here?
     if (conn->type == CR_VBOXHGCM)
     {
@@ -1348 +1348 @@
     Assert(0);
 
-    /* @todo */
+    /** @todo */
 }
 
@@ -1395 +1395 @@
 
     /* Can't open VBox guest driver here, because it gets called for host side as well */
-    /*@todo as we have 2 dll versions, can do it now.*/
+    /** @todo as we have 2 dll versions, can do it now.*/
 
 #ifdef RT_OS_WINDOWS
@@ -1483 +1483 @@
     conn->allow_redir_ptr = 1;
 
-    //@todo remove this crap at all later
+    /// @todo remove this crap at all later
     conn->cbHostBufferAllocated = 0;//2*1024;
     conn->pHostBuffer = NULL;//(uint8_t*) crAlloc(conn->cbHostBufferAllocated);

trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp

@@ -16 +16 @@
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #ifdef IN_VMSVGA3D
 # include "../include/cr_vreg.h"
@@ -99 +100 @@
 
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define VBOXVR_INVALID_COORD    (~0U)
 
 
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 static volatile int32_t g_cVBoxVrInits = 0;
 
@@ -812 +813 @@
                     Assert(VBoxRectCmp(pRect2, &RegRect1));
 
-                    /* @todo: this can have false-alarming sometimes if the separated rects will then be joind into the original rect,
+                    /** @todo this can have false-alarming sometimes if the separated rects will then be joind into the original rect,
                      * so far this should not be a problem for VReg clients, so keep it this way for now  */
                     fChanged = true;
@@ -961 +962 @@
         return VINF_SUCCESS;
 
-    /* @todo: fChanged will have false alarming here, fix if needed */
+    /** @todo fChanged will have false alarming here, fix if needed */
     VBoxVrListClear(pList);