Henri Verbeet : d3d10: Add some code for parsing DXBC data.
Alexandre Julliard
julliard at winehq.org
Fri Feb 27 10:02:41 CST 2009
Module: wine
Branch: master
Commit: 46f3102b936d1b3df90e093c63c0f8f3636e5958
URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f3102b936d1b3df90e093c63c0f8f3636e5958
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Feb 27 09:29:48 2009 +0100
d3d10: Add some code for parsing DXBC data.
---
dlls/d3d10/d3d10_main.c | 10 ++++
dlls/d3d10/d3d10_private.h | 2 +
dlls/d3d10/effect.c | 104 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index b13bb9f..88fd12b 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -2,6 +2,7 @@
* Direct3D 10
*
* Copyright 2007 Andras Kovacs
+ * Copyright 2009 Henri Verbeet for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -209,6 +210,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl
ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect)
{
struct d3d10_effect *object;
+ HRESULT hr;
FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n",
data, data_size, flags, device, effect_pool, effect);
@@ -223,6 +225,14 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl
object->vtbl = &d3d10_effect_vtbl;
object->refcount = 1;
+ hr = d3d10_effect_parse(object, data, data_size);
+ if (FAILED(hr))
+ {
+ ERR("Failed to parse effect\n");
+ IUnknown_Release((IUnknown *)object);
+ return hr;
+ }
+
*effect = (ID3D10Effect *)object;
TRACE("Created ID3D10Effect %p\n", object);
diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index c73c840..05003cc 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -39,6 +39,8 @@ struct d3d10_effect
LONG refcount;
};
+HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size);
+
/* D3D10Core */
HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter,
UINT flags, DWORD unknown0, ID3D10Device **device);
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 54ae6ea..b04fae4 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -24,6 +24,110 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d10);
+#define MAKE_TAG(ch0, ch1, ch2, ch3) \
+ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \
+ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 ))
+#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C')
+
+static inline void read_dword(const char **ptr, DWORD *d)
+{
+ memcpy(d, *ptr, sizeof(d));
+ *ptr += sizeof(d);
+}
+
+static inline void skip_dword_unknown(const char **ptr, unsigned int count)
+{
+ unsigned int i;
+ DWORD d;
+
+ FIXME("Skipping %u unknown DWORDs:\n", count);
+ for (i = 0; i < count; ++i)
+ {
+ read_dword(ptr, &d);
+ FIXME("\t0x%08x\n", d);
+ }
+}
+
+static inline void read_tag(const char **ptr, DWORD *t, char t_str[5])
+{
+ read_dword(ptr, t);
+ memcpy(t_str, t, 4);
+ t_str[4] = '\0';
+}
+
+static HRESULT parse_dxbc(const char *data, SIZE_T data_size,
+ HRESULT (*chunk_handler)(const char *data, void *ctx), void *ctx)
+{
+ const char *ptr = data;
+ HRESULT hr = S_OK;
+ DWORD chunk_count;
+ DWORD total_size;
+ char tag_str[5];
+ unsigned int i;
+ DWORD tag;
+
+ read_tag(&ptr, &tag, tag_str);
+ TRACE("tag: %s\n", tag_str);
+
+ if (tag != TAG_DXBC)
+ {
+ WARN("Wrong tag.\n");
+ return E_FAIL;
+ }
+
+ /* checksum? */
+ skip_dword_unknown(&ptr, 4);
+
+ skip_dword_unknown(&ptr, 1);
+
+ read_dword(&ptr, &total_size);
+ TRACE("total size: %#x\n", total_size);
+
+ read_dword(&ptr, &chunk_count);
+ TRACE("chunk count: %#x\n", chunk_count);
+
+ for (i = 0; i < chunk_count; ++i)
+ {
+ DWORD chunk_offset;
+
+ read_dword(&ptr, &chunk_offset);
+ TRACE("chunk %u at offset %#x\n", i, chunk_offset);
+
+ hr = chunk_handler(data + chunk_offset, ctx);
+ if (FAILED(hr)) break;
+ }
+
+ return hr;
+}
+
+static HRESULT fx10_chunk_handler(const char *data, void *ctx)
+{
+ const char *ptr = data;
+ DWORD chunk_size;
+ char tag_str[5];
+ DWORD tag;
+
+ read_tag(&ptr, &tag, tag_str);
+ TRACE("tag: %s\n", tag_str);
+
+ read_dword(&ptr, &chunk_size);
+ TRACE("chunk size: %#x\n", chunk_size);
+
+ switch(tag)
+ {
+ default:
+ FIXME("Unhandled chunk %s\n", tag_str);
+ break;
+ }
+
+ return S_OK;
+}
+
+HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size)
+{
+ return parse_dxbc(data, data_size, fx10_chunk_handler, This);
+}
+
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface, REFIID riid, void **object)
More information about the wine-cvs
mailing list