ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Rename "numContexts" to "context_count".

This commit is contained in:
Henri Verbeet 2011-03-30 20:49:27 +02:00 committed by Alexandre Julliard
parent 8fe80e18b2
commit 692aa004d0
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/context.c
View File

@ -659,7 +659,7 @@ static void context_enum_surface_fbo_entries(IWineD3DDeviceImpl *device,
{ {
UINT i; UINT i;
for (i = 0; i < device->numContexts; ++i) for (i = 0; i < device->context_count; ++i)
{ {
struct wined3d_context *context = device->contexts[i]; struct wined3d_context *context = device->contexts[i];
const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_gl_info *gl_info = context->gl_info;
@ -1370,7 +1370,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain,
} }
ctx = pwglCreateContext(hdc); ctx = pwglCreateContext(hdc);
if (device->numContexts) if (device->context_count)
{ {
if (!pwglShareLists(device->contexts[0]->glCtx, ctx)) if (!pwglShareLists(device->contexts[0]->glCtx, ctx))
{ {

18
dlls/wined3d/device.c
View File

@ -504,7 +504,8 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont
TRACE("Adding context %p.\n", context); TRACE("Adding context %p.\n", context);
if (!device->contexts) new_array = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_array)); 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) if (!new_array)
{ {
@ -512,7 +513,7 @@ BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *cont
return FALSE; return FALSE;
} }
new_array[device->numContexts++] = context; new_array[device->context_count++] = context;
device->contexts = new_array; device->contexts = new_array;
return TRUE; return TRUE;
} }
@ -525,7 +526,7 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c
TRACE("Removing context %p.\n", context); 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) if (device->contexts[i] == context)
{ {
@ -540,15 +541,15 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c
return; return;
} }
if (!--device->numContexts) if (!--device->context_count)
{ {
HeapFree(GetProcessHeap(), 0, device->contexts); HeapFree(GetProcessHeap(), 0, device->contexts);
device->contexts = NULL; device->contexts = NULL;
return; return;
} }
memmove(&device->contexts[i], &device->contexts[i + 1], (device->numContexts - i) * 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->numContexts * sizeof(*device->contexts)); new_array = HeapReAlloc(GetProcessHeap(), 0, device->contexts, device->context_count * sizeof(*device->contexts));
if (!new_array) if (!new_array)
{ {
ERR("Failed to shrink context array. Oh well.\n"); ERR("Failed to shrink context array. Oh well.\n");
@ -6283,7 +6284,7 @@ static void delete_opengl_contexts(IWineD3DDeviceImpl *device, IWineD3DSwapChain
context_release(context); context_release(context);
while (device->numContexts) while (device->context_count)
{ {
context_destroy(device, device->contexts[0]); context_destroy(device, device->contexts[0]);
} }
@ -7065,7 +7066,8 @@ void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) {
BYTE shift; BYTE shift;
UINT i; UINT i;
for(i = 0; i < This->numContexts; i++) { for (i = 0; i < This->context_count; ++i)
{
context = This->contexts[i]; context = This->contexts[i];
if(isStateDirty(context, rep)) continue; if(isStateDirty(context, rep)) continue;

2
dlls/wined3d/surface.c
View File

@ -1013,7 +1013,7 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_
IWineD3DDeviceImpl *device = This->resource.device; IWineD3DDeviceImpl *device = This->resource.device;
unsigned int i; 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); context_surface_update(device->contexts[i], This);
} }

2
dlls/wined3d/wined3d_private.h
View File

@ -1759,7 +1759,7 @@ struct IWineD3DDeviceImpl
/* Context management */ /* Context management */
struct wined3d_context **contexts; struct wined3d_context **contexts;
UINT numContexts; UINT context_count;
/* High level patch management */ /* High level patch management */
#define PATCHMAP_SIZE 43 #define PATCHMAP_SIZE 43