Pauli Nieminen wrote:
dlls/d3d9/tests/shader.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 55b414a..caae395 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -85,10 +85,14 @@ static inline void test_create_vshader_version_check(IDirect3DDevice9 *device_pt
if( version <= caps->VertexShaderVersion ) {
ok(hret == D3D_OK && vshader_ptr != NULL, "Vertex shader (0x%x) creation failed but d3dcaps claim to support it. hret = 0x%x, vshader_ptr = %p", version, hret, vshader_ptr);
ok(hret == D3D_OK && vshader_ptr != NULL,
"Vertex shader (0x%x) creation failed but d3dcaps claim to support it. hret = 0x%x, vshader_ptr = %p\n",
} else {version, hret, vshader_ptr); IDirect3DVertexShader9_Release(vshader_ptr);
ok(hret == D3DERR_INVALIDCALL && vshader_ptr == NULL,"Vertex shader (0x%x) creation succesed but d3dcaps claim not to support it. hret = 0x%x, vshader_ptr = %p", version, hret, vshader_ptr);
ok(hret == D3DERR_INVALIDCALL && vshader_ptr == NULL,
"Vertex shader (0x%x) creation succesed but d3dcaps claim not to support it. hret = 0x%x, vshader_ptr = %p\n",
}version, hret, vshader_ptr);
} @@ -104,10 +108,14 @@ static inline void test_create_pshader_version_check(IDirect3DDevice9 *device_pt
if( version <= caps->PixelShaderVersion ) {
ok(hret == D3D_OK && pshader_ptr != NULL, "Pixel shader (0x%x) creation failed but d3dcaps claim to support it. hret = 0x%x, pshader_ptr = %p", version, hret, pshader_ptr);
ok(hret == D3D_OK && pshader_ptr != NULL,
"Pixel shader (0x%x) creation failed but d3dcaps claim to support it. hret = 0x%x, pshader_ptr = %p\n",
} else {version, hret, pshader_ptr); IDirect3DPixelShader9_Release(pshader_ptr);
ok(hret == D3DERR_INVALIDCALL && pshader_ptr == NULL,"Pixel shader (0x%x) creation succesed but d3dcaps claim not to support it. hret = 0x%x, pshader_ptr = %p", version, hret, pshader_ptr);
ok(hret == D3DERR_INVALIDCALL && pshader_ptr == NULL,
"Pixel shader (0x%x) creation succesed but d3dcaps claim not to support it. hret = 0x%x, pshader_ptr = %p\n",
}version, hret, pshader_ptr);
}
Hi,
These fixes are on top of your previous patch which is not committed). If it's a series of patches you should mark them appropriate ([1/2] and [2/2] for example). In this case it's probably better to incorporate this into the previous patch and resend that one.