From 45b655c26f8d286da9304a0bf11389ea5bb2b47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Wed, 23 Dec 2009 15:37:42 +0100 Subject: [PATCH 04/25] WineD3D: Rename conversion_count to something more appropriate --- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b26f37d..20b40cb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -735,10 +735,10 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) */ if (decl_changed) { - ++This->conversion_count; + ++This->decl_change_count; This->draw_count = 0; - if (This->conversion_count > VB_MAXDECLCHANGES) + if (This->decl_change_count > VB_MAXDECLCHANGES) { FIXME("Too many declaration changes, stopping converting\n"); @@ -763,7 +763,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) * decl changes and reset the decl change count after a specific number of them */ ++This->draw_count; - if (This->draw_count > VB_RESETDECLCHANGE) This->conversion_count = 0; + if (This->draw_count > VB_RESETDECLCHANGE) This->decl_change_count = 0; } if (decl_changed) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 489137c..386aea5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2373,7 +2373,7 @@ struct wined3d_buffer LONG lock_count; /* conversion stuff */ - UINT conversion_count; + UINT decl_change_count; UINT draw_count; UINT stride; /* 0 if no conversion */ UINT conversion_stride; /* 0 if no shifted conversion */ -- 1.6.4.4