From 3838f4b21a044884282c4e3129b1873b3d2f3656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rico=20Sch=C3=BCller?= Date: Sat, 30 May 2009 14:13:19 +0200 Subject: [PATCH] d3d10: Replace a few more unknown in parse_fx10. --- dlls/d3d10/d3d10_private.h | 2 ++ dlls/d3d10/effect.c | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index fc8e932b86b..c5a74aa54a3 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -93,6 +93,8 @@ struct d3d10_effect DWORD version; DWORD localbuffers_count; DWORD localobjects_count; + DWORD sharedbuffers_count; + DWORD sharedobjects_count; DWORD technique_count; DWORD index_offset; DWORD dephstencilstate_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index eff753f6ca3..8316db8f9b8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -462,12 +462,15 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->localobjects_count); TRACE("Localobjects count: %u\n", e->localobjects_count); + read_dword(&ptr, &e->sharedbuffers_count); + TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); + + /* Number of variables in shared buffers? */ read_dword(&ptr, &unknown); FIXME("Unknown 1: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 2: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 3: %u\n", unknown); + + read_dword(&ptr, &e->sharedobjects_count); + TRACE("Sharedobjects count: %u\n", e->sharedobjects_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -476,9 +479,9 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Index offset: %#x\n", e->index_offset); read_dword(&ptr, &unknown); - FIXME("Unknown 4: %u\n", unknown); + FIXME("Unknown 2: %u\n", unknown); read_dword(&ptr, &unknown); - FIXME("Unknown 5: %u\n", unknown); + FIXME("Unknown 3: %u\n", unknown); read_dword(&ptr, &e->dephstencilstate_count); TRACE("Depthstencilstate count: %u\n", e->dephstencilstate_count); @@ -493,15 +496,15 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Samplerstate count: %u\n", e->samplerstate_count); read_dword(&ptr, &unknown); - FIXME("Unknown 6: %u\n", unknown); + FIXME("Unknown 4: %u\n", unknown); read_dword(&ptr, &unknown); - FIXME("Unknown 7: %u\n", unknown); + FIXME("Unknown 5: %u\n", unknown); /* Number of function calls in all passes? */ read_dword(&ptr, &unknown); - FIXME("Unknown 8: %u\n", unknown); + FIXME("Unknown 6: %u\n", unknown); read_dword(&ptr, &unknown); - FIXME("Unknown 9: %u\n", unknown); + FIXME("Unknown 7: %u\n", unknown); return parse_fx10_body(e, ptr, data_size - (ptr - data)); }