[PATCH 3/3] wined3d: Use the core version of the glBlend* functions. (v2)
Matteo Bruni
mbruni at codeweavers.com
Thu Jan 8 10:20:22 CST 2015
---
dlls/wined3d/directx.c | 8 ++++++++
dlls/wined3d/state.c | 18 +++++++++---------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index e004ecf..a3b548a 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2876,6 +2876,10 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
/* Newer core functions */
USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */
+ USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */
+ USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */
+ USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */
+ USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */
#undef USE_GL_FUNC
#ifndef USE_WIN32_OPENGL
@@ -2892,6 +2896,10 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
} while (0)
MAP_GL_FUNCTION(glActiveTexture, glActiveTextureARB);
+ MAP_GL_FUNCTION(glBlendColor, glBlendColorEXT);
+ MAP_GL_FUNCTION(glBlendEquation, glBlendEquationEXT);
+ MAP_GL_FUNCTION(glBlendEquationSeparate, glBlendEquationSeparateEXT);
+ MAP_GL_FUNCTION(glBlendFuncSeparate, glBlendFuncSeparateEXT);
#undef MAP_GL_FUNCTION
}
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 700db84..048ec13 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -317,7 +317,7 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_
if (state->render_states[WINED3D_RS_BLENDOPALPHA]
&& !gl_info->supported[EXT_BLEND_EQUATION_SEPARATE])
{
- WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparateEXT\n");
+ WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparate.\n");
return;
}
@@ -327,12 +327,12 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_
if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE])
{
- GL_EXTCALL(glBlendEquationSeparateEXT(blend_equation, blend_equation_alpha));
- checkGLcall("glBlendEquationSeparateEXT");
+ GL_EXTCALL(glBlendEquationSeparate(blend_equation, blend_equation_alpha));
+ checkGLcall("glBlendEquationSeparate");
}
else
{
- GL_EXTCALL(glBlendEquationEXT(blend_equation));
+ GL_EXTCALL(glBlendEquation(blend_equation));
checkGLcall("glBlendEquation");
}
}
@@ -462,7 +462,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
/* Separate alpha blending requires GL_EXT_blend_function_separate, so make sure it is around */
if (!context->gl_info->supported[EXT_BLEND_FUNC_SEPARATE])
{
- WARN("Unsupported in local OpenGL implementation: glBlendFuncSeparateEXT\n");
+ WARN("Unsupported in local OpenGL implementation: glBlendFuncSeparate.\n");
return;
}
@@ -486,8 +486,8 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
dstBlendAlpha = gl_blend_factor(state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format);
}
- GL_EXTCALL(glBlendFuncSeparateEXT(srcBlend, dstBlend, srcBlendAlpha, dstBlendAlpha));
- checkGLcall("glBlendFuncSeparateEXT");
+ GL_EXTCALL(glBlendFuncSeparate(srcBlend, dstBlend, srcBlendAlpha, dstBlendAlpha));
+ checkGLcall("glBlendFuncSeparate");
}
else
{
@@ -504,7 +504,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st
static void state_blendfactor_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
- WARN("Unsupported in local OpenGL implementation: glBlendColorEXT\n");
+ WARN("Unsupported in local OpenGL implementation: glBlendColor.\n");
}
static void state_blendfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
@@ -515,7 +515,7 @@ static void state_blendfactor(struct wined3d_context *context, const struct wine
TRACE("Setting blend factor to %#x.\n", state->render_states[WINED3D_RS_BLENDFACTOR]);
D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_BLENDFACTOR], col);
- GL_EXTCALL(glBlendColorEXT (col[0],col[1],col[2],col[3]));
+ GL_EXTCALL(glBlendColor(col[0], col[1], col[2], col[3]));
checkGLcall("glBlendColor");
}
--
2.0.5
More information about the wine-patches
mailing list