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

d3dx9: Move technique name handling to technique handle validation.

This commit is contained in:
Rico Schüller 2012-08-18 14:59:31 +02:00 committed by Alexandre Julliard
parent 05818a3056
commit c1193ab79b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/d3dx9_36/effect.c
View File

@ -469,17 +469,21 @@ static struct d3dx_technique *get_technique_by_name(struct ID3DXBaseEffectImpl *
static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique)
{ {
struct d3dx_technique *tech = NULL;
unsigned int i; unsigned int i;
for (i = 0; i < base->technique_count; ++i) for (i = 0; i < base->technique_count; ++i)
{ {
if (base->technique_handles[i] == technique) if (base->technique_handles[i] == technique)
{ {
return get_technique_struct(technique); tech = get_technique_struct(technique);
break;
} }
} }
return NULL; if (!tech) tech = get_technique_by_name(base, technique);
return tech;
} }
static struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) static struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass)
@ -1462,8 +1466,6 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPass(ID3DXBaseEffect *iface, D3D
TRACE("iface %p, technique %p, index %u\n", This, technique, index); TRACE("iface %p, technique %p, index %u\n", This, technique, index);
if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique));
if (tech && index < tech->pass_count) if (tech && index < tech->pass_count)
{ {
TRACE("Returning pass %p\n", tech->pass_handles[index]); TRACE("Returning pass %p\n", tech->pass_handles[index]);
@ -1482,8 +1484,6 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetPassByName(ID3DXBaseEffect *ifac
TRACE("iface %p, technique %p, name %s\n", This, technique, debugstr_a(name)); TRACE("iface %p, technique %p, name %s\n", This, technique, debugstr_a(name));
if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique));
if (tech && name) if (tech && name)
{ {
unsigned int i; unsigned int i;
@ -3525,8 +3525,6 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL
TRACE("iface %p, technique %p\n", This, technique); TRACE("iface %p, technique %p\n", This, technique);
if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique));
if (tech) if (tech)
{ {
UINT i; UINT i;