Stefan Dösinger : wined3d: Add GL_APPLE_client_storage to our extension list.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Apr 2 06:23:00 CDT 2007


Module: wine
Branch: master
Commit: f9ee2355d02566cfb544f5cb53941d0826d8fa74
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f9ee2355d02566cfb544f5cb53941d0826d8fa74

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Sat Mar 31 15:52:28 2007 +0200

wined3d: Add GL_APPLE_client_storage to our extension list.

---

 dlls/wined3d/directx.c    |    2 ++
 include/wine/wined3d_gl.h |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index e0dbe57..dea1d43 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -812,6 +812,8 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) {
                  */
                 gl_info->supported[NV_FENCE] = FALSE;
                 gl_info->supported[APPLE_FENCE] = TRUE;
+            } else if (strstr(ThisExtn, "GL_APPLE_client_storage")) {
+                gl_info->supported[APPLE_CLIENT_STORAGE] = TRUE;
             }
 
             if (*GL_Extensions == ' ') GL_Extensions++;
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h
index dbb76a1..1b4744f 100644
--- a/include/wine/wined3d_gl.h
+++ b/include/wine/wined3d_gl.h
@@ -1147,7 +1147,7 @@ typedef void (APIENTRY * PGLFNFINISHFENCENVPROC) (GLuint);
 typedef GLboolean (APIENTRY * PGLFNISFENCENVPROC) (GLuint);
 typedef void (APIENTRY * PGLFNGETFENCEIVNVPROC) (GLuint, GLenum, GLint *);
 /* GL_APPLE_fence */
-#ifndef GL_NV_fence
+#ifndef GL_APPLE_fence
 #define GL_DRAW_PIXELS_APPLE                0x8A0A
 #define GL_FENCE_APPLE                      0x84F3
 #endif
@@ -1159,6 +1159,10 @@ typedef void (APIENTRY * PGLFNFINISHFENCEAPPLEPROC) (GLuint);
 typedef GLboolean (APIENTRY * PGLFNISFENCEAPPLEPROC) (GLuint);
 typedef GLboolean (APIENTRY * PGLFNTESTOBJECTAPPLEPROC) (GLenum, GLuint);
 typedef void (APIENTRY * PGLFNFINISHOBJECTAPPLEPROC) (GLenum, GLuint);
+/* GL_APPLE_client_storage */
+#ifndef GL_APPLE_client_storage
+#define GL_UNPACK_CLIENT_STORAGE_APPLE      0x85B2
+#endif
 /* GL_ATI_envmap_bumpmap */
 #ifndef GL_ATI_envmap_bumpmap
 #define GL_BUMP_ROT_MATRIX_ATI              0x8775
@@ -1540,6 +1544,7 @@ typedef enum _GL_SupportedExt {
   ATI_ENVMAP_BUMPMAP,
   /* APPLE */
   APPLE_FENCE,
+  APPLE_CLIENT_STORAGE,
 
   OPENGL_SUPPORTED_EXT_END
 } GL_SupportedExt;




More information about the wine-cvs mailing list