OpenGL

Timestamp:

Jul 18, 2018 8:07:50 PM (7 years ago)

Author:

vboxsync

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

123828

Message:

3D: texture unpacking reworked, bugref:9192. Merged r123597, r123598, r123600, r123601, r123755.

Location:

trunk

Files:

trunk

Property svn:mergeinfo

Property svn:mergeinfo

old	new
8	8	/branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
9	9	/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
10		/branches/VBox-5.2/src/VBox:120083,120099,120213,120221,120239
	10	/branches/VBox-5.2/src/VBox:120083,120099,120213,120221,120239,123597-123598,123600-123601,123755
11	11	/branches/andy/draganddrop/src/VBox:90781-91268
12	12	/branches/andy/guestctrl20/src/VBox:78916,78930

r71469	r73223
70	70
71	71	#define DATA_POINTER_CHECK( offset ) \
72		( (~~cr_unpackDataEnd ? cr_unpackData + (offset) < cr_unpackDataEnd : true~~) )
	72	( (offset) >= 0 && (cr_unpackDataEnd >= cr_unpackData) && (size_t)(cr_unpackDataEnd - cr_unpackData) > (size_t)(offset) )
73	73
74	74	#define INCR_DATA_PTR( delta ) \

-              r69392
+              r73223
     CRStateBits *sb = GetCurrentBits();
     CRTextureBits *tb = &(sb->texture);
+    const int is_distrib = ((type == GL_TRUE) || (type == GL_FALSE));
+    // Distributed textures are not used by VBox
+    const int is_distrib = 0; // ((type == GL_TRUE) || (type == GL_FALSE));
     FLUSH();

-              r69989
+              r73223
 #ifndef IN_GUEST
+    /* Expect only CR_MESSAGE_OPCODES from the guest. */
+    AssertPtrReturnVoid(conn->pBuffer);
+    if (   conn->cbBuffer >= sizeof(CRMessageHeader)
+        && ((CRMessageHeader*) (conn->pBuffer))->type == CR_MESSAGE_OPCODES)
+    {
+        /* Looks good. */
+    }
+    else
+    {
+        AssertFailed();
+        /** @todo Find out if this is the expected cleanup. */
+        conn->cbBuffer = 0;
+        conn->pBuffer  = NULL;
+        return;
+    }
+#endif
+#ifndef IN_GUEST
     if (conn->allow_redir_ptr)
+    {

Note: See TracChangeset for help on using the changeset viewer.