Henri Verbeet : wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc.
Alexandre Julliard
julliard at winehq.org
Tue Oct 23 13:37:18 CDT 2012
Module: wine
Branch: master
Commit: 672ad0610876f344f0cf1309b8a0747ebab3a93a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=672ad0610876f344f0cf1309b8a0747ebab3a93a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Oct 23 11:23:44 2012 +0200
wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc.
---
dlls/wined3d/arb_program_shader.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 87e89fd..2a74171 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5618,7 +5618,6 @@ struct arbfp_ffp_desc
{
struct ffp_frag_desc parent;
GLuint shader;
- unsigned int num_textures_used;
};
/* Context activation and GL locking are done by the caller. */
@@ -6421,13 +6420,6 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi
ERR("Out of memory\n");
return;
}
- new_desc->num_textures_used = 0;
- for (i = 0; i < gl_info->limits.texture_stages; ++i)
- {
- if (settings.op[i].cop == WINED3D_TOP_DISABLE)
- break;
- new_desc->num_textures_used = i;
- }
memcpy(&new_desc->parent.settings, &settings, sizeof(settings));
new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info);
More information about the wine-cvs
mailing list