Changeset 37771 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Jul 4, 2011 5:59:17 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: fix warning

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texture.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_texture.c

@@ -904 +904 @@
         tobj->target = target;
     }
-    else if (tobj->target != target)
+    else if ((tobj->target != target) 
+             && !((target==GL_TEXTURE_RECTANGLE_NV && tobj->target==GL_TEXTURE_2D)
+                  ||(target==GL_TEXTURE_2D && tobj->target==GL_TEXTURE_RECTANGLE_NV)))
     {
         crWarning( "You called glBindTexture with a target of 0x%x, but the texture you wanted was target 0x%x [1D: %x 2D: %x 3D: %x cube: %x]", (int) target, (int) tobj->target, GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP );