D3D8: Use GL_EXTCALL to call OpenGL extension glPointParameterfvARB

H. Verbeet hverbeet at gmail.com
Sat Feb 4 19:13:27 CST 2006


http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=80c82f527f45ea398120baffe9adc7af024810d7;hp=3c17322e756a70cf0a6fc3f926445aa5c9dd56d4
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/d3d8/d3dcore_gl.h b/dlls/d3d8/d3dcore_gl.h
index 31d72ae..9fa8cd9 100644
--- a/dlls/d3d8/d3dcore_gl.h
+++ b/dlls/d3d8/d3dcore_gl.h
@@ -30,6 +30,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
@@ -757,6 +767,9 @@ typedef enum _GL_PSVersion {
 
 #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); \
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index d1f7657..6710164 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3012,7 +3012,7 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_Se
         }
 
         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)) {


More information about the wine-patches mailing list