Matteo Bruni : d3dx9: Parse "usage 2" effect resources.
Alexandre Julliard
julliard at winehq.org
Tue Mar 18 14:15:05 CDT 2014
Module: wine
Branch: master
Commit: babf0dca0395c6647146320f50035f1b4bf0a1b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=babf0dca0395c6647146320f50035f1b4bf0a1b3
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Mon Mar 17 20:22:54 2014 +0100
d3dx9: Parse "usage 2" effect resources.
---
dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 73eb5c8..d5258e9 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -96,6 +96,7 @@ enum STATE_TYPE
ST_CONSTANT,
ST_PARAMETER,
ST_FXLC,
+ ST_ARRAY_SELECTOR,
};
struct d3dx_parameter
@@ -4983,6 +4984,32 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o
return D3D_OK;
}
+static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_parameter *param)
+{
+ DWORD string_size;
+ struct d3dx_object *object = &base->objects[param->object_id];
+ char *ptr = object->data;
+
+ TRACE("Parsing array entry selection state for parameter %p.\n", param);
+
+ string_size = *(DWORD *)ptr;
+ param->referenced_param = get_parameter_by_name(base, NULL, ptr + 4);
+ if (param->referenced_param)
+ {
+ TRACE("Mapping to parameter %s.\n", debugstr_a(param->referenced_param->name));
+ }
+ else
+ {
+ FIXME("Referenced parameter %s not found.\n", ptr + 4);
+ return D3DXERR_INVALIDDATA;
+ }
+ TRACE("Unknown DWORD: 0x%.8x.\n", *(DWORD *)(ptr + string_size));
+
+ FIXME("Parse preshader.\n");
+
+ return D3D_OK;
+}
+
static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr)
{
DWORD technique_index;
@@ -5121,6 +5148,13 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *
}
break;
+ case 2:
+ state->type = ST_ARRAY_SELECTOR;
+ if (FAILED(hr = d3dx9_copy_data(object, ptr)))
+ return hr;
+ hr = d3dx9_parse_array_selector(base, param);
+ break;
+
default:
FIXME("Unknown usage %x\n", usage);
break;
More information about the wine-cvs
mailing list