Stefan Dösinger : wined3d: Add GL_ATI_envmap_bumpmap to our gl extension header.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Mar 21 17:02:48 CDT 2007
Module: wine
Branch: master
Commit: e213d7eff596424b894e9278178c9d5c35cda00e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e213d7eff596424b894e9278178c9d5c35cda00e
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Mar 21 00:13:47 2007 +0100
wined3d: Add GL_ATI_envmap_bumpmap to our gl extension header.
---
dlls/wined3d/directx.c | 3 +++
include/wine/wined3d_gl.h | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 6a1b9e8..915d938 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -798,6 +798,9 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) {
gl_info->vs_ati_version = VS_VERSION_11;
TRACE_(d3d_caps)(" FOUND: ATI (EXT) Vertex Shader support - version=%02x\n", gl_info->vs_ati_version);
gl_info->supported[EXT_VERTEX_SHADER] = TRUE;
+ } else if (strcmp(ThisExtn, "GL_ATI_envmap_bumpmap") == 0) {
+ TRACE_(d3d_caps)(" FOUND: ATI Environment Bump Mapping support\n");
+ gl_info->supported[ATI_ENVMAP_BUMPMAP] = TRUE;
/**
* Apple
*/
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h
index 4f85461..dbb76a1 100644
--- a/include/wine/wined3d_gl.h
+++ b/include/wine/wined3d_gl.h
@@ -1159,6 +1159,21 @@ typedef void (APIENTRY * PGLFNFINISHFENCEAPPLEPROC) (GLuint);
typedef GLboolean (APIENTRY * PGLFNISFENCEAPPLEPROC) (GLuint);
typedef GLboolean (APIENTRY * PGLFNTESTOBJECTAPPLEPROC) (GLenum, GLuint);
typedef void (APIENTRY * PGLFNFINISHOBJECTAPPLEPROC) (GLenum, GLuint);
+/* GL_ATI_envmap_bumpmap */
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_BUMP_ROT_MATRIX_ATI 0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777
+#define GL_BUMP_TEX_UNITS_ATI 0x8778
+#define GL_DUDV_ATI 0x8779
+#define GL_DU8DV8_ATI 0x877A
+#define GL_BUMP_ENVMAP_ATI 0x877B
+#define GL_BUMP_TARGET_ATI 0x877C
+#endif
+typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint);
+typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint);
+typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint);
+typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint);
/* GL_VERSION_2_0 */
#ifndef GL_VERSION_2_0
@@ -1522,6 +1537,7 @@ typedef enum _GL_SupportedExt {
ATI_TEXTURE_ENV_COMBINE3,
ATI_TEXTURE_MIRROR_ONCE,
EXT_VERTEX_SHADER,
+ ATI_ENVMAP_BUMPMAP,
/* APPLE */
APPLE_FENCE,
@@ -1732,6 +1748,11 @@ typedef enum _GL_SupportedExt {
USE_GL_FUNC(PGLFNISFENCEAPPLEPROC, glIsFenceAPPLE); \
USE_GL_FUNC(PGLFNTESTOBJECTAPPLEPROC, glTestObjectAPPLE); \
USE_GL_FUNC(PGLFNFINISHOBJECTAPPLEPROC, glFinishObjectAPPLE); \
+ /* GL_ATI_envmap_bumpmap */ \
+ USE_GL_FUNC(PGLFNTEXBUMPPARAMETERIVATIPROC, glTexBumpParameterivATI); \
+ USE_GL_FUNC(PGLFNTEXBUMPPARAMETERFVATIPROC, glTexBumpParameterfvATI); \
+ USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERIVATIPROC, glGetTexBumpParameterivATI); \
+ USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERFVATIPROC, glGetTexBumpParameterfvATI); \
/* OpenGL 2.0 functions */
#define GL2_FUNCS_GEN \
More information about the wine-cvs
mailing list