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

d3d10/effect: Make it clear which assignment types are supported in state groups. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-10-01 09:14:00 +03:00 committed by Alexandre Julliard
parent 74d8129fc6
commit 0182f1f848
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3d10/d3d10_private.h
View File

@ -60,9 +60,11 @@ enum d3d10_effect_object_type_flags
enum d3d10_effect_object_operation enum d3d10_effect_object_operation
{ {
D3D10_EOO_VALUE = 1, D3D10_EOO_CONST = 1,
D3D10_EOO_PARSED_OBJECT = 2, D3D10_EOO_VAR = 2,
D3D10_EOO_PARSED_OBJECT_INDEX = 3, D3D10_EOO_CONST_INDEX = 3,
D3D10_EOO_VAR_INDEX = 4,
D3D10_EOO_INDEX_EXPRESSION = 5,
D3D10_EOO_ANONYMOUS_SHADER = 7, D3D10_EOO_ANONYMOUS_SHADER = 7,
}; };

25
dlls/d3d10/effect.c
View File

@ -1741,11 +1741,22 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size,
return FALSE; return FALSE;
} }
if (!read_value_list(data, data_size, value_offset, property_info->type, idx, switch (operation)
property_info->size, (char *)container + property_info->offset))
{ {
ERR("Failed to read values for property %#x.\n", id); case D3D10_EOO_CONST:
return FALSE;
/* Constant values output directly to backing store. */
if (!read_value_list(data, data_size, value_offset, property_info->type, idx,
property_info->size, (char *)container + property_info->offset))
{
ERR("Failed to read values for property %#x.\n", id);
return FALSE;
}
break;
default:
FIXME("Unhandled operation %#x.\n", operation);
return E_FAIL;
} }
} }
@ -1787,7 +1798,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size,
switch(operation) switch(operation)
{ {
case D3D10_EOO_VALUE: case D3D10_EOO_CONST:
TRACE("Copy variable values\n"); TRACE("Copy variable values\n");
switch (o->type) switch (o->type)
@ -1837,7 +1848,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size,
} }
break; break;
case D3D10_EOO_PARSED_OBJECT: case D3D10_EOO_VAR:
/* This is a local object, we've parsed in parse_fx10_local_object. */ /* This is a local object, we've parsed in parse_fx10_local_object. */
if (!fx10_get_string(data, data_size, offset, &name, &name_len)) if (!fx10_get_string(data, data_size, offset, &name, &name_len))
{ {
@ -1849,7 +1860,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size,
variable = e->lpVtbl->GetVariableByName(e, name); variable = e->lpVtbl->GetVariableByName(e, name);
break; break;
case D3D10_EOO_PARSED_OBJECT_INDEX: case D3D10_EOO_CONST_INDEX:
/* This is a local object, we've parsed in parse_fx10_local_object, which has an array index. */ /* This is a local object, we've parsed in parse_fx10_local_object, which has an array index. */
if (offset >= data_size || !require_space(offset, 2, sizeof(DWORD), data_size)) if (offset >= data_size || !require_space(offset, 2, sizeof(DWORD), data_size))
{ {