Changeset 50975 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2014 7:12:59 PM (11 years ago)

Author:

vboxsync

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

93144

Message:

crOpenGL build fix take 2

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_unpack.h (modified) (1 diff)
• HostServices/SharedOpenGL/Makefile.kmk (modified) (1 diff)
• HostServices/SharedOpenGL/unpacker/unpack.py (modified) (1 diff)

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

@@ -37 +37 @@
 } CR_UNPACK_BUFFER_TYPE;
 
-DECLINLINE(CR_UNPACK_BUFFER_TYPE) crUnpackGetBufferType(const void *opcodes, unsigned int num_opcodes)
-{
-    const uint8_t *pu8Codes = (const uint8_t *)opcodes;
-
-    CR_UNPACK_BUFFER_TYPE enmType;
-    uint8_t first;
-    uint8_t last;
-
-    if (!num_opcodes)
-        return CR_UNPACK_BUFFER_TYPE_GENERIC;
-
-    first = pu8Codes[0];
-    last = pu8Codes[1-(int)num_opcodes];
-
-    enmType = (first != CR_CMDBLOCKBEGIN_OPCODE) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN;
-
-    if (last != CR_CMDBLOCKEND_OPCODE)
-        return enmType;
-
-    /* last is CMDBLOCKEND*/
-    return (enmType == CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_END;
-}
+DECLEXPORT(CR_UNPACK_BUFFER_TYPE) crUnpackGetBufferType(const void *opcodes, unsigned int num_opcodes);
 
 extern CRNetworkPointer * return_ptr;

trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

@@ -53 +53 @@
 endif
 VBoxSharedCrOpenGL_INTERMEDIATES = \
-        $(TEMPLATE_VBOXMAINEXE_INTERMEDIATES) \
-        $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h
-
+        $(TEMPLATE_VBOXMAINEXE_INTERMEDIATES)
 VBoxSharedCrOpenGL_INCS.win = \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack.py

@@ -205 +205 @@
     cr_unpackData = node->unpackData;
     crFree( node );
+}
+
+CR_UNPACK_BUFFER_TYPE crUnpackGetBufferType(const void *opcodes, unsigned int num_opcodes)
+{
+    const uint8_t *pu8Codes = (const uint8_t *)opcodes;
+
+    CR_UNPACK_BUFFER_TYPE enmType;
+    uint8_t first;
+    uint8_t last;
+
+    if (!num_opcodes)
+        return CR_UNPACK_BUFFER_TYPE_GENERIC;
+
+    first = pu8Codes[0];
+    last = pu8Codes[1-(int)num_opcodes];
+
+    enmType = (first != CR_CMDBLOCKBEGIN_OPCODE) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN;
+
+    if (last != CR_CMDBLOCKEND_OPCODE)
+        return enmType;
+
+    /* last is CMDBLOCKEND*/
+    return (enmType == CR_UNPACK_BUFFER_TYPE_CMDBLOCK_BEGIN) ? CR_UNPACK_BUFFER_TYPE_GENERIC : CR_UNPACK_BUFFER_TYPE_CMDBLOCK_END;
 }