Changeset 46401 in vbox

Timestamp:

Jun 6, 2013 6:27:06 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: more dump stuff to crstate as it's a more appropriate place for it

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• Makefile.kmk (modified) (9 diffs)
• state_tracker/dump_gen.py (moved) (moved from trunk/src/VBox/GuestHost/OpenGL/util/dump_gen.py ) (4 diffs)
• util/dump.cpp (deleted)

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -107 +107 @@
         util/warp.c \
         util/vreg.cpp \
-        util/dump.cpp \
         util/blitter.cpp \
         util/vboxhgcm.c \
@@ -114 +113 @@
         util/util.def \
         util/util.rc
-ifdef VBOX_WITH_CRDUMPER
-VBoxOGLcrutil_SOURCES += $(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp
-endif
 VBoxOGLcrutil_LIBS.win = \
         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
@@ -139 +135 @@
 VBoxOGLcrutil_pixel.c_CFLAGS.win.x86     += -Od
 VBoxOGLhostcrutil_pixel.c_CFLAGS.win.x86 += -Od
-ifdef VBOX_WITH_CRDUMPER
-VBoxOGLcrutil_DEFS        += VBOX_WITH_CRDUMPER
-VBoxOGLcrutil_LIBS        += \
-    $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
-    $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
-endif
 
 #
@@ -167 +157 @@
 VBoxOGLcrutil-x86_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB)
 endif
-ifdef VBOX_WITH_CRDUMPER
-# VBOX_WITH_CRDUMPER is inheritted from VBoxOGLcrutil_DEFS
-#VBoxOGLcrutil-x86_DEFS        += VBOX_WITH_CRDUMPER
-VBoxOGLcrutil-x86_LIBS        += \
-    $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
-    $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
-endif
 # vc7 hangs during compilation of this file when optimizations are enabled.
 VBoxOGLcrutil-x86_pixel.c_CFLAGS += -Od
@@ -192 +175 @@
     $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
 VBoxOGLhostcrutil_LIBS     = $(LIB_RUNTIME)
-ifdef VBOX_WITH_CRDUMPER
-VBoxOGLhostcrutil_DEFS    += VBOX_WITH_CRDUMPER
-VBoxOGLhostcrutil_LIBS        += \
-    $(PATH_STAGE_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
-    $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB)
-endif
 ifdef VBOX_WITH_CRHGSMI
 VBoxOGLhostcrutil_DEFS    += VBOX_WITH_CRHGSMI
@@ -214 +191 @@
 
 ifdef VBOX_WITH_CRDUMPER
-$(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp: $(PATH_SUB_CURRENT)/util/dump_gen.py $(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_isenabled.txt state_extensions_isenabled.txt) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
+$(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp: $(PATH_SUB_CURRENT)/state_tracker/dump_gen.py $(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_isenabled.txt state_extensions_isenabled.txt) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
         $(call MSG_GENERATE,python,$@,$<)
         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
@@ -501 +478 @@
         $(VBOX_PATH_CROGL_GENFILES)/state_get.c \
         $(VBOX_PATH_CROGL_GENFILES)/state_isenabled.c
+ifdef VBOX_WITH_CRDUMPER
+VBoxOGLcrstate_SOURCES += state_tracker/dump.cpp \
+        $(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp
+endif
+        
 VBoxOGLcrstate_CLEAN = \
         $(VBOX_PATH_CROGL_GENFILES)/state_buffer_gen.c \
@@ -516 +498 @@
         $(VBOX_PATH_CROGL_GENFILES)/state_isenabled.c \
         $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h
+ifdef VBOX_WITH_CRDUMPER
+VBoxOGLcrstate_CLEAN += $(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp
+endif
+        
 ifneq ($(KBUILD_TARGET),win)
  ifeq ($(VBOX_WITH_COMPATIBLE_LINUX_GUEST_PACKAGE),)
@@ -527 +513 @@
 ifdef VBOX_WITH_WDDM
 VBoxOGLcrstate_DEFS.win   += VBOX_WITH_WDDM
+endif
+ifdef VBOX_WITH_CRDUMPER
+VBoxOGLcrstate_DEFS        += VBOX_WITH_CRDUMPER
+#VBoxOGLcrutil_LIBS        += \
+    $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
+    $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
 endif
 

trunk/src/VBox/GuestHost/OpenGL/state_tracker/dump_gen.py

@@ -12 +12 @@
 extended_params = {}
 
-input = open( sys.argv[2]+"/../state_tracker/state_isenabled.txt", 'r' )
+input = open( sys.argv[2]+"/state_isenabled.txt", 'r' )
 for line in input.readlines():
     match = line_re.match( line )
@@ -21 +21 @@
         params[pname] = ( type, fields )
 
-input = open( sys.argv[2]+"/../state_tracker/state_extensions_isenabled.txt", 'r' )
+input = open( sys.argv[2]+"/state_extensions_isenabled.txt", 'r' )
 for line in input.readlines():
     match = extensions_line_re.match( line )
@@ -56 +56 @@
 from get_sizes import *;
 
+getprops = apiutil.ParamProps("GetDoublev")
+enableprops = apiutil.ParamProps("Enable")
+
+#print "//missing get props:"
+#for prop in getprops:
+#    try:
+#        tmp = num_get_values[prop]
+#    except KeyError:
+#        try:
+#            keyvalues = extensions_num_get_values[prop]
+#        except KeyError:
+#            print "//%s" % prop
+#
 print """
 static void crRecDumpPrintVal(CR_DUMPER *pDumper, struct nv_struct *pDesc, float *pfData)
@@ -101 +114 @@
     print '#endif /* CR_%s */' % ext
 
+#print "//missing enable props:"
+#for prop in enableprops:
+#    try:
+#        keyvalues = params[prop]
+#    except KeyError:
+#        try:
+#            keyvalues = extended_params[prop]
+#        except KeyError:
+#            print "//%s" % prop
+#
 print """
 }