Matteo Bruni : wined3d: Always use the core version of the glPointParameteri function.

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Tue Jan 20 15:47:08 2015 +0100

wined3d: Always use the core version of the glPointParameteri function.

The state function depends on GL 2.0+ so it's unnecessary to
check for NV_POINT_SPRITE.

---

 dlls/wined3d/directx.c | 6 ++----
 dlls/wined3d/state.c   | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 60269f1..8f50b5e 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2848,9 +2848,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
     USE_GL_FUNC(glVertexWeighthNV)
     USE_GL_FUNC(glVertexWeighthvNV)
     /* GL_NV_point_sprite */
-    USE_GL_FUNC(glPointParameteri)
     USE_GL_FUNC(glPointParameteriNV)
-    USE_GL_FUNC(glPointParameteriv)
     USE_GL_FUNC(glPointParameterivNV)
     /* GL_NV_register_combiners */
     USE_GL_FUNC(glCombinerInputNV)
@@ -2889,6 +2887,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
     USE_GL_FUNC(glGetBufferSubData)         /* OpenGL 1.5 */
     USE_GL_FUNC(glGetCompressedTexImage)    /* OpenGL 1.3 */
     USE_GL_FUNC(glMapBuffer)                /* OpenGL 1.5 */
+    USE_GL_FUNC(glPointParameteri)          /* OpenGL 1.4 */
+    USE_GL_FUNC(glPointParameteriv)         /* OpenGL 1.4 */
     USE_GL_FUNC(glUnmapBuffer)              /* OpenGL 1.5 */
 #undef USE_GL_FUNC
 
@@ -3253,8 +3253,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter)
     if (!gl_info->supported[NV_POINT_SPRITE] && gl_version >= MAKEDWORD_VERSION(1, 4))
     {
         TRACE("GL CORE: GL_NV_point_sprite support.\n");
-        gl_info->gl_ops.ext.p_glPointParameterivNV = gl_info->gl_ops.ext.p_glPointParameteriv;
-        gl_info->gl_ops.ext.p_glPointParameteriNV = gl_info->gl_ops.ext.p_glPointParameteri;
         gl_info->supported[NV_POINT_SPRITE] = TRUE;
     }
 
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 2b149a0..f7cf14d 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -5010,11 +5010,8 @@ static void psorigin(struct wined3d_context *context, const struct wined3d_state
     const struct wined3d_gl_info *gl_info = context->gl_info;
     GLint origin = context->render_offscreen ? GL_LOWER_LEFT : GL_UPPER_LEFT;
 
-    if (gl_info->supported[NV_POINT_SPRITE])
-    {
-        GL_EXTCALL(glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, origin));
-        checkGLcall("glPointParameteriNV(GL_POINT_SPRITE_COORD_ORIGIN, ...)");
-    }
+    GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, origin));
+    checkGLcall("glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, ...)");
 }
 
 void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)