Changeset 78078 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Apr 10, 2019 11:27:46 AM (6 years ago)

Author:

vboxsync

Message:

GuestHost/OpenGL,HostServices/SharedOpenGL: Windows build fix for r129932

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_get.py (modified) (2 diffs)
• server_texture.c (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_get.py

@@ -127 +127 @@
         local_argname = 'local_%s' % lastParam[0]
 
+        print('\tunsigned int cComponents = 0;');
         print('\t%s %s[%d] = { 0 };' % ( local_argtype, local_argname, max_components[func_name] ))
         print('\t(void) %s;' % lastParam[0])
@@ -142 +143 @@
             print('\tcrServerReturnValue(&(%s[0]), %d*sizeof(%s));' % (local_argname, max_components[func_name], local_argtype ))
         else:
-            print('\tunsigned int cComponents = RT_MIN(crStateHlpComponentsCount(pname), RT_ELEMENTS(%s));' % local_argname)
+            print('\tcComponents = RT_MIN(crStateHlpComponentsCount(pname), RT_ELEMENTS(%s));' % local_argname)
             print('\tcrServerReturnValue(&(%s[0]), cComponents*sizeof(%s));' % (local_argname, local_argtype ))
         print ('}\n')

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

@@ -169 +169 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetTexEnvfv( GLenum target, GLenum pname, GLfloat * params )
 {
+    size_t cComponents = 0;
     GLfloat local_params[4] = {0};
     (void) params;
@@ -176 +177 @@
         crStateGetTexEnvfv( target, pname, local_params );
 
-    size_t cComponents = RT_MIN(crStateHlpComponentsCount(pname), RT_ELEMENTS(local_params));
+    cComponents = RT_MIN(crStateHlpComponentsCount(pname), RT_ELEMENTS(local_params));
     crServerReturnValue( &(local_params[0]), cComponents*sizeof (GLfloat) );
 }
@@ -182 +183 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetTexEnviv( GLenum target, GLenum pname, GLint * params )
 {
+    size_t cComponents = 0;
     GLint local_params[4] = {0};
     (void) params;
@@ -189 +191 @@
         crStateGetTexEnviv( target, pname, local_params );
 
-    size_t cComponents = RT_MIN(crStateHlpComponentsCount(pname), RT_ELEMENTS(local_params));
+    cComponents = RT_MIN(crStateHlpComponentsCount(pname), RT_ELEMENTS(local_params));
     crServerReturnValue( &(local_params[0]), cComponents*sizeof (GLint) );
 }