Rico Schüller : d3d10: Rename ConstantBuffer' s variable to member.
Alexandre Julliard
julliard at winehq.org
Wed Sep 30 10:56:09 CDT 2009
Module: wine
Branch: master
Commit: 835dedc964576acc98ac87acd1f1038f2bb35f2f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=835dedc964576acc98ac87acd1f1038f2bb35f2f
Author: Rico Schüller <kgbricola at web.de>
Date: Wed Sep 30 11:39:13 2009 +0200
d3d10: Rename ConstantBuffer's variable to member.
---
dlls/d3d10/d3d10_private.h | 4 ++--
dlls/d3d10/effect.c | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index 2d664cb..7ef2c17 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -109,9 +109,9 @@ struct d3d10_effect_local_buffer
struct d3d10_effect *effect;
char *name;
DWORD data_size;
- DWORD variable_count;
+ DWORD member_count;
DWORD annotation_count;
- struct d3d10_effect_variable *variables;
+ struct d3d10_effect_variable *members;
struct d3d10_effect_variable *annotations;
};
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index d1bd7ee..ccbc3c4 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -734,8 +734,8 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons
skip_dword_unknown(ptr, 1);
- read_dword(ptr, &l->variable_count);
- TRACE("Local buffer variable count: %#x.\n", l->variable_count);
+ read_dword(ptr, &l->member_count);
+ TRACE("Local buffer member count: %#x.\n", l->member_count);
skip_dword_unknown(ptr, 1);
@@ -759,16 +759,16 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons
if (FAILED(hr)) return hr;
}
- l->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->variable_count * sizeof(*l->variables));
- if (!l->variables)
+ l->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->member_count * sizeof(*l->members));
+ if (!l->members)
{
- ERR("Failed to allocate variables memory.\n");
+ ERR("Failed to allocate members memory.\n");
return E_OUTOFMEMORY;
}
- for (i = 0; i < l->variable_count; ++i)
+ for (i = 0; i < l->member_count; ++i)
{
- struct d3d10_effect_variable *v = &l->variables[i];
+ struct d3d10_effect_variable *v = &l->members[i];
v->buffer = l;
v->effect = l->effect;
@@ -1068,13 +1068,13 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer *
TRACE("local buffer %p.\n", l);
HeapFree(GetProcessHeap(), 0, l->name);
- if (l->variables)
+ if (l->members)
{
- for (i = 0; i < l->variable_count; ++i)
+ for (i = 0; i < l->member_count; ++i)
{
- d3d10_effect_variable_destroy(&l->variables[i]);
+ d3d10_effect_variable_destroy(&l->members[i]);
}
- HeapFree(GetProcessHeap(), 0, l->variables);
+ HeapFree(GetProcessHeap(), 0, l->members);
}
if (l->annotations)
@@ -1254,9 +1254,9 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB
struct d3d10_effect_local_buffer *l = &This->local_buffers[i];
unsigned int j;
- for (j = 0; j < l->variable_count; ++j)
+ for (j = 0; j < l->member_count; ++j)
{
- struct d3d10_effect_variable *v = &l->variables[j];
+ struct d3d10_effect_variable *v = &l->members[j];
if (!strcmp(v->name, name))
{
More information about the wine-cvs
mailing list