=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Simplify computation of " num_textures_used" in ATI fragment pipeline.
Alexandre Julliard
julliard at winehq.org
Mon Mar 13 15:40:32 CDT 2017
Module: wine
Branch: master
Commit: f2af535c0598ce036a168646c08fff0b2828004b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2af535c0598ce036a168646c08fff0b2828004b
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Mar 13 11:57:19 2017 +0100
wined3d: Simplify computation of "num_textures_used" in ATI fragment pipeline.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/ati_fragment_shader.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index 341bd9b..c9af8e7 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -1024,7 +1024,8 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined
gen_ffp_frag_op(context, state, &settings, TRUE);
desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings);
- if(!desc) {
+ if (!desc)
+ {
struct atifs_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*new_desc));
if (!new_desc)
{
@@ -1036,13 +1037,13 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined
{
if (settings.op[i].cop == WINED3D_TOP_DISABLE)
break;
- new_desc->num_textures_used = i + 1;
+ ++new_desc->num_textures_used;
}
new_desc->parent.settings = settings;
new_desc->shader = gen_ati_shader(settings.op, gl_info, new_desc->constants);
add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent);
- TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc);
+ TRACE("Allocated fixed function replacement shader descriptor %p.\n", new_desc);
desc = new_desc;
}
More information about the wine-cvs
mailing list