WINED3D: Use GL_EXTCALL to call OpenGL extension
glPointParameterfvARB
H. Verbeet
hverbeet at gmail.com
Sat Feb 4 19:14:02 CST 2006
http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=8f3c98fdfd44165aebcdc75215c835af475d6360;hp=dbff6d59e8e857aec21deff8e7185372905a4a67
calls glPointParameterfvARB. That's an OpenGL extension, and thus
should be called through GL_EXTCALL. Fixes compilation against older
OpenGL libraries.
Changelog:
- Use GL_EXTCALL to call OpenGL extension glPointParameterfvARB
-------------- next part --------------
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 5337765..775066c 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3531,7 +3531,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen
}
if(GL_SUPPORT(ARB_POINT_PARAMETERS)) {
- glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, att);
+ GL_EXTCALL(glPointParameterfvARB)(GL_POINT_DISTANCE_ATTENUATION_ARB, att);
checkGLcall("glPointParameterfvARB(GL_DISTANCE_ATTENUATION_ARB, ...");
}
else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) {
diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h
index 798ea67..200bba1 100644
--- a/include/wine/wined3d_gl.h
+++ b/include/wine/wined3d_gl.h
@@ -51,6 +51,16 @@
* #defines and functions pointer
****************************************************/
+/* GL_ARB_point_parameters */
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#define GL_POINT_SIZE_MIN_ARB 0x8126
+#define GL_POINT_SIZE_MAX_ARB 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+typedef void (APIENTRY * PGLFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * PGLFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
/* GL_ARB_vertex_blend */
#ifndef GL_ARB_vertex_blend
#define GL_ARB_vertex_blend 1
@@ -960,6 +970,9 @@ typedef enum _GL_SupportedExt {
****************************************************/
#define GL_EXT_FUNCS_GEN \
/** ARB Extensions **/ \
+ /* GL_ARB_point_parameters */ \
+ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFARBPROC, glPointParameterfARB); \
+ USE_GL_FUNC(PGLFNGLPOINTPARAMETERFVARBPROC, glPointParameterfvARB); \
/* GL_ARB_texture_compression */ \
USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE2DPROC, glCompressedTexImage2DARB); \
USE_GL_FUNC(PGLFNCOMPRESSEDTEXIMAGE3DPROC, glCompressedTexImage3DARB); \
More information about the wine-patches
mailing list