Changeset 40124 in vbox

Timestamp:

Feb 14, 2012 11:37:40 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: add some extensions required for wined3d+wddm

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/GL/glext.h (modified) (2 diffs)
• include/cr_extstring.h (modified) (1 diff)
• include/cr_version.h (modified) (1 diff)
• include/state/cr_limits.h (modified) (1 diff)
• state_tracker/state_limits.c (modified) (1 diff)
• state_tracker/state_texture.c (modified) (6 diffs)
• util/net.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/GL/glext.h

@@ -784 +784 @@
 #ifndef GL_ARB_texture_mirrored_repeat
 #define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
 #endif
 
@@ -4524 +4529 @@
 #endif
 
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#endif
+
 #ifndef GL_ARB_depth_texture
 #define GL_ARB_depth_texture 1

trunk/src/VBox/GuestHost/OpenGL/include/cr_extstring.h

@@ -83 +83 @@
 #endif
 #ifdef CR_ARB_texture_mirrored_repeat
-        "GL_ARB_texture_mirrored_repeat "
+        "GL_ARB_texture_mirrored_repeat GL_IBM_texture_mirrored_repeat "
+#endif
+#ifdef CR_ATI_texture_mirror_once
+        "GL_ATI_texture_mirror_once "
 #endif
 #ifdef CR_ARB_texture_non_power_of_two

trunk/src/VBox/GuestHost/OpenGL/include/cr_version.h

@@ -68 +68 @@
 #define CR_ARB_texture_env_dot3 1
 #define CR_ARB_texture_mirrored_repeat 1
+#define CR_ATI_texture_mirror_once 1
 #define CR_ARB_texture_non_power_of_two 1
 #define CR_ARB_transpose_matrix 1

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_limits.h

@@ -259 +259 @@
         GLboolean SGIS_generate_mipmap;
     GLboolean EXT_texture_from_pixmap;
+        GLboolean ATI_texture_mirror_once;
 
         /* derived from above */

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

@@ -291 +291 @@
         if (hasExtension((const char*)limits->extensions, "GL_ARB_texture_mirrored_repeat"))
                 extensions->ARB_texture_mirrored_repeat = GL_TRUE;
+
+        if (hasExtension((const char*)limits->extensions, "GL_ATI_texture_mirror_once"))
+                extensions->ATI_texture_mirror_once = GL_TRUE;
 
         if (hasExtension((const char*)limits->extensions, "GL_ARB_texture_non_power_of_two"))

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

@@ -13 +13 @@
 #include "cr_version.h"
 #include "state_internals.h"
+
+#ifdef DEBUG_misha
+#include <iprt/assert.h>
+#endif
 
 #define UNUSED(x) ((void) (x))
@@ -1024 +1028 @@
             }
 #endif
+#ifdef CR_ATI_texture_mirror_once
+            else if ((e == GL_MIRROR_CLAMP_ATI || e == GL_MIRROR_CLAMP_TO_EDGE_ATI) && g->extensions.ATI_texture_mirror_once) {
+                tobj->wrapS = e;
+            }
+#endif
             else {
                 crStateError(__LINE__, __FILE__, GL_INVALID_ENUM,
@@ -1051 +1060 @@
 #ifdef CR_ARB_texture_mirrored_repeat
             else if (e == GL_MIRRORED_REPEAT_ARB && g->extensions.ARB_texture_mirrored_repeat) {
+                tobj->wrapT = e;
+            }
+#endif
+#ifdef CR_ATI_texture_mirror_once
+            else if ((e == GL_MIRROR_CLAMP_ATI || e == GL_MIRROR_CLAMP_TO_EDGE_ATI) && g->extensions.ATI_texture_mirror_once) {
                 tobj->wrapT = e;
             }
@@ -1080 +1094 @@
 #ifdef CR_ARB_texture_mirrored_repeat
             else if (e == GL_MIRRORED_REPEAT_ARB && g->extensions.ARB_texture_mirrored_repeat) {
+                tobj->wrapR = e;
+            }
+#endif
+#ifdef CR_ATI_texture_mirror_once
+            else if ((e == GL_MIRROR_CLAMP_ATI || e == GL_MIRROR_CLAMP_TO_EDGE_ATI) && g->extensions.ATI_texture_mirror_once) {
                 tobj->wrapR = e;
             }
@@ -3184 +3203 @@
     CRTextureObj *tobj = GET_TOBJ(tobj, g, id);
 
+#ifdef DEBUG_misha
+    if (id)
+    {
+        Assert(tobj);
+    }
+    else
+    {
+        Assert(!tobj);
+    }
+    if (tobj)
+    {
+        crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);
+    }
+#endif
+
+
     return tobj ? crStateGetTextureObjHWID(tobj) : 0;
 }
@@ -3196 +3231 @@
         CRASSERT(diff_api.GenTextures);
         diff_api.GenTextures(1, &tobj->hwid);
+#ifdef DEBUG_misha
+        crDebug("tex id(%d), hwid(%d)", tobj->id, tobj->hwid);
+#endif
         CRASSERT(tobj->hwid);
     }

trunk/src/VBox/GuestHost/OpenGL/util/net.c

@@ -413 +413 @@
     {
 #ifdef WINDOWS
+        /* @todo: do we actually need that WSA stuff with VBox at all? */
         WORD wVersionRequested = MAKEWORD(2, 0);
         WSADATA wsaData;