Changeset 78384 in vbox for trunk/src/VBox/Additions

Timestamp:

May 6, 2019 10:09:57 AM (6 years ago)

Author:

vboxsync

Message:

Additions/common/crOpenGL/feedback: Need to wrap the crState* calls as they take an additional parameter for the state tracker instance and are not compatible with the OpenGL interface anymore

File:

• trunk/src/VBox/Additions/common/crOpenGL/feedback/feedback.py (modified) (4 diffs)

trunk/src/VBox/Additions/common/crOpenGL/feedback/feedback.py

@@ -33 +33 @@
                 print('\tfeedback_spu.super.%s(%s);' % ( func_name, apiutil.MakeCallString(params) ))
                 print('}')
+                print('')
+                print('static %s FEEDBACKSPU_APIENTRY feedbackspu_FeedbackWrap%s(%s)' % ( return_type, func_name, apiutil.MakeDeclarationString(params) ))
+                print('{')
+                if len(params) == 0:
+                        print('\tcrStateFeedback%s(&feedback_spu.StateTracker);' % ( func_name, ))
+                else:
+                        print('\tcrStateFeedback%s(&feedback_spu.StateTracker, %s);' % ( func_name, apiutil.MakeCallString(params) ))
+                print('}')
+        if apiutil.FindSpecial( "select", func_name ):
+                print('static %s FEEDBACKSPU_APIENTRY feedbackspu_SelectWrap%s(%s)' % ( return_type, func_name, apiutil.MakeDeclarationString(params) ))
+                print('{')
+                if len(params) == 0:
+                        print('\tcrStateSelect%s(&feedback_spu.StateTracker);' % ( func_name, ))
+                else:
+                        print('\tcrStateSelect%s(&feedback_spu.StateTracker, %s);' % ( func_name, apiutil.MakeCallString(params) ))
+                print('}')
 
 
@@ -38 +54 @@
 print("""
 #define CHANGE(name, func) crSPUChangeInterface((void *)&(feedback_spu.self), (void *)feedback_spu.self.name, (void *)((SPUGenericFunction) func))
-#define CHANGESWAP(name, swapfunc, regfunc) crSPUChangeInterface( (void *)&(feedback_spu.self), (void *)feedback_spu.self.name, (void *)((SPUGenericFunction) (feedback_spu.swap ? swapfunc: regfunc )))
 
 static void __loadFeedbackAPI( void )
@@ -47 +62 @@
         params = apiutil.Parameters(func_name)
         if apiutil.FindSpecial( "feedback", func_name ):
-                print('\tCHANGE(%s, crStateFeedback%s);' % (func_name, func_name ))
+                print('\tCHANGE(%s, feedbackspu_FeedbackWrap%s);' % (func_name, func_name ))
 print("""
 }
@@ -56 +71 @@
 for func_name in keys:
         if apiutil.FindSpecial( "select", func_name ):
-                print('\tCHANGE(%s, crStateSelect%s);' % (func_name, func_name ))
+                print('\tCHANGE(%s, feedbackspu_SelectWrap%s);' % (func_name, func_name ))
         elif apiutil.FindSpecial( "feedback", func_name ):
                 print('\tCHANGE(%s, feedbackspu_%s);' % (func_name, func_name ))