diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 91e0b75f6..d3bad0c2c 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -472,6 +472,7 @@ namespace bgfx bool isGraphicsDebuggerPresent(); void release(const Memory* _mem); const char* getAttribName(Attrib::Enum _attr); + const char* getAttribNameShort(Attrib::Enum _attr); void getTextureSizeFromRatio(BackbufferRatio::Enum _ratio, uint16_t& _width, uint16_t& _height); TextureFormat::Enum getViableTextureFormat(const bimg::ImageContainer& _imageContainer); const char* getName(TextureFormat::Enum _fmt); diff --git a/src/vertexdecl.cpp b/src/vertexdecl.cpp index a530fcdb8..858896773 100644 --- a/src/vertexdecl.cpp +++ b/src/vertexdecl.cpp @@ -122,30 +122,35 @@ namespace bgfx static const char* s_attrName[] = { - "Attrib::Position", - "Attrib::Normal", - "Attrib::Tangent", - "Attrib::Bitangent", - "Attrib::Color0", - "Attrib::Color1", - "Attrib::Color2", - "Attrib::Color3", - "Attrib::Indices", - "Attrib::Weights", - "Attrib::TexCoord0", - "Attrib::TexCoord1", - "Attrib::TexCoord2", - "Attrib::TexCoord3", - "Attrib::TexCoord4", - "Attrib::TexCoord5", - "Attrib::TexCoord6", - "Attrib::TexCoord7", + "P", "Attrib::Position", + "N", "Attrib::Normal", + "T", "Attrib::Tangent", + "B", "Attrib::Bitangent", + "C0", "Attrib::Color0", + "C1", "Attrib::Color1", + "C2", "Attrib::Color2", + "C3", "Attrib::Color3", + "I", "Attrib::Indices", + "W", "Attrib::Weights", + "T0", "Attrib::TexCoord0", + "T1", "Attrib::TexCoord1", + "T2", "Attrib::TexCoord2", + "T3", "Attrib::TexCoord3", + "T4", "Attrib::TexCoord4", + "T5", "Attrib::TexCoord5", + "T6", "Attrib::TexCoord6", + "T7", "Attrib::TexCoord7", }; - BX_STATIC_ASSERT(BX_COUNTOF(s_attrName) == Attrib::Count); + BX_STATIC_ASSERT(BX_COUNTOF(s_attrName) == Attrib::Count*2); + + const char* getAttribNameShort(Attrib::Enum _attr) + { + return s_attrName[_attr*2+0]; + } const char* getAttribName(Attrib::Enum _attr) { - return s_attrName[_attr]; + return s_attrName[_attr*2+1]; } void dump(const VertexDecl& _decl) diff --git a/src/vertexdecl.h b/src/vertexdecl.h index ece77990c..885b1ae56 100644 --- a/src/vertexdecl.h +++ b/src/vertexdecl.h @@ -17,6 +17,9 @@ namespace bgfx /// Returns attribute name. const char* getAttribName(Attrib::Enum _attr); + /// + const char* getAttribNameShort(Attrib::Enum _attr); + /// Dump vertex declaration into debug output. void dump(const VertexDecl& _decl);