Changeset 73097 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Jul 12, 2018 9:06:33 PM (6 years ago)

Author:

vboxsync

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (8 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -63 +63 @@
 
 #define SHCROGL_GET_STRUCT_PART(_pPtr, _type, _from, _to) do { \
-            rc = SSMR3GetMem(pSSM, &(_pPtr)->_from, RT_OFFSETOF(_type, _to) - RT_OFFSETOF(_type, _from)); \
+            rc = SSMR3GetMem(pSSM, &(_pPtr)->_from, RT_UOFFSETOF(_type, _to) - RT_UOFFSETOF(_type, _from)); \
             AssertRCReturn(rc, rc); \
         } while (0)
 
 #define SHCROGL_GET_STRUCT_TAIL(_pPtr, _type, _from) do { \
-            rc = SSMR3GetMem(pSSM, &(_pPtr)->_from, sizeof (_type) - RT_OFFSETOF(_type, _from)); \
+            rc = SSMR3GetMem(pSSM, &(_pPtr)->_from, sizeof (_type) - RT_UOFFSETOF(_type, _from)); \
             AssertRCReturn(rc, rc); \
         } while (0)
 
 #define SHCROGL_GET_STRUCT_HEAD(_pPtr, _type, _to) do { \
-            rc = SSMR3GetMem(pSSM, (_pPtr), RT_OFFSETOF(_type, _to)); \
+            rc = SSMR3GetMem(pSSM, (_pPtr), RT_UOFFSETOF(_type, _to)); \
             AssertRCReturn(rc, rc); \
         } while (0)
 
-#define SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) (RT_OFFSETOF(_type, _field) - RT_OFFSETOF(_type, _prevField) - RT_SIZEOFMEMB(_type, _prevField))
+#define SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) (RT_UOFFSETOF(_type, _field) - RT_UOFFSETOF(_type, _prevField) - RT_SIZEOFMEMB(_type, _prevField))
 #define SHCROGL_CUT_FIELD_ALIGNMENT(_type, _prevField, _field) do { \
             const int32_t cbAlignment = SHCROGL_CUT_FIELD_ALIGNMENT_SIZE(_type, _prevField, _field) ; \
@@ -88 +88 @@
 #define SHCROGL_ROUNDBOUND(_v, _b) (((_v) + ((_b) - 1)) & ~((_b) - 1))
 #define SHCROGL_ALIGNTAILSIZE(_v, _b) (SHCROGL_ROUNDBOUND((_v),(_b)) - (_v))
-#define SHCROGL_CUT_FOR_OLD_TYPE_TO_ENSURE_ALIGNMENT_SIZE(_type, _field, _oldFieldType, _nextFieldAllignment) (SHCROGL_ALIGNTAILSIZE(((RT_OFFSETOF(_type, _field) + sizeof (_oldFieldType))), (_nextFieldAllignment)))
+#define SHCROGL_CUT_FOR_OLD_TYPE_TO_ENSURE_ALIGNMENT_SIZE(_type, _field, _oldFieldType, _nextFieldAllignment) (SHCROGL_ALIGNTAILSIZE(((RT_UOFFSETOF(_type, _field) + sizeof (_oldFieldType))), (_nextFieldAllignment)))
 #define SHCROGL_CUT_FOR_OLD_TYPE_TO_ENSURE_ALIGNMENT(_type, _field, _oldFieldType, _nextFieldAllignment)  do { \
         const int32_t cbAlignment = SHCROGL_CUT_FOR_OLD_TYPE_TO_ENSURE_ALIGNMENT_SIZE(_type, _field, _oldFieldType, _nextFieldAllignment); \
@@ -98 +98 @@
 
 
-#define SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField) (sizeof (_type) - RT_OFFSETOF(_type, _lastField) - RT_SIZEOFMEMB(_type, _lastField))
+#define SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField) (sizeof (_type) - RT_UOFFSETOF(_type, _lastField) - RT_SIZEOFMEMB(_type, _lastField))
 #define SHCROGL_CUT_TAIL_ALIGNMENT(_type, _lastField) do { \
             const int32_t cbAlignment = SHCROGL_CUT_TAIL_ALIGNMENT_SIZE(_type, _lastField); \
@@ -110 +110 @@
 {
     int32_t rc;
-    uint32_t cbObj = RT_OFFSETOF(CRTextureObj, ctxUsage);
+    uint32_t cbObj = RT_UOFFSETOF(CRTextureObj, ctxUsage);
     cbObj = ((cbObj + sizeof (void*) - 1) & ~(sizeof (void*) - 1));
     rc = SSMR3GetMem(pSSM, pTexture, cbObj);
@@ -338 +338 @@
     if (u32Version == SHCROGL_SSM_VERSION_BEFORE_CTXUSAGE_BITS)
     {
-        uint32_t cbObj = RT_OFFSETOF(CRBufferObject, ctxUsage);
+        uint32_t cbObj = RT_UOFFSETOF(CRBufferObject, ctxUsage);
         cbObj = ((cbObj + sizeof (void*) - 1) & ~(sizeof (void*) - 1));
         rc = SSMR3GetMem(pSSM, pBufferObj, cbObj);
@@ -359 +359 @@
     if (u32Version == SHCROGL_SSM_VERSION_BEFORE_CTXUSAGE_BITS)
     {
-        uint32_t cbObj = RT_OFFSETOF(CRFramebufferObject, ctxUsage);
+        uint32_t cbObj = RT_UOFFSETOF(CRFramebufferObject, ctxUsage);
         cbObj = ((cbObj + sizeof (void*) - 1) & ~(sizeof (void*) - 1));
         rc = SSMR3GetMem(pSSM, pFBO, cbObj);
@@ -380 +380 @@
     if (u32Version == SHCROGL_SSM_VERSION_BEFORE_CTXUSAGE_BITS)
     {
-        uint32_t cbObj = RT_OFFSETOF(CRRenderbufferObject, ctxUsage);
+        uint32_t cbObj = RT_UOFFSETOF(CRRenderbufferObject, ctxUsage);
         cbObj = ((cbObj + sizeof (void*) - 1) & ~(sizeof (void*) - 1));
         rc = SSMR3GetMem(pSSM, pRBO, cbObj);
@@ -1912 +1912 @@
 
             ui = VBOXTLSREFDATA_OFFSET(CRContext) + VBOXTLSREFDATA_SIZE() + sizeof (pTmpContext->bitid) + sizeof (pTmpContext->neg_bitid);
-            ui = RT_OFFSETOF(CRContext, shared) - ui;
+            ui = RT_UOFFSETOF(CRContext, shared) - ui;
         }
         else