Stefan Dösinger : wined3d: Load GL_EXT_texture3D from gl 1.2 if the extension is not there.
Alexandre Julliard
julliard at winehq.org
Tue Nov 13 08:34:41 CST 2007
Module: wine
Branch: master
Commit: 894a705cc74e9cee1349c72290fd77da2b39e60b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=894a705cc74e9cee1349c72290fd77da2b39e60b
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Tue Nov 6 13:07:33 2007 +0100
wined3d: Load GL_EXT_texture3D from gl 1.2 if the extension is not there.
---
dlls/wined3d/directx.c | 2 +-
include/wine/wined3d_gl.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 62db2bd..f62480e 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -91,7 +91,7 @@ static const struct {
{"GL_EXT_secondary_color", EXT_SECONDARY_COLOR, 0 },
{"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE, 0 },
{"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP, 0 },
- {"GL_EXT_texture3D", EXT_TEXTURE3D, 0 },
+ {"GL_EXT_texture3D", EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2) },
{"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC, 0 },
{"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD, 0 },
{"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE, 0 },
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h
index 3fbfea6..b346064 100644
--- a/include/wine/wined3d_gl.h
+++ b/include/wine/wined3d_gl.h
@@ -3328,8 +3328,8 @@ typedef enum _GL_SupportedExt {
USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FVEXTPROC, glSecondaryColor3fvEXT, EXT_SECONDARY_COLOR, NULL );\
USE_GL_FUNC(PGLFNGLSECONDARYCOLORPOINTEREXTPROC, glSecondaryColorPointerEXT, EXT_SECONDARY_COLOR, NULL );\
/* GL_EXT_texture3D */ \
- USE_GL_FUNC(PGLFNGLTEXIMAGE3DEXTPROC, glTexImage3DEXT, EXT_TEXTURE3D, NULL );\
- USE_GL_FUNC(PGLFNGLTEXSUBIMAGE3DEXTPROC, glTexSubImage3DEXT, EXT_TEXTURE3D, NULL );\
+ USE_GL_FUNC(PGLFNGLTEXIMAGE3DEXTPROC, glTexImage3DEXT, EXT_TEXTURE3D, glTexImage3D);\
+ USE_GL_FUNC(PGLFNGLTEXSUBIMAGE3DEXTPROC, glTexSubImage3DEXT, EXT_TEXTURE3D, glTexSubImage3D);\
/* GL_ARB_vertex_program */ \
USE_GL_FUNC(PGLFNGENPROGRAMSARBPROC, glGenProgramsARB, ARB_VERTEX_PROGRAM, NULL );\
USE_GL_FUNC(PGLFNBINDPROGRAMARBPROC, glBindProgramARB, ARB_VERTEX_PROGRAM, NULL );\
More information about the wine-cvs
mailing list