marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Use lower 8 bits only from _ALPHAREF state. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38138
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 6963fd0bef)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
oldstable
Paul Gofman 2019-02-05 18:57:25 +03:00 committed by Michael Stefaniuc
parent 4e8dc0577c
commit ac96d882bf
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/arb_program_shader.c
View File

@ -5945,7 +5945,7 @@ static void alpha_test_arbfp(struct wined3d_context *context, const struct wined
return; return;
} }
ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; ref = wined3d_alpha_ref(state);
glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]);
if (glParm) if (glParm)

4
dlls/wined3d/glsl_shader.c
View File

@ -2032,7 +2032,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
if (update_mask & WINED3D_SHADER_CONST_PS_ALPHA_TEST) if (update_mask & WINED3D_SHADER_CONST_PS_ALPHA_TEST)
{ {
float ref = state->render_states[WINED3D_RS_ALPHAREF] / 255.0f; float ref = wined3d_alpha_ref(state);
GL_EXTCALL(glUniform1f(prog->ps.alpha_test_ref_location, ref)); GL_EXTCALL(glUniform1f(prog->ps.alpha_test_ref_location, ref));
checkGLcall("alpha test emulation uniform"); checkGLcall("alpha test emulation uniform");
@ -12308,7 +12308,7 @@ static void glsl_fragment_pipe_alpha_test_func(struct wined3d_context *context,
{ {
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context->gl_info;
GLint func = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); GLint func = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]);
float ref = state->render_states[WINED3D_RS_ALPHAREF] / 255.0f; float ref = wined3d_alpha_ref(state);
if (func) if (func)
{ {

2
dlls/wined3d/state.c
View File

@ -681,7 +681,7 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat
} }
else else
{ {
ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; ref = wined3d_alpha_ref(state);
glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]);
} }
if (glParm) if (glParm)

5
dlls/wined3d/wined3d_private.h
View File

@ -3083,6 +3083,11 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta
return context->isStateDirty[idx] & (1u << shift); return context->isStateDirty[idx] & (1u << shift);
} }
static inline float wined3d_alpha_ref(const struct wined3d_state *state)
{
return (state->render_states[WINED3D_RS_ALPHAREF] & 0xff) / 255.0f;
}
const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN;
const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN;
const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d,