Changeset 60510 in vbox

Timestamp:

Apr 14, 2016 6:36:57 PM (9 years ago)

Author:

vboxsync

Message:

GuestHost/OpenGL: fixed annoying warning

Location:

trunk

Files:

• include/VBox/VBoxVideo3D.h (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (1 diff)

trunk/include/VBox/VBoxVideo3D.h

@@ -69 +69 @@
 
 #define VBOXTLSREFDATA_OFFSET(_t) RT_OFFSETOF(_t, cTlsRefs)
+#define VBOXTLSREFDATA_ASSERT_OFFSET(_t) RTASSERT_OFFSET_OF(_t, cTlsRefs)
 #define VBOXTLSREFDATA_SIZE() (sizeof (struct VBOXTLSREFDATA_DUMMY))
 #define VBOXTLSREFDATA_COPY(_pDst, _pSrc) do { \

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

@@ -1859 +1859 @@
 AssertCompile(VBOXTLSREFDATA_SIZE() <= CR_MAX_BITARRAY);
 AssertCompile(VBOXTLSREFDATA_STATE_INITIALIZED != 0);
-AssertCompile(RT_OFFSETOF(CRContext, shared) >= VBOXTLSREFDATA_OFFSET(CRContext) + VBOXTLSREFDATA_SIZE() + RT_SIZEOFMEMB(CRContext, bitid) + RT_SIZEOFMEMB(CRContext, neg_bitid));
+AssertCompile(RTASSERT_OFFSET_OF(CRContext, shared) >= VBOXTLSREFDATA_ASSERT_OFFSET(CRContext)
+                                                     + VBOXTLSREFDATA_SIZE()
+                                                     + RT_SIZEOFMEMB(CRContext, bitid)
+                                                     + RT_SIZEOFMEMB(CRContext, neg_bitid));
 
 int32_t crStateLoadContext(CRContext *pContext, CRHashTable * pCtxTable, PFNCRSTATE_CONTEXT_GET pfnCtxGet, PSSMHANDLE pSSM, uint32_t u32Version)