Module: wine Branch: master Commit: ec6a83013097b180afef97c6de6ec6cc048850e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6a83013097b180afef97c6d...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Jun 13 16:28:38 2019 +0430
wined3d: Get rid of the unused "gl_info" argument to compute_texture_matrix().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/utils.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a83d444..44b6c48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5470,9 +5470,8 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w }
/* Setup this textures matrix according to the texture flags. */ -static void compute_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, - DWORD flags, BOOL calculated_coords, BOOL transformed, enum wined3d_format_id format_id, - BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) +static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t flags, BOOL calculated_coords, + BOOL transformed, enum wined3d_format_id format_id, BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) { struct wined3d_matrix mat;
@@ -5586,13 +5585,12 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine unsigned int tex, struct wined3d_matrix *mat) { const struct wined3d_device *device = context->device; - const struct wined3d_gl_info *gl_info = context->gl_info; BOOL generated = (state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU; unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], WINED3D_MAX_TEXTURES - 1);
- compute_texture_matrix(gl_info, &state->transforms[WINED3D_TS_TEXTURE0 + tex], + compute_texture_matrix(&state->transforms[WINED3D_TS_TEXTURE0 + tex], state->texture_states[tex][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], generated, context->last_was_rhw, context->stream_info.use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx))