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

d3d10: Add D3D10_EOO_PARSED_OBJECT in parse_fx10_object().

This commit is contained in:
Rico Schüller 2010-01-24 14:26:46 +01:00 committed by Alexandre Julliard
parent f811cd3e0d
commit 7a12bf9841
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d10/d3d10_private.h
View File

@ -48,6 +48,7 @@ enum d3d10_effect_object_type
enum d3d10_effect_object_operation enum d3d10_effect_object_operation
{ {
D3D10_EOO_VALUE = 1, D3D10_EOO_VALUE = 1,
D3D10_EOO_PARSED_OBJECT = 2,
D3D10_EOO_ANONYMOUS_SHADER = 7, D3D10_EOO_ANONYMOUS_SHADER = 7,
}; };

9
dlls/d3d10/effect.c
View File

@ -910,6 +910,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr
enum d3d10_effect_object_operation operation; enum d3d10_effect_object_operation operation;
HRESULT hr; HRESULT hr;
struct d3d10_effect *effect = o->pass->technique->effect; struct d3d10_effect *effect = o->pass->technique->effect;
ID3D10Effect *e = (ID3D10Effect *)effect;
read_dword(ptr, &o->type); read_dword(ptr, &o->type);
TRACE("Effect object is of type %#x.\n", o->type); TRACE("Effect object is of type %#x.\n", o->type);
@ -956,6 +957,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr
} }
break; break;
case D3D10_EOO_PARSED_OBJECT:
/* This is a local object, we've parsed in parse_fx10_local_object. */
TRACE("Shader = %s.\n", data + offset);
o->data = e->lpVtbl->GetVariableByName(e, data + offset);
hr = S_OK;
break;
case D3D10_EOO_ANONYMOUS_SHADER: case D3D10_EOO_ANONYMOUS_SHADER:
TRACE("Anonymous shader\n"); TRACE("Anonymous shader\n");