ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Correctly transform FFP clip planes. 

A plane isn't transformed as simply as a vector.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-12-05 00:26:33 +01:00 committed by Alexandre Julliard
parent 6eaebedc51
commit 266f1054b5
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/wined3d/glsl_shader.c
View File

@ -1308,7 +1308,7 @@ static void swap_rows(float **a, float **b)
*b = tmp; *b = tmp;
} }
static BOOL invert_matrix(struct wined3d_matrix *out, struct wined3d_matrix *m) static BOOL invert_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m)
{ {
float wtmp[4][8]; float wtmp[4][8];
float m0, m1, m2, m3, s; float m0, m1, m2, m3, s;
@ -1512,6 +1512,18 @@ static BOOL invert_matrix(struct wined3d_matrix *out, struct wined3d_matrix *m)
return TRUE; return TRUE;
} }
static void transpose_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m)
{
struct wined3d_matrix temp;
unsigned int i, j;
for (i = 0; i < 4; ++i)
for (j = 0; j < 4; ++j)
(&temp._11)[4 * j + i] = (&m->_11)[4 * i + j];
*out = temp;
}
static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context, static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context,
const struct wined3d_state *state, struct glsl_shader_prog_link *prog) const struct wined3d_state *state, struct glsl_shader_prog_link *prog)
{ {
@ -1709,13 +1721,18 @@ static void shader_glsl_clip_plane_uniform(const struct wined3d_context *context
const struct wined3d_state *state, unsigned int index, struct glsl_shader_prog_link *prog) const struct wined3d_state *state, unsigned int index, struct glsl_shader_prog_link *prog)
{ {
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context->gl_info;
struct wined3d_matrix matrix;
struct wined3d_vec4 plane; struct wined3d_vec4 plane;
plane = state->clip_planes[index];
/* Clip planes are affected by the view transform in d3d for FFP draws. */ /* Clip planes are affected by the view transform in d3d for FFP draws. */
if (!use_vs(state)) if (!use_vs(state))
multiply_vector_matrix(&plane, &state->clip_planes[index], &state->transforms[WINED3D_TS_VIEW]); {
else invert_matrix(&matrix, &state->transforms[WINED3D_TS_VIEW]);
plane = state->clip_planes[index]; transpose_matrix(&matrix, &matrix);
multiply_vector_matrix(&plane, &plane, &matrix);
}
GL_EXTCALL(glUniform4fv(prog->vs.clip_planes_location + index, 1, &plane.x)); GL_EXTCALL(glUniform4fv(prog->vs.clip_planes_location + index, 1, &plane.x));
} }