From ffd11f280d52b9c81b88fc741ec95c331ced4483 Mon Sep 17 00:00:00 2001 From: Thomas Crider Date: Fri, 23 Feb 2018 19:19:44 -0500 Subject: [PATCH] Revert "wined3d-Indexed_Vertex_Blending: 0005 fix patch apply" This reverts commit 7773dec0f4a7fffaa64d7d3b8f32f69937dc8abe. --- ...d3d-Move-matrix-inversion-functions-into-utils.c.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/wined3d-Indexed_Vertex_Blending/0005-wined3d-Move-matrix-inversion-functions-into-utils.c.patch b/patches/wined3d-Indexed_Vertex_Blending/0005-wined3d-Move-matrix-inversion-functions-into-utils.c.patch index ca11b9fb..29db3899 100644 --- a/patches/wined3d-Indexed_Vertex_Blending/0005-wined3d-Move-matrix-inversion-functions-into-utils.c.patch +++ b/patches/wined3d-Indexed_Vertex_Blending/0005-wined3d-Move-matrix-inversion-functions-into-utils.c.patch @@ -13,7 +13,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2aa0d0db0a4..aaca2f63441 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c -@@ -1236,281 +1236,6 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps +@@ -1221,281 +1221,6 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps GL_EXTCALL(glUniform4fv(ps->np2_fixup_location, ps->np2_fixup_info->num_consts, &np2fixup_constants[0].sx)); } @@ -88,7 +88,7 @@ index 2aa0d0db0a4..aaca2f63441 100644 - *b = tmp; -} - --static BOOL invert_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) +-static BOOL invert_matrix(struct wined3d_matrix *out, struct wined3d_matrix *m) -{ - float wtmp[4][8]; - float m0, m1, m2, m3, s; @@ -292,9 +292,9 @@ index 2aa0d0db0a4..aaca2f63441 100644 - return TRUE; -} - - static void transpose_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) + static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_context *context, + const struct wined3d_state *state, unsigned int tex, struct glsl_shader_prog_link *prog) { - struct wined3d_matrix temp; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 847429511b9..b2effb5c2ec 100644 --- a/dlls/wined3d/utils.c