reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-16 10:59:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d3d9: Nvidia drivers don't like unused output formats.

Browse Source 
Newer nvidia drivers return garbage when using a COUNTx where x is bigger
than the amount of coordinates the texture can consume. So stick to COUNT3 for
volume textures. The tests don't need COUNT4 anyway.
This commit is contained in:
Stefan Dösinger 2010-07-03 11:54:42 +02:00 committed by Alexandre Julliard
parent 2223900cf6
commit 218b9cec6f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3d9/tests/visual.c
View File

@ -3937,10 +3937,10 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device)
hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, 6 * sizeof(float));
ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr);
/* default values? Set up the identity matrix, pass in 2 vertex coords, and enable 4 */
/* default values? Set up the identity matrix, pass in 2 vertex coords, and enable 3 */
hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, (D3DMATRIX *) identity);
ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed with %08x\n", hr);
IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4);
IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT3);
ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr);
hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1);
ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr);
@ -4013,10 +4013,14 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device)
ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %08x\n", hr);
/* Default values? 4 coords used, 3 passed. What happens to the 4th?
* Use COUNT3 because newer Nvidia drivers return black when there are more (output) coords
* than being used by the texture(volume tex -> 3). Again, as shown in earlier test the COUNTx
* affects the post-transformation output, so COUNT3 plus the matrix above is OK for testing the
* 4th *input* coordinate.
*/
hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, (D3DMATRIX *) mat);
ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed with %08x\n", hr);
IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4);
IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT3);
ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr);
hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, 6 * sizeof(float));
ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr);