Changeset 22535 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Aug 27, 2009 4:03:29 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: Removed some gcc warnings & added a todo.

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_gentextures.c (modified) (3 diffs)
• unpacker/unpack_shaders.c (modified) (1 diff)

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

@@ -23 +23 @@
      * That wasn't the case before snapshot loading, because we could just rely on host video drivers.
      * Now we could have a set of loaded texture IDs which aren't already reserved in the host driver.
-     * Note: It seems, that it's easy to reserve ATI/NVidia IDs, by simply calling glGenTextures 
+     * Note: It seems, that it's easy to reserve ATI/NVidia IDs, by simply calling glGenTextures
      * with n==number of loaded textures. But it's really implementation dependant. So can't rely that it'll not change.
      */
@@ -87 +87 @@
 }
 
-void SERVER_DISPATCH_APIENTRY 
+void SERVER_DISPATCH_APIENTRY
 crServerDispatchCopyTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
@@ -96 +96 @@
 
     /* Workaround for a wine or ati bug. Host drivers crash unless we first provide texture bounds. */
+    /* @todo: r=poetzsch: gcc warns here. tw & th is uninitialized in any case.
+     * I guess they should be filled with the above two calls & compared
+     * against the method params width & height! */
     if (((tw!=width) || (th!=height)) && (internalFormat==GL_DEPTH_COMPONENT24))
     {

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c

@@ -44 +44 @@
     GLint hasNonLocalLen = READ_DATA(16, GLsizei);
     GLint *pLocalLength = DATA_POINTER(20, GLint);
-    char **ppStrings = NULL;
+    const char **ppStrings = NULL;
     GLsizei i;
     int pos=20+count*sizeof(*pLocalLength);