Skip to content

W
wine-winehq
Commit e8b9f167 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

wined3d: Fix the texcoord size mask.

There is room for 8 texture coordinates, not just 4.
parent 58ac095d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/d3d9/vertexdeclaration.c
View file @ e8b9f167
...@@ -71,7 +71,7 @@ HRESULT vdecl_convert_fvf( ...@@ -71,7 +71,7 @@ HRESULT vdecl_convert_fvf(
BOOL has_specular = (fvf & D3DFVF_SPECULAR) !=0; BOOL has_specular = (fvf & D3DFVF_SPECULAR) !=0;
DWORD num_textures = (fvf & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT; DWORD num_textures = (fvf & D3DFVF_TEXCOUNT_MASK) >> D3DFVF_TEXCOUNT_SHIFT;
DWORD texcoords = (fvf & 0x00FF0000) >> 16; DWORD texcoords = (fvf & 0xFFFF0000) >> 16;
D3DVERTEXELEMENT9 end_element = D3DDECL_END(); D3DVERTEXELEMENT9 end_element = D3DDECL_END();
D3DVERTEXELEMENT9 *elements = NULL; D3DVERTEXELEMENT9 *elements = NULL;
......
dlls/wined3d/device.c
View file @ e8b9f167
...@@ -1735,7 +1735,7 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the ...@@ -1735,7 +1735,7 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the
BOOL has_specular = (fvf & WINED3DFVF_SPECULAR) !=0; BOOL has_specular = (fvf & WINED3DFVF_SPECULAR) !=0;
DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT; DWORD num_textures = (fvf & WINED3DFVF_TEXCOUNT_MASK) >> WINED3DFVF_TEXCOUNT_SHIFT;
DWORD texcoords = (fvf & 0x00FF0000) >> 16; DWORD texcoords = (fvf & 0xFFFF0000) >> 16;
WINED3DVERTEXELEMENT end_element = WINED3DDECL_END(); WINED3DVERTEXELEMENT end_element = WINED3DDECL_END();
WINED3DVERTEXELEMENT *elements = NULL; WINED3DVERTEXELEMENT *elements = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment