Matteo Bruni : wined3d: Use the core glColorMaski function.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jan 15 15:55:41 CST 2015
Module: wine
Branch: master
Commit: 7e169d43c546c0175868a2eeb114f4c8b996a9ce
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e169d43c546c0175868a2eeb114f4c8b996a9ce
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Wed Jan 14 16:27:32 2015 +0100
wined3d: Use the core glColorMaski function.
---
dlls/wined3d/directx.c | 2 ++
dlls/wined3d/state.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 00d2ac6..7259dfe 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2883,6 +2883,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */
USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */
USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */
+ USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */
USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */
USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */
USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */
@@ -2911,6 +2912,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
MAP_GL_FUNCTION(glBlendFuncSeparate, glBlendFuncSeparateEXT);
MAP_GL_FUNCTION(glBufferData, glBufferDataARB);
MAP_GL_FUNCTION(glBufferSubData, glBufferSubDataARB);
+ MAP_GL_FUNCTION(glColorMaski, glColorMaskIndexedEXT);
MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB);
MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB);
MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB);
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 725ed63..a8e6e8a 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1600,11 +1600,12 @@ static void state_colorwrite(struct wined3d_context *context, const struct wined
static void set_color_mask(const struct wined3d_gl_info *gl_info, UINT index, DWORD mask)
{
- GL_EXTCALL(glColorMaskIndexedEXT(index,
+ GL_EXTCALL(glColorMaski(index,
mask & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE,
mask & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE,
mask & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE,
mask & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE));
+ checkGLcall("glColorMaski");
}
static void state_colorwrite0(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
More information about the wine-cvs
mailing list