From cc6699f09df78b7fb3d8c281ad3215a836133661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rico=20Sch=C3=BCller?= Date: Sun, 12 Dec 2010 21:48:25 +0100 Subject: [PATCH] d3dcompiler: Handle TAG_OSG5 in D3DGetBlobPart(). --- dlls/d3dcompiler_43/blob.c | 6 +++--- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index c22a9b142a8..d7c8067f07f 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -130,11 +130,11 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) break; case D3D_BLOB_OUTPUT_SIGNATURE_BLOB: - if (tag == TAG_OSGN) add = TRUE; + if (tag == TAG_OSGN || tag == TAG_OSG5) add = TRUE; break; case D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB: - if (tag == TAG_ISGN || tag == TAG_OSGN) add = TRUE; + if (tag == TAG_ISGN || tag == TAG_OSGN || tag == TAG_OSG5) add = TRUE; break; case D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB: @@ -142,7 +142,7 @@ static BOOL check_blob_part(DWORD tag, D3D_BLOB_PART part) break; case D3D_BLOB_ALL_SIGNATURE_BLOB: - if (tag == TAG_ISGN || tag == TAG_OSGN || tag == TAG_PCSG) add = TRUE; + if (tag == TAG_ISGN || tag == TAG_OSGN || tag == TAG_OSG5 || tag == TAG_PCSG) add = TRUE; break; case D3D_BLOB_DEBUG_INFO: diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index c27e3d8fb58..33c51d7c702 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -583,6 +583,7 @@ void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') +#define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G')