Changeset 55762 in vbox

Timestamp:

May 8, 2015 6:05:43 PM (9 years ago)

Author:

vboxsync

Message:

Host 3D: DLM: dump local stuff (preparing for saving Display Lists).

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• Makefile.kmk (modified) (1 diff)
• crserverlib/server_main.c (modified) (2 diffs)
• dlm/dlm.c (modified) (1 diff)
• dlm/dlm_generated.py (modified) (4 diffs)
• dlm/dlm_header.py (modified) (2 diffs)

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

@@ -101 +101 @@
 ifdef VBOX_WITH_CRHGSMI
 VBoxSharedCrOpenGL_DEFS += VBOX_WITH_CRHGSMI
+endif
+ifdef VBOX_WITH_CR_DISPLAY_LISTS
+VBoxSharedCrOpenGL_LIBS += $(PATH_STAGE_LIB)/VBoxOGLcrdlm$(VBOX_SUFF_LIB)
 endif
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -16 +16 @@
 #include "cr_environment.h"
 #include "cr_pixeldata.h"
+
+#ifdef VBOX_WITH_CR_DISPLAY_LISTS
+# include "cr_dlm.h"
+#endif
+
 #include "server_dispatch.h"
 #include "state/cr_texture.h"
@@ -1671 +1676 @@
         }
     }
+
+#ifdef VBOX_WITH_CR_DISPLAY_LISTS
+    rc = crDLMSaveState();
+    AssertRCReturn(rc, rc);
+#endif
 
     rc = crServerPendSaveState(pSSM);

trunk/src/VBox/HostServices/SharedOpenGL/dlm/dlm.c

@@ -733 +733 @@
                 (*ErrorCallback)(line, file, error, info);
 }
+
+int32_t DLM_APIENTRY crDLMSaveState(void)
+{
+    return 0;
+}

trunk/src/VBox/HostServices/SharedOpenGL/dlm/dlm_generated.py

@@ -85 +85 @@
         print ' DLMInstanceList *next;'
         print ' DLMInstanceList *stateNext;'
+        print ' int cbInstance;'
         print ' void (DLM_APIENTRY *execute)(DLMInstanceList *instance, SPUDispatchTable *dispatchTable);'
         for (name, type, vecSize) in params:
@@ -286 +287 @@
         print ' CRDLMContextState *state = CURRENT_STATE();'
         print ' struct instance%s *instance;' % (functionName)
-
+        
         # The calling SPU is supposed to verify that the element is supposed to be
         # compiled before it is actually compiled; typically, this is done based
@@ -318 +319 @@
                         name = params[index][0]
                         print '\tinstance->%s = %s;' % (name, name)
-
+        
+        # We need to know instance size in bytes in order to save its state later.
+        print '\tinstance->cbInstance = sizeof(struct instance%s);' % functionName
+        
         # If there's a pointer parameter, apply it.
         if len(pointers) == 1:
@@ -328 +332 @@
                 print '\t}'
                 if pointersize == 'special':
-                        print '\t(void) crdlm_pointers_%s(instance, %s);' % (functionName, callstring)
+                        print '\tinstance->cbInstance += crdlm_pointers_%s(instance, %s);' % (functionName, callstring)
                 else:
                         print '\tcrMemcpy((void *)instance->%s, (void *) %s, %s*sizeof(%s));' % (params[pointers[0]][0], params[pointers[0]][0], pointersize, pointertype)
         elif len(pointers) == 2:
                 # this seems to work
-                print '\t(void) crdlm_pointers_%s(instance, %s);' % (functionName, callstring)
+                print '\tinstance->cbInstance += crdlm_pointers_%s(instance, %s);' % (functionName, callstring)
         elif len(pointers) > 2:
                 print "#error don't know how to handle pointer parameters for %s" % (functionName)
-
+        
         # Add the element to the current display list
         AddInstanceToList('\t')

trunk/src/VBox/HostServices/SharedOpenGL/dlm/dlm_header.py

@@ -52 +52 @@
         ('GLuint DLM_APIENTRY', 'crDLMGenLists', 'GLsizei range'),
         ('void DLM_APIENTRY', 'crDLMListBase', 'GLuint base'),
+        ('int32_t DLM_APIENTRY', 'crDLMSaveState', 'void'),
         #('void DLM_APIENTRY', 'crDLMListSent', 'CRDLM *dlm, unsigned long listIdentifier'),
         #('GLboolean DLM_APIENTRY', 'crDLMIsListSent', 'CRDLM *dlm, unsigned long listIdentifier'),
@@ -95 +96 @@
         struct DLMInstanceList *next;
         struct DLMInstanceList *stateNext;
+        int    cbInstance;
         void (*execute)(struct DLMInstanceList *instance, SPUDispatchTable *dispatchTable);
 } DLMInstanceList;