Module: wine Branch: master Commit: 525dee0778506167f6da342b9c9fbf38fca9be6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=525dee0778506167f6da342b9c...
Author: Rico Schüller kgbricola@web.de Date: Thu Mar 3 21:44:00 2011 +0100
d3dcompiler: Add debug helper for shader variable class.
---
dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/reflection.c | 2 +- dlls/d3dcompiler_43/utils.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 788f396..6b8e103 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -41,6 +41,7 @@
/* TRACE helper functions */ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; +const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) DECLSPEC_HIDDEN;
/* ID3DBlob */ struct d3dcompiler_blob diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 7db18d0..7a63503 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1212,7 +1212,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type read_dword(&ptr, &temp); desc->Class = temp & 0xffff; desc->Type = temp >> 16; - TRACE("Class %x, Type %x\n", desc->Class, desc->Type); + TRACE("Class %s, Type %x\n", debug_d3dcompiler_shader_variable_class(desc->Class), desc->Type);
read_dword(&ptr, &temp); desc->Rows = temp & 0xffff; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 362479a..d47258d 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -29,6 +29,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);
#define WINE_D3DCOMPILER_TO_STR(x) case x: return #x
+const char *debug_d3dcompiler_shader_variable_class(D3D_SHADER_VARIABLE_CLASS c) +{ + switch (c) + { + WINE_D3DCOMPILER_TO_STR(D3D_SVC_SCALAR); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_VECTOR); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_MATRIX_ROWS); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_MATRIX_COLUMNS); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_OBJECT); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_STRUCT); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_INTERFACE_CLASS); + WINE_D3DCOMPILER_TO_STR(D3D_SVC_INTERFACE_POINTER); + default: + FIXME("Unrecognized D3D_SHADER_VARIABLE_CLASS %#x.\n", c); + return "unrecognized"; + } +} + const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) { switch(part)