d3d10/effect: Clarify constant buffer flags field meaning.

It makes more sense to have it matching fx_5_0 format, which uses the same flag for TBUFFER case, and also keeps 'single' modifier in there. This modifier is ignored on fx_4_x, so it's only needed to be implemented in the compiler. Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>

d3d10/effect: Clarify constant buffer flags field meaning.
68ab4c48 · Nikolay Sivov · Alexandre Julliard · 36fa4da3 · 68ab4c48
Commit 68ab4c48 authored Feb 01, 2024 by Nikolay Sivov Committed by Alexandre Julliard Feb 01, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 25 deletions

effect.c dlls/d3d10/effect.c +26 -25

No files found.
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -3796,10 +3796,13 @@ static HRESULT create_buffer_object(struct d3d10_effect_variable *v)
 static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char **ptr,
        BOOL local, struct d3d10_effect_variable *l)
 {
+    enum buffer_flags
+    {
+        IS_TBUFFER = 1,
+    };
    const char *prefix = local ? "Local" : "Shared";
+    uint32_t offset, flags;
    unsigned int i;
-    uint32_t offset;
-    D3D10_CBUFFER_TYPE d3d10_cbuffer_type;
    HRESULT hr;
    unsigned int stride = 0;
@@ -3826,32 +3829,30 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char 
    l->data_size = read_u32(ptr);
    TRACE("%s buffer data size: %#x.\n", prefix, l->data_size);
-    d3d10_cbuffer_type = read_u32(ptr);
+    flags = read_u32(ptr);
-    TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type);
+    TRACE("%s buffer flags: %#x.\n", prefix, flags);
-    switch(d3d10_cbuffer_type)
+    if (flags & IS_TBUFFER)
    {
-        case D3D10_CT_CBUFFER:
+        l->type->basetype = D3D10_SVT_TBUFFER;
-            l->type->basetype = D3D10_SVT_CBUFFER;
+        copy_name("tbuffer", &l->type->name);
-            if (!copy_name("cbuffer", &l->type->name))
+    }
-            {
+    else
-                ERR("Failed to copy name.\n");
+    {
-                return E_OUTOFMEMORY;
+        l->type->basetype = D3D10_SVT_CBUFFER;
-            }
+        copy_name("cbuffer", &l->type->name);
-            break;
+    }
+    if (!l->type->name)
-        case D3D10_CT_TBUFFER:
+    {
-            l->type->basetype = D3D10_SVT_TBUFFER;
+        ERR("Failed to copy name.\n");
-            if (!copy_name("tbuffer", &l->type->name))
+        return E_OUTOFMEMORY;
-            {
+    }
-                ERR("Failed to copy name.\n");
-                return E_OUTOFMEMORY;
-            }
-            break;
-        default:
+    flags &= ~IS_TBUFFER;
-            ERR("Unexpected D3D10_CBUFFER_TYPE %#x!\n", d3d10_cbuffer_type);
+    if (flags)
-            return E_FAIL;
+    {
+        ERR("Unexpected buffer flags %#x.\n", flags);
+        return E_FAIL;
    }
    l->type->member_count = read_u32(ptr);