The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 16:19:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

NativeVertexFormat: swap unsigned / signed formats to match GX order

Browse Source
This commit is contained in:
degasus 2014-01-24 14:18:55 +01:00
parent 72cc6431e5
commit 02d1d8e6a0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp
View File

@ -36,16 +36,16 @@ DXGI_FORMAT VarToD3D(VarType t, int size)
{ {
DXGI_FORMAT retval = DXGI_FORMAT_UNKNOWN; DXGI_FORMAT retval = DXGI_FORMAT_UNKNOWN;
static const DXGI_FORMAT lookup1[5] = { static const DXGI_FORMAT lookup1[5] = {
DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R16_SNORM, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R32_FLOAT DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16_SNORM, DXGI_FORMAT_R32_FLOAT
}; };
static const DXGI_FORMAT lookup2[5] = { static const DXGI_FORMAT lookup2[5] = {
DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R32G32_FLOAT DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R32G32_FLOAT
}; };
static const DXGI_FORMAT lookup3[5] = { static const DXGI_FORMAT lookup3[5] = {
DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R32G32B32_FLOAT DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_R32G32B32_FLOAT
}; };
static const DXGI_FORMAT lookup4[5] = { static const DXGI_FORMAT lookup4[5] = {
DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R16G16B16A16_SNORM, DXGI_FORMAT_R16G16B16A16_UNORM, DXGI_FORMAT_R32G32B32A32_FLOAT DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R16G16B16A16_UNORM, DXGI_FORMAT_R16G16B16A16_SNORM, DXGI_FORMAT_R32G32B32A32_FLOAT
}; };
switch (size) switch (size)

2
Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
View File

@ -37,7 +37,7 @@ GLVertexFormat::~GLVertexFormat()
inline GLuint VarToGL(VarType t) inline GLuint VarToGL(VarType t)
{ {
static const GLuint lookup[5] = { static const GLuint lookup[5] = {
GL_BYTE, GL_UNSIGNED_BYTE, GL_SHORT, GL_UNSIGNED_SHORT, GL_FLOAT GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_FLOAT
}; };
return lookup[t]; return lookup[t];
} }

10
Source/Core/VideoCommon/NativeVertexFormat.h
View File

@ -65,11 +65,11 @@ typedef void (LOADERDECL *TPipelineFunction)();
enum VarType enum VarType
{ {
VAR_BYTE, VAR_UNSIGNED_BYTE, // GX_U8 = 0
VAR_UNSIGNED_BYTE, VAR_BYTE, // GX_S8 = 1
VAR_SHORT, VAR_UNSIGNED_SHORT, // GX_U16 = 2
VAR_UNSIGNED_SHORT, VAR_SHORT, // GX_S16 = 3
VAR_FLOAT, VAR_FLOAT, // GX_F32 = 4
}; };
struct PortableVertexDeclaration struct PortableVertexDeclaration