niansa-misc/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-06 20:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

[d3d9] Minor cleanups in vertex declaration code (#2950)

Browse source
This commit is contained in:
Joshie 2022-09-22 10:46:51 +01:00 • committed by GitHub
parent 1e1ef8f1bd
commit 1451032b83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/d3d9/d3d9_vertex_declaration.cpp
View file

@ -20,10 +20,8 @@ namespace dxvk {
const D3DVERTEXELEMENT9* pVertexElements, const D3DVERTEXELEMENT9* pVertexElements,
uint32_t DeclCount) uint32_t DeclCount)
: D3D9VertexDeclBase( pDevice ) : D3D9VertexDeclBase( pDevice )
, m_elements ( DeclCount ) , m_elements ( pVertexElements, pVertexElements + DeclCount )
, m_fvf ( 0 ) { , m_fvf ( this->MapD3D9VertexElementsToFvf() ) {
std::copy(pVertexElements, pVertexElements + DeclCount, m_elements.begin());
m_fvf = this->MapD3D9VertexElementsToFvf();
this->Classify(); this->Classify();
} }
@ -248,15 +246,12 @@ namespace dxvk {
else if (element.Usage == D3DDECLUSAGE_PSIZE && element.Type == D3DDECLTYPE_FLOAT1 && element.UsageIndex == 0) else if (element.Usage == D3DDECLUSAGE_PSIZE && element.Type == D3DDECLTYPE_FLOAT1 && element.UsageIndex == 0)
return D3DFVF_PSIZE; return D3DFVF_PSIZE;
else if (element.Usage == D3DDECLUSAGE_COLOR && element.Type == D3DDECLTYPE_D3DCOLOR) { else if (element.Usage == D3DDECLUSAGE_COLOR && element.Type == D3DDECLTYPE_D3DCOLOR) {
switch (element.UsageIndex) switch (element.UsageIndex) {
{ case 0: return D3DFVF_DIFFUSE;
case 0: case 1: return D3DFVF_SPECULAR;
return D3DFVF_DIFFUSE; default:
case 1: Logger::warn("D3D9VertexDecl::MapD3DDeclToFvf: Unsupported set of D3DDECLUSAGE_COLOR / D3DDECLTYPE_D3DCOLOR / UsageIndex");
return D3DFVF_SPECULAR; return 0;
default:;
Logger::warn("D3D9VertexDecl::MapD3DDeclToFvf: Unsupported set of D3DDECLUSAGE_COLOR / D3DDECLTYPE_D3DCOLOR / UsageIndex");
return 0;
} }
} }
else if (element.Usage == D3DDECLUSAGE_TEXCOORD && element.UsageIndex < 8) { else if (element.Usage == D3DDECLUSAGE_TEXCOORD && element.UsageIndex < 8) {
@ -276,18 +271,12 @@ namespace dxvk {
DWORD D3D9VertexDecl::MapD3DDeclTypeFloatToFvfXYZBn(BYTE type) { DWORD D3D9VertexDecl::MapD3DDeclTypeFloatToFvfXYZBn(BYTE type) {
switch (type) switch (type) {
{ case D3DDECLTYPE_FLOAT1: return D3DFVF_XYZB1;
default:; case D3DDECLTYPE_FLOAT2: return D3DFVF_XYZB2;
return 0; case D3DDECLTYPE_FLOAT3: return D3DFVF_XYZB3;
case D3DDECLTYPE_FLOAT1: case D3DDECLTYPE_FLOAT4: return D3DFVF_XYZB4;
return D3DFVF_XYZB1; default: return 0;
case D3DDECLTYPE_FLOAT2:
return D3DFVF_XYZB2;
case D3DDECLTYPE_FLOAT3:
return D3DFVF_XYZB3;
case D3DDECLTYPE_FLOAT4:
return D3DFVF_XYZB4;
} }
} }