October 2010 - Wine-commits

Rico Schüller : d3dcompiler/tests: Add D3DCOMPILER_STRIP_DEBUG_INFO test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: f4a9a0bb59fa27c3eb3b266b13267c84adfc233f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a9a0bb59fa27c3eb3b266b1… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:04:04 2010 +0200 d3dcompiler/tests: Add D3DCOMPILER_STRIP_DEBUG_INFO test. --- dlls/d3dcompiler_43/tests/blob.c | 54 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 2b6886e..284a133 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -36,10 +36,18 @@ #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_Aon9 MAKE_TAG('A', 'o', 'n', '9') #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_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') +#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +#define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') +#define TAG_STAT MAKE_TAG('S', 'T', 'A', 'T') +#define TAG_XNAP MAKE_TAG('X', 'N', 'A', 'P') +#define TAG_XNAS MAKE_TAG('X', 'N', 'A', 'S') static void test_create_blob(void) { @@ -347,6 +355,30 @@ static void test_get_blob_part(void) hr = D3DStripShader(test_blob_part, 0, 0, NULL); ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3DCOMPILER_STRIP_DEBUG_INFO */ + hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); + ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 736, "GetBufferSize failed, got %lu, expected %u\n", size, 736); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword+16), "XNAS got %#x, expected %#x.\n", *(dword+16), TAG_XNAS); + ok(TAG_XNAP == *(dword+35), "XNAP got %#x, expected %#x.\n", *(dword+35), TAG_XNAP); + ok(TAG_Aon9 == *(dword+54), "Aon9 got %#x, expected %#x.\n", *(dword+54), TAG_Aon9); + ok(TAG_SHDR == *(dword+79), "SHDR got %#x, expected %#x.\n", *(dword+79), TAG_SHDR); + ok(TAG_STAT == *(dword+96), "STAT got %#x, expected %#x.\n", *(dword+96), TAG_STAT); + ok(TAG_RDEF == *(dword+127), "RDEF got %#x, expected %#x.\n", *(dword+127), TAG_RDEF); + ok(TAG_ISGN == *(dword+149), "ISGN got %#x, expected %#x.\n", *(dword+149), TAG_ISGN); + ok(TAG_OSGN == *(dword+171), "OSGN got %#x, expected %#x.\n", *(dword+171), TAG_OSGN); + + hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } /* @@ -643,6 +675,28 @@ static void test_get_blob_part2(void) /* D3D_BLOB_XNA_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_SHADER, 0, &blob); ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3DCOMPILER_STRIP_DEBUG_INFO */ + hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_DEBUG_INFO, &blob); + ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 952, "GetBufferSize failed, got %lu, expected %u\n", size, 952); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_RDEF == *(dword+14), "RDEF got %#x, expected %#x.\n", *(dword+14), TAG_RDEF); + ok(TAG_ISGN == *(dword+44), "ISGN got %#x, expected %#x.\n", *(dword+44), TAG_ISGN); + ok(TAG_OSGN == *(dword+57), "OSGN got %#x, expected %#x.\n", *(dword+57), TAG_OSGN); + ok(TAG_PCSG == *(dword+70), "PCSG got %#x, expected %#x.\n", *(dword+70), TAG_PCSG); + ok(TAG_SHEX == *(dword+119), "SHEX got %#x, expected %#x.\n", *(dword+119), TAG_SHEX); + ok(TAG_STAT == *(dword+199), "STAT got %#x, expected %#x.\n", *(dword+199), TAG_STAT); + + hr = D3DGetBlobPart(dword, size, D3D_BLOB_DEBUG_INFO, 0, &blob2); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3DCOMPILER_STRIP_REFLECTION_DATA test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 83cff120b9d6c04c11323c7861555e4a9028a6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cff120b9d6c04c11323c786… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:04:08 2010 +0200 d3dcompiler/tests: Add D3DCOMPILER_STRIP_REFLECTION_DATA test. --- dlls/d3dcompiler_43/tests/blob.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 284a133..6a4217e 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -379,6 +379,25 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3DCOMPILER_STRIP_REFLECTION_DATA */ + hr = D3DStripShader(test_blob_part, test_blob_part[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); + ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 516, "GetBufferSize failed, got %lu, expected %u\n", size, 516); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_XNAS == *(dword+14), "XNAS got %#x, expected %#x.\n", *(dword+14), TAG_XNAS); + ok(TAG_XNAP == *(dword+33), "XNAP got %#x, expected %#x.\n", *(dword+33), TAG_XNAP); + ok(TAG_Aon9 == *(dword+52), "Aon9 got %#x, expected %#x.\n", *(dword+52), TAG_Aon9); + ok(TAG_SHDR == *(dword+77), "SHDR got %#x, expected %#x.\n", *(dword+77), TAG_SHDR); + ok(TAG_ISGN == *(dword+94), "ISGN got %#x, expected %#x.\n", *(dword+94), TAG_ISGN); + ok(TAG_OSGN == *(dword+116), "OSGN got %#x, expected %#x.\n", *(dword+116), TAG_OSGN); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } /* @@ -697,6 +716,24 @@ static void test_get_blob_part2(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3DCOMPILER_STRIP_REFLECTION_DATA */ + hr = D3DStripShader(test_blob_part2, test_blob_part2[6], D3DCOMPILER_STRIP_REFLECTION_DATA, &blob); + ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 4735, "GetBufferSize failed, got %lu, expected %u\n", size, 4735); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC == *dword, "DXBC got %#x, expected %#x.\n", *dword, TAG_DXBC); + ok(TAG_ISGN == *(dword+13), "ISGN got %#x, expected %#x.\n", *(dword+13), TAG_ISGN); + ok(TAG_OSGN == *(dword+26), "OSGN got %#x, expected %#x.\n", *(dword+26), TAG_OSGN); + ok(TAG_PCSG == *(dword+39), "PCSG got %#x, expected %#x.\n", *(dword+39), TAG_PCSG); + ok(TAG_SHEX == *(dword+88), "SHEX got %#x, expected %#x.\n", *(dword+88), TAG_SHEX); + ok(TAG_SDBG == *(dword+168), "SDBG got %#x, expected %#x.\n", *(dword+168), TAG_SDBG); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3d10: Forward D3D10GetInputSignatureBlob() to d3dcompiler.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 13893afb8e87f5afa1fd943c2b4840f1cf84e41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13893afb8e87f5afa1fd943c2… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:04:42 2010 +0200 d3d10: Forward D3D10GetInputSignatureBlob() to d3dcompiler. --- dlls/d3d10/d3d10.spec | 2 +- include/d3d10shader.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 1d62aea..24ab4be 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -10,7 +10,7 @@ @ stub D3D10DisassembleShader @ stdcall D3D10GetGeometryShaderProfile(ptr) @ stub D3D10GetInputAndOutputSignatureBlob -@ stub D3D10GetInputSignatureBlob +@ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob @ stub D3D10GetOutputSignatureBlob @ stdcall D3D10GetPixelShaderProfile(ptr) @ stub D3D10GetShaderDebugInfo diff --git a/include/d3d10shader.h b/include/d3d10shader.h index f06df30..b70b8ec 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -290,5 +290,6 @@ LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *device); LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device); HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector); +HRESULT WINAPI D3D10GetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); #endif /* __WINE_D3D10SHADER_H */

1 0

Rico Schüller : d3d10: Forward D3D10GetOutputSignatureBlob() to d3dcompiler.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 930f7ed3c6e66b294495cbd918c2a8e8cd5073b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930f7ed3c6e66b294495cbd91… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:04:46 2010 +0200 d3d10: Forward D3D10GetOutputSignatureBlob() to d3dcompiler. --- dlls/d3d10/d3d10.spec | 2 +- include/d3d10shader.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 24ab4be..bbdbd30 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -11,7 +11,7 @@ @ stdcall D3D10GetGeometryShaderProfile(ptr) @ stub D3D10GetInputAndOutputSignatureBlob @ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stub D3D10GetOutputSignatureBlob +@ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob @ stdcall D3D10GetPixelShaderProfile(ptr) @ stub D3D10GetShaderDebugInfo @ stub D3D10GetVersion diff --git a/include/d3d10shader.h b/include/d3d10shader.h index b70b8ec..9407821 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -291,5 +291,6 @@ LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device); HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector); HRESULT WINAPI D3D10GetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); +HRESULT WINAPI D3D10GetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); #endif /* __WINE_D3D10SHADER_H */

1 0

Rico Schüller : d3d10: Forward D3D10GetInputAndOutputSignatureBlob() to d3dcompiler.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 8607be1f81ee476d6760583830a9f40877022c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8607be1f81ee476d676058383… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:04:51 2010 +0200 d3d10: Forward D3D10GetInputAndOutputSignatureBlob() to d3dcompiler. --- dlls/d3d10/d3d10.spec | 2 +- include/d3d10shader.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index bbdbd30..121df17 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -9,7 +9,7 @@ @ stub D3D10DisassembleEffect @ stub D3D10DisassembleShader @ stdcall D3D10GetGeometryShaderProfile(ptr) -@ stub D3D10GetInputAndOutputSignatureBlob +@ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob @ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob @ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob @ stdcall D3D10GetPixelShaderProfile(ptr) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 9407821..cf61f9d 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -292,5 +292,6 @@ LPCSTR WINAPI D3D10GetPixelShaderProfile(ID3D10Device *device); HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10ShaderReflection **reflector); HRESULT WINAPI D3D10GetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); HRESULT WINAPI D3D10GetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); +HRESULT WINAPI D3D10GetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); #endif /* __WINE_D3D10SHADER_H */

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_DEBUG_INFO test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 3c12dd345d6fe6919312a7318ee03c9b4038126b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c12dd345d6fe6919312a7318… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:47 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_DEBUG_INFO test. --- dlls/d3dcompiler_43/tests/blob.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 1c89238..f0510e0 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -255,6 +255,10 @@ static void test_get_blob_part(void) /* D3D_BLOB_ALL_SIGNATURE_BLOB */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_ALL_SIGNATURE_BLOB, 0, &blob); ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3D_BLOB_DEBUG_INFO */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_DEBUG_INFO, 0, &blob); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); } /* @@ -519,6 +523,26 @@ static void test_get_blob_part2(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_DEBUG_INFO */ + hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_DEBUG_INFO, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 4055, "GetBufferSize failed, got %lu, expected %u\n", size, 4055); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(TAG_DXBC != *dword, "DXBC failed got %#x.\n", *dword); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + /* There isn't a full DXBC blob returned for D3D_BLOB_DEBUG_INFO */ + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_LEGACY_SHADER test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: c5d601c199df7183741795f1dd6f5882b7fda4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d601c199df7183741795f1d… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:51 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_LEGACY_SHADER test. --- dlls/d3dcompiler_43/tests/blob.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index f0510e0..216afd4 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -259,6 +259,26 @@ static void test_get_blob_part(void) /* D3D_BLOB_DEBUG_INFO */ hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_DEBUG_INFO, 0, &blob); ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3D_BLOB_LEGACY_SHADER */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 92, "GetBufferSize failed, got %lu, expected %u\n", size, 92); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + /* There isn't a full DXBC blob returned for D3D_BLOB_LEGACY_SHADER */ + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } /* @@ -543,6 +563,10 @@ static void test_get_blob_part2(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_LEGACY_SHADER */ + hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_XNA_PREPASS_SHADER test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: b09da75fb5b109f83e48359b7bed53bb926330a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09da75fb5b109f83e48359b7… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:55 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_XNA_PREPASS_SHADER test. --- dlls/d3dcompiler_43/tests/blob.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 216afd4..85c9fb7 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -279,6 +279,26 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_XNA_PREPASS_SHADER */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + /* There isn't a full DXBC blob returned for D3D_BLOB_XNA_PREPASS_SHADER */ + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } /* @@ -567,6 +587,10 @@ static void test_get_blob_part2(void) /* D3D_BLOB_LEGACY_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_LEGACY_SHADER, 0, &blob); ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3D_BLOB_XNA_PREPASS_SHADER */ + hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3D_BLOB_XNA_SHADER test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: beb2cad0fb762bdf370701115baca4eb4e14d781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb2cad0fb762bdf370701115… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:03:58 2010 +0200 d3dcompiler/tests: Add D3D_BLOB_XNA_SHADER test. --- dlls/d3dcompiler_43/tests/blob.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 85c9fb7..a0a8d84 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -299,6 +299,26 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* D3D_BLOB_XNA_SHADER */ + hr = D3DGetBlobPart(test_blob_part, test_blob_part[6], D3D_BLOB_XNA_SHADER, 0, &blob); + ok(hr == S_OK, "D3DGetBlobPart failed, got %x, expected %x\n", hr, S_OK); + + size = ID3D10Blob_GetBufferSize(blob); + ok(size == 68, "GetBufferSize failed, got %lu, expected %u\n", size, 68); + + dword = ((DWORD*)ID3D10Blob_GetBufferPointer(blob)); + ok(test_blob_part[0] != *dword, "DXBC failed got %#x.\n", *dword); + + for (i = 0; i < sizeof(parts) / sizeof(parts[0]); i++) + { + /* There isn't a full DXBC blob returned for D3D_BLOB_XNA_SHADER */ + hr = D3DGetBlobPart(dword, size, parts[i], 0, &blob2); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + } + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); } /* @@ -591,6 +611,10 @@ static void test_get_blob_part2(void) /* D3D_BLOB_XNA_PREPASS_SHADER */ hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_PREPASS_SHADER, 0, &blob); ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); + + /* D3D_BLOB_XNA_SHADER */ + hr = D3DGetBlobPart(test_blob_part2, test_blob_part2[6], D3D_BLOB_XNA_SHADER, 0, &blob); + ok(hr == E_FAIL, "D3DGetBlobPart failed, got %x, expected %x\n", hr, E_FAIL); } START_TEST(blob)

1 0

Rico Schüller : d3dcompiler/tests: Add D3DStripShader( ) test.
by Alexandre Julliard 15 Oct '10

15 Oct '10

Module: wine Branch: master Commit: 060028c8e37f7df9391c8b0fd09692f284cce286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060028c8e37f7df9391c8b0fd… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:04:01 2010 +0200 d3dcompiler/tests: Add D3DStripShader() test. --- dlls/d3dcompiler_43/tests/blob.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index a0a8d84..2b6886e 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -319,6 +319,34 @@ static void test_get_blob_part(void) refcount = ID3D10Blob_Release(blob); ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + /* check corner cases for D3DStripShader */ + hr = D3DStripShader(test_blob_part, test_blob_part[6], 0xffffffff, &blob); + ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, &blob); + ok(hr == S_OK, "D3DStripShader failed, got %x, expected %x\n", hr, S_OK); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "ID3DBlob has %u references left\n", refcount); + + hr = D3DStripShader(NULL, test_blob_part[6], 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DStripShader(test_blob_part, 2, 0, &blob); + ok(hr == D3DERR_INVALIDCALL, "D3DStripShader failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DStripShader(test_blob_part, test_blob_part[6], 0, NULL); + ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DStripShader(NULL, test_blob_part[6], 0, NULL); + ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); + + hr = D3DStripShader(test_blob_part, 0, 0, NULL); + ok(hr == E_FAIL, "D3DStripShader failed, got %x, expected %x\n", hr, E_FAIL); } /*

1 0