ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Fix the num blend values -> type match.

This commit is contained in:
Stefan Dösinger 2008-11-03 00:38:14 +01:00 committed by Alexandre Julliard
parent 123a3f44d9
commit a8497a5545
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/d3d9/vertexdeclaration.c
View File

@ -106,8 +106,16 @@ HRESULT vdecl_convert_fvf(
if (has_blend && (num_blends > 0)) { if (has_blend && (num_blends > 0)) {
if (((fvf & D3DFVF_XYZB5) == D3DFVF_XYZB2) && (fvf & D3DFVF_LASTBETA_D3DCOLOR)) if (((fvf & D3DFVF_XYZB5) == D3DFVF_XYZB2) && (fvf & D3DFVF_LASTBETA_D3DCOLOR))
elements[idx].Type = D3DDECLTYPE_D3DCOLOR; elements[idx].Type = D3DDECLTYPE_D3DCOLOR;
else else {
elements[idx].Type = D3DDECLTYPE_FLOAT1 + num_blends - 1; switch(num_blends) {
case 1: elements[idx].Type = D3DDECLTYPE_FLOAT1; break;
case 2: elements[idx].Type = D3DDECLTYPE_FLOAT2; break;
case 3: elements[idx].Type = D3DDECLTYPE_FLOAT3; break;
case 4: elements[idx].Type = D3DDECLTYPE_FLOAT4; break;
default:
ERR("Unexpected amount of blend values: %u\n", num_blends);
}
}
elements[idx].Usage = D3DDECLUSAGE_BLENDWEIGHT; elements[idx].Usage = D3DDECLUSAGE_BLENDWEIGHT;
elements[idx].UsageIndex = 0; elements[idx].UsageIndex = 0;
idx++; idx++;

12
dlls/wined3d/device.c
View File

@ -1792,8 +1792,16 @@ static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the
if (has_blend && (num_blends > 0)) { if (has_blend && (num_blends > 0)) {
if (((fvf & WINED3DFVF_XYZB5) == WINED3DFVF_XYZB2) && (fvf & WINED3DFVF_LASTBETA_D3DCOLOR)) if (((fvf & WINED3DFVF_XYZB5) == WINED3DFVF_XYZB2) && (fvf & WINED3DFVF_LASTBETA_D3DCOLOR))
elements[idx].Type = WINED3DDECLTYPE_D3DCOLOR; elements[idx].Type = WINED3DDECLTYPE_D3DCOLOR;
else else {
elements[idx].Type = WINED3DDECLTYPE_FLOAT1 + num_blends - 1; switch(num_blends) {
case 1: elements[idx].Type = WINED3DDECLTYPE_FLOAT1; break;
case 2: elements[idx].Type = WINED3DDECLTYPE_FLOAT2; break;
case 3: elements[idx].Type = WINED3DDECLTYPE_FLOAT3; break;
case 4: elements[idx].Type = WINED3DDECLTYPE_FLOAT4; break;
default:
ERR("Unexpected amount of blend values: %u\n", num_blends);
}
}
elements[idx].Usage = WINED3DDECLUSAGE_BLENDWEIGHT; elements[idx].Usage = WINED3DDECLUSAGE_BLENDWEIGHT;
elements[idx].UsageIndex = 0; elements[idx].UsageIndex = 0;
idx++; idx++;