summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/src/vertexdecl.cpp
diff options
context:
space:
mode:
author Peter Ferrie <peter.ferrie@gmail.com>2015-03-19 20:03:44 -0700
committer Peter Ferrie <peter.ferrie@gmail.com>2015-03-19 20:03:44 -0700
commite214162b02aec342b5586d2e181deec6fdf3965b (patch)
tree0d8c886b39c62cf5127555895fb1e9557adfac46 /3rdparty/bgfx/src/vertexdecl.cpp
parent633ab90d90ed2ae50aeddff8471eb0d8e4b42104 (diff)
parent2fa8b8d6fe1267213bcb37b24a675421cbc73b3d (diff)
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to '3rdparty/bgfx/src/vertexdecl.cpp')
-rw-r--r--3rdparty/bgfx/src/vertexdecl.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/3rdparty/bgfx/src/vertexdecl.cpp b/3rdparty/bgfx/src/vertexdecl.cpp
index c0c4edeef1d..83435fa8cf2 100644
--- a/3rdparty/bgfx/src/vertexdecl.cpp
+++ b/3rdparty/bgfx/src/vertexdecl.cpp
@@ -41,27 +41,21 @@ namespace bgfx
static const uint8_t (*s_attribTypeSize[])[AttribType::Count][4] =
{
-#if BGFX_CONFIG_RENDERER_DIRECT3D9
- &s_attribTypeSizeDx9,
-#elif BGFX_CONFIG_RENDERER_DIRECT3D11 || BGFX_CONFIG_RENDERER_DIRECT3D12
- &s_attribTypeSizeDx1x,
-#elif BGFX_CONFIG_RENDERER_OPENGL || BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_VULKAN
- &s_attribTypeSizeGl,
-#else
- &s_attribTypeSizeDx9,
-#endif // BGFX_CONFIG_RENDERER_
+ &s_attribTypeSizeDx9, // Null
&s_attribTypeSizeDx9, // Direct3D9
&s_attribTypeSizeDx1x, // Direct3D11
&s_attribTypeSizeDx1x, // Direct3D12
&s_attribTypeSizeGl, // OpenGLES
&s_attribTypeSizeGl, // OpenGL
&s_attribTypeSizeGl, // Vulkan
+ &s_attribTypeSizeDx9, // Count
};
- BX_STATIC_ASSERT(BX_COUNTOF(s_attribTypeSize) == bgfx::RendererType::Count);
+ BX_STATIC_ASSERT(BX_COUNTOF(s_attribTypeSize) == RendererType::Count+1);
void initAttribTypeSizeTable(RendererType::Enum _type)
{
- s_attribTypeSize[0] = s_attribTypeSize[_type];
+ s_attribTypeSize[0] = s_attribTypeSize[_type];
+ s_attribTypeSize[RendererType::Count] = s_attribTypeSize[_type];
}
void dbgPrintfVargs(const char* _format, va_list _argList)