Rico Schüller : d3d10: Initialize *-> buffer for all effect variables.
Alexandre Julliard
julliard at winehq.org
Tue Nov 3 15:37:21 CST 2009
Module: wine
Branch: master
Commit: d5ac732ceb4d5640ed350644f84ece596cc79985
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ac732ceb4d5640ed350644f84ece596cc79985
Author: Rico Schüller <kgbricola at web.de>
Date: Sun Nov 1 13:42:32 2009 +0100
d3d10: Initialize *->buffer for all effect variables.
---
dlls/d3d10/effect.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 194f518..65ad689 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -921,11 +921,12 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co
return E_OUTOFMEMORY;
}
- for(i = 0; i < p->annotation_count; ++i)
+ for (i = 0; i < p->annotation_count; ++i)
{
struct d3d10_effect_variable *a = &p->annotations[i];
a->effect = p->technique->effect;
+ a->buffer = &null_local_buffer;
hr = parse_fx10_annotation(a, ptr, data);
if (FAILED(hr)) return hr;
@@ -980,11 +981,12 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char
return E_OUTOFMEMORY;
}
- for(i = 0; i < t->annotation_count; ++i)
+ for (i = 0; i < t->annotation_count; ++i)
{
struct d3d10_effect_variable *a = &t->annotations[i];
a->effect = t->effect;
+ a->buffer = &null_local_buffer;
hr = parse_fx10_annotation(a, ptr, data);
if (FAILED(hr)) return hr;
@@ -1053,6 +1055,7 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char *
struct d3d10_effect_variable *a = &v->annotations[i];
a->effect = v->effect;
+ a->buffer = &null_local_buffer;
hr = parse_fx10_annotation(a, ptr, data);
if (FAILED(hr)) return hr;
@@ -1142,6 +1145,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const
struct d3d10_effect_variable *a = &v->annotations[i];
a->effect = v->effect;
+ a->buffer = &null_local_buffer;
hr = parse_fx10_annotation(a, ptr, data);
if (FAILED(hr)) return hr;
@@ -1225,11 +1229,12 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch
return E_OUTOFMEMORY;
}
- for(i = 0; i < l->annotation_count; ++i)
+ for (i = 0; i < l->annotation_count; ++i)
{
struct d3d10_effect_variable *a = &l->annotations[i];
a->effect = l->effect;
+ a->buffer = &null_local_buffer;
hr = parse_fx10_annotation(a, ptr, data);
if (FAILED(hr)) return hr;
@@ -1443,6 +1448,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d
v->effect = e;
v->vtbl = &d3d10_effect_variable_vtbl;
+ v->buffer = &null_local_buffer;
hr = parse_fx10_local_variable(v, &ptr, data);
if (FAILED(hr)) return hr;
More information about the wine-cvs
mailing list