Henri Verbeet : wined3d: Rename "numContexts" to "context_count".
Alexandre Julliard
julliard at winehq.org
Thu Mar 31 12:43:42 CDT 2011
Module: wine
Branch: master
Commit: 692aa004d00080d7361a2c0d35db68a67a3a87c4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=692aa004d00080d7361a2c0d35db68a67a3a87c4
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Mar 30 20:49:27 2011 +0200
wined3d: Rename "numContexts" to "context_count".
---
dlls/wined3d/context.c | 4 ++--
dlls/wined3d/device.c | 18 ++++++++++--------
dlls/wined3d/surface.c | 2 +-
dlls/wined3d/wined3d_private.h | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index e52bc48..3b0a9b6 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -659,7 +659,7 @@ static void context_enum_surface_fbo_entries(IWineD3DDeviceImpl *device,
{
UINT i;
- for (i = 0; i < device->numContexts; ++i)
+ for (i = 0; i < device->context_count; ++i)
{
struct wined3d_context *context = device->contexts[i];
const struct wined3d_gl_info *gl_info = context->gl_info;
@@ -1370,7 +1370,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain,
}
ctx = pwglCreateContext(hdc);
- if (device->numContexts)
+ if (device->context_count)
{
if (!pwglShareLists(device->contexts[0]->glCtx, ctx))
{
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 695dbb2..1ef9c62 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -504,7 +504,8 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont
TRACE("Adding context %p.\n", context);
if (!device->contexts) new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_array));
- else new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, sizeof(*new_array) * (device->numContexts + 1));
+ else new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts,
+ sizeof(*new_array) * (device->context_count + 1));
if (!new_array)
{
@@ -512,7 +513,7 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont
return FALSE;
}
- new_array[device->numContexts++] = context;
+ new_array[device->context_count++] = context;
device->contexts = new_array;
return TRUE;
}
@@ -525,7 +526,7 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c
TRACE("Removing context %p.\n", context);
- for (i = 0; i < device->numContexts; ++i)
+ for (i = 0; i < device->context_count; ++i)
{
if (device->contexts[i] == context)
{
@@ -540,15 +541,15 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c
return;
}
- if (!--device->numContexts)
+ if (!--device->context_count)
{
HeapFree(GetProcessHeap(), 0, device->contexts);
device->contexts = NULL;
return;
}
- memmove(&device->contexts[i], &device->contexts[i + 1], (device->numContexts - i) * sizeof(*device->contexts));
- new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->numContexts * sizeof(*device->contexts));
+ memmove(&device->contexts[i], &device->contexts[i + 1], (device->context_count - i) * sizeof(*device->contexts));
+ new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->context_count * sizeof(*device->contexts));
if (!new_array)
{
ERR("Failed to shrink context array. Oh well.\n");
@@ -6283,7 +6284,7 @@ static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChain
context_release(context);
- while (device->numContexts)
+ while (device->context_count)
{
context_destroy(device, device->contexts[0]);
}
@@ -7065,7 +7066,8 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) {
BYTE shift;
UINT i;
- for(i = 0; i < This->numContexts; i++) {
+ for (i = 0; i < This->context_count; ++i)
+ {
context = This->contexts[i];
if(isStateDirty(context, rep)) continue;
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index f76cdde..5d4dfa7 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1013,7 +1013,7 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_
IWineD3DDeviceImpl *device = This->resource.device;
unsigned int i;
- for (i = 0; i < device->numContexts; ++i)
+ for (i = 0; i < device->context_count; ++i)
{
context_surface_update(device->contexts[i], This);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8587afc..c985378 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1759,7 +1759,7 @@ struct IWineD3DDeviceImpl
/* Context management */
struct wined3d_context **contexts;
- UINT numContexts;
+ UINT context_count;
/* High level patch management */
#define PATCHMAP_SIZE 43
More information about the wine-cvs
mailing list