Added vertex pack/unpack support.

This commit is contained in:
bkaradzic
2012-12-31 18:48:52 -08:00
parent d4cd0ea4fa
commit 446686b48f
11 changed files with 351 additions and 192 deletions

View File

@@ -5,6 +5,7 @@
#include <string.h>
#include <bx/hash.h>
#include <bx/uint32_t.h>
#include "vertexdecl.h"
@@ -65,23 +66,25 @@ namespace bgfx
m_hash = bx::hashMurmur2A(m_attributes, sizeof(m_attributes) );
}
void VertexDecl::add(Attrib::Enum _attrib, uint8_t _num, AttribType::Enum _type, bool _normalized)
void VertexDecl::add(Attrib::Enum _attrib, uint8_t _num, AttribType::Enum _type, bool _normalized, bool _asInt)
{
const uint8_t encoded_norm = (_normalized&1)<<6;
const uint8_t encoded_type = (_type&3)<<3;
const uint8_t encoded_num = (_num-1)&3;
const uint8_t encodedNorm = (_normalized&1)<<6;
const uint8_t encodedType = (_type&3)<<3;
const uint8_t encodedNum = (_num-1)&3;
const uint8_t encodeAsInt = (_asInt&(!!"\x1\x1\x0\x0"[_type]) )<<7;
m_attributes[_attrib] = encoded_norm|encoded_type|encoded_num;
m_attributes[_attrib] = encodedNorm|encodedType|encodedNum|encodeAsInt;
m_offset[_attrib] = m_stride;
m_stride += (*s_attribTypeSize[m_hash])[_type][_num-1];
}
void VertexDecl::decode(Attrib::Enum _attrib, uint8_t& _num, AttribType::Enum& _type, bool& _normalized) const
void VertexDecl::decode(Attrib::Enum _attrib, uint8_t& _num, AttribType::Enum& _type, bool& _normalized, bool& _asInt) const
{
uint8_t val = m_attributes[_attrib];
_num = (val&3)+1;
_type = AttribType::Enum((val>>3)&3);
_normalized = !!(val&(1<<6) );
_asInt = !!(val&(1<<7) );
}
const char* getAttribName(Attrib::Enum _attr)
@@ -123,14 +126,16 @@ namespace bgfx
uint8_t num;
AttribType::Enum type;
bool normalized;
_decl.decode(Attrib::Enum(attr), num, type, normalized);
bool asInt;
_decl.decode(Attrib::Enum(attr), num, type, normalized, asInt);
BX_TRACE("\tattr %d - %s, num %d, type %d, norm %d, offset %d"
BX_TRACE("\tattr %d - %s, num %d, type %d, norm %d, asint %d, offset %d"
, attr
, getAttribName(Attrib::Enum(attr) )
, num
, type
, normalized
, asInt
, _decl.m_offset[attr]
);
}
@@ -140,4 +145,218 @@ namespace bgfx
#endif // BGFX_CONFIG_DEBUG
}
void vertexPack(const float _input[4], bool _inputNormalized, Attrib::Enum _attr, const VertexDecl& _decl, void* _data, uint32_t _index)
{
if (!_decl.has(_attr) )
{
return;
}
uint32_t stride = _decl.getStride();
uint8_t* data = (uint8_t*)_data + _index*stride + _decl.getOffset(_attr);
uint8_t num;
AttribType::Enum type;
bool normalized;
bool asInt;
_decl.decode(_attr, num, type, normalized, asInt);
switch (type)
{
case AttribType::Uint8:
{
uint8_t* packed = (uint8_t*)data;
if (_inputNormalized)
{
if (asInt)
{
switch (num)
{
default: *packed++ = uint8_t(*_input++ * 127.0f + 128.0f);
case 3: *packed++ = uint8_t(*_input++ * 127.0f + 128.0f);
case 2: *packed++ = uint8_t(*_input++ * 127.0f + 128.0f);
case 1: *packed++ = uint8_t(*_input++ * 127.0f + 128.0f);
}
}
else
{
switch (num)
{
default: *packed++ = uint8_t(*_input++ * 255.0f);
case 3: *packed++ = uint8_t(*_input++ * 255.0f);
case 2: *packed++ = uint8_t(*_input++ * 255.0f);
case 1: *packed++ = uint8_t(*_input++ * 255.0f);
}
}
}
else
{
switch (num)
{
default: *packed++ = uint8_t(*_input++);
case 3: *packed++ = uint8_t(*_input++);
case 2: *packed++ = uint8_t(*_input++);
case 1: *packed++ = uint8_t(*_input++);
}
}
}
break;
case AttribType::Uint16:
{
uint16_t* packed = (uint16_t*)data;
if (_inputNormalized)
{
if (asInt)
{
switch (num)
{
default: *packed++ = uint16_t(*_input++ * 32767.0f + 32768.0f);
case 3: *packed++ = uint16_t(*_input++ * 32767.0f + 32768.0f);
case 2: *packed++ = uint16_t(*_input++ * 32767.0f + 32768.0f);
case 1: *packed++ = uint16_t(*_input++ * 32767.0f + 32768.0f);
}
}
else
{
switch (num)
{
default: *packed++ = uint16_t(*_input++ * 65535.0f);
case 3: *packed++ = uint16_t(*_input++ * 65535.0f);
case 2: *packed++ = uint16_t(*_input++ * 65535.0f);
case 1: *packed++ = uint16_t(*_input++ * 65535.0f);
}
}
}
else
{
switch (num)
{
default: *packed++ = uint16_t(*_input++);
case 3: *packed++ = uint16_t(*_input++);
case 2: *packed++ = uint16_t(*_input++);
case 1: *packed++ = uint16_t(*_input++);
}
}
}
break;
case AttribType::Half:
{
uint16_t* packed = (uint16_t*)data;
switch (num)
{
default: *packed++ = bx::halfFromFloat(*_input++);
case 3: *packed++ = bx::halfFromFloat(*_input++);
case 2: *packed++ = bx::halfFromFloat(*_input++);
case 1: *packed++ = bx::halfFromFloat(*_input++);
}
}
break;
case AttribType::Float:
memcpy(data, _input, num*sizeof(float) );
break;
}
}
void vertexUnpack(float _output[4], Attrib::Enum _attr, const VertexDecl& _decl, const void* _data, uint32_t _index)
{
if (!_decl.has(_attr) )
{
memset(_output, 0, 4*sizeof(float) );
return;
}
uint32_t stride = _decl.getStride();
uint8_t* data = (uint8_t*)_data + _index*stride + _decl.getOffset(_attr);
uint8_t num;
AttribType::Enum type;
bool normalized;
bool asInt;
_decl.decode(_attr, num, type, normalized, asInt);
switch (type)
{
case AttribType::Uint8:
{
uint8_t* packed = (uint8_t*)data;
if (asInt)
{
switch (num)
{
default: *_output++ = (float(*packed++) - 128.0f)*1.0f/127.0f;
case 3: *_output++ = (float(*packed++) - 128.0f)*1.0f/127.0f;
case 2: *_output++ = (float(*packed++) - 128.0f)*1.0f/127.0f;
case 1: *_output++ = (float(*packed++) - 128.0f)*1.0f/127.0f;
}
}
else
{
switch (num)
{
default: *_output++ = float(*packed++)*1.0f/255.0f;
case 3: *_output++ = float(*packed++)*1.0f/255.0f;
case 2: *_output++ = float(*packed++)*1.0f/255.0f;
case 1: *_output++ = float(*packed++)*1.0f/255.0f;
}
}
}
break;
case AttribType::Uint16:
{
uint16_t* packed = (uint16_t*)data;
if (asInt)
{
switch (num)
{
default: *_output++ = (float(*packed++) - 32768.0f)*1.0f/32767.0f;
case 3: *_output++ = (float(*packed++) - 32768.0f)*1.0f/32767.0f;
case 2: *_output++ = (float(*packed++) - 32768.0f)*1.0f/32767.0f;
case 1: *_output++ = (float(*packed++) - 32768.0f)*1.0f/32767.0f;
}
}
else
{
switch (num)
{
default: *_output++ = float(*packed++)*1.0f/65535.0f;
case 3: *_output++ = float(*packed++)*1.0f/65535.0f;
case 2: *_output++ = float(*packed++)*1.0f/65535.0f;
case 1: *_output++ = float(*packed++)*1.0f/65535.0f;
}
}
}
break;
case AttribType::Half:
{
uint16_t* packed = (uint16_t*)data;
switch (num)
{
default: *_output++ = bx::halfToFloat(*packed++);
case 3: *_output++ = bx::halfToFloat(*packed++);
case 2: *_output++ = bx::halfToFloat(*packed++);
case 1: *_output++ = bx::halfToFloat(*packed++);
}
}
break;
case AttribType::Float:
memcpy(_output, data, num*sizeof(float) );
_output += num;
break;
}
switch (num)
{
case 1: *_output++ = 0.0f;
case 2: *_output++ = 0.0f;
case 3: *_output++ = 0.0f;
default: break;
}
}
} // namespace bgfx