Henri Verbeet : d3d10: Parse effect variables.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f58405f647049bddde4c602fc6dd5703df91ccd9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f58405f647049bddde4c602fc6...

Author: Henri Verbeet 
Date:   Wed Jul 15 12:21:20 2009 +0200

d3d10: Parse effect variables.

---

dlls/d3d10/d3d10_private.h |    7 +++++
 dlls/d3d10/effect.c        |   57 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletions(-)

diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index b43666e..1dde1c8 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -58,11 +58,18 @@ struct d3d10_effect_shader_variable
     } shader;
 };

+struct d3d10_effect_variable
+{
+    char *name;
+    DWORD buffer_offset;
+};
+
 struct d3d10_effect_local_buffer
 {
     char *name;
     DWORD data_size;
     DWORD variable_count;
+    struct d3d10_effect_variable *variables;
 };

/* ID3D10EffectPass */
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index 0750069..6ee77b0 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -389,6 +389,34 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char
     return S_OK;
 }

+static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data)
+{
+    DWORD offset;
+
+    read_dword(ptr, &offset);
+    TRACE("Variable name at offset %#x.\n", offset);
+
+    v->name = copy_name(data + offset);
+    if (!v->name)
+    {
+        ERR("Failed to copy name.\n");
+        return E_OUTOFMEMORY;
+    }
+    TRACE("Variable name: %s.\n", v->name);
+
+    read_dword(ptr, &offset);
+    TRACE("Variable type info at offset %#x.\n", offset);
+
+    skip_dword_unknown(ptr, 1);
+
+    read_dword(ptr, &v->buffer_offset);
+    TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset);
+
+    skip_dword_unknown(ptr, 3);
+
+    return S_OK;
+}
+
 static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr, const char *data)
 {
     unsigned int i;
@@ -415,9 +443,20 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons

skip_dword_unknown(ptr, 2);

+    l->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->variable_count * sizeof(*l->variables));
+    if (!l->variables)
+    {
+        ERR("Failed to allocate variables memory.\n");
+        return E_OUTOFMEMORY;
+    }
+
     for (i = 0; i < l->variable_count; ++i)
     {
-        skip_dword_unknown(ptr, 7);
+        struct d3d10_effect_variable *v = &l->variables[i];
+        HRESULT hr;
+
+        hr = parse_fx10_variable(v, ptr, data);
+        if (FAILED(hr)) return hr;
     }

return S_OK;
@@ -634,11 +673,27 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t)
     }
 }

+static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v)
+{
+    TRACE("variable %p.\n", v);
+
+    HeapFree(GetProcessHeap(), 0, v->name);
+}
+
 static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer *l)
 {
     TRACE("local buffer %p.\n", l);

HeapFree(GetProcessHeap(), 0, l->name);
+    if (l->variables)
+    {
+        unsigned int i;
+        for (i = 0; i < l->variable_count; ++i)
+        {
+            d3d10_effect_variable_destroy(&l->variables[i]);
+        }
+        HeapFree(GetProcessHeap(), 0, l->variables);
+    }
 }

/* IUnknown methods */