summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp b/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp
index 0ae7877e133..b442a811b67 100644
--- a/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp
+++ b/3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp
@@ -251,7 +251,7 @@ void TextBuffer::appendText(FontHandle _fontHandle, const char* _string, const c
if (_end == NULL)
{
- _end = _string + bx::strnlen(_string);
+ _end = _string + bx::strLen(_string);
}
BX_CHECK(_end >= _string);
@@ -613,11 +613,11 @@ TextBufferManager::~TextBufferManager()
BX_CHECK(m_textBufferHandles.getNumHandles() == 0, "All the text buffers must be destroyed before destroying the manager");
delete [] m_textBuffers;
- bgfx::destroyUniform(s_texColor);
+ bgfx::destroy(s_texColor);
- bgfx::destroyProgram(m_basicProgram);
- bgfx::destroyProgram(m_distanceProgram);
- bgfx::destroyProgram(m_distanceSubpixelProgram);
+ bgfx::destroy(m_basicProgram);
+ bgfx::destroy(m_distanceProgram);
+ bgfx::destroy(m_distanceSubpixelProgram);
}
TextBufferHandle TextBufferManager::createTextBuffer(uint32_t _type, BufferType::Enum _bufferType)
@@ -628,8 +628,8 @@ TextBufferHandle TextBufferManager::createTextBuffer(uint32_t _type, BufferType:
bc.textBuffer = new TextBuffer(m_fontManager);
bc.fontType = _type;
bc.bufferType = _bufferType;
- bc.indexBufferHandleIdx = bgfx::invalidHandle;
- bc.vertexBufferHandleIdx = bgfx::invalidHandle;
+ bc.indexBufferHandleIdx = bgfx::kInvalidHandle;
+ bc.vertexBufferHandleIdx = bgfx::kInvalidHandle;
TextBufferHandle ret = {textIdx};
return ret;
@@ -644,7 +644,7 @@ void TextBufferManager::destroyTextBuffer(TextBufferHandle _handle)
delete bc.textBuffer;
bc.textBuffer = NULL;
- if (bc.vertexBufferHandleIdx == bgfx::invalidHandle)
+ if (bc.vertexBufferHandleIdx == bgfx::kInvalidHandle)
{
return;
}
@@ -657,8 +657,8 @@ void TextBufferManager::destroyTextBuffer(TextBufferHandle _handle)
bgfx::VertexBufferHandle vbh;
ibh.idx = bc.indexBufferHandleIdx;
vbh.idx = bc.vertexBufferHandleIdx;
- bgfx::destroyIndexBuffer(ibh);
- bgfx::destroyVertexBuffer(vbh);
+ bgfx::destroy(ibh);
+ bgfx::destroy(vbh);
}
break;
@@ -668,8 +668,8 @@ void TextBufferManager::destroyTextBuffer(TextBufferHandle _handle)
bgfx::DynamicVertexBufferHandle vbh;
ibh.idx = bc.indexBufferHandleIdx;
vbh.idx = bc.vertexBufferHandleIdx;
- bgfx::destroyDynamicIndexBuffer(ibh);
- bgfx::destroyDynamicVertexBuffer(vbh);
+ bgfx::destroy(ibh);
+ bgfx::destroy(vbh);
break;
@@ -678,7 +678,7 @@ void TextBufferManager::destroyTextBuffer(TextBufferHandle _handle)
}
}
-void TextBufferManager::submitTextBuffer(TextBufferHandle _handle, uint8_t _id, int32_t _depth)
+void TextBufferManager::submitTextBuffer(TextBufferHandle _handle, bgfx::ViewId _id, int32_t _depth)
{
BX_CHECK(bgfx::isValid(_handle), "Invalid handle used");
@@ -730,7 +730,7 @@ void TextBufferManager::submitTextBuffer(TextBufferHandle _handle, uint8_t _id,
bgfx::IndexBufferHandle ibh;
bgfx::VertexBufferHandle vbh;
- if (bgfx::invalidHandle == bc.vertexBufferHandleIdx)
+ if (bgfx::kInvalidHandle == bc.vertexBufferHandleIdx)
{
ibh = bgfx::createIndexBuffer(
bgfx::copy(bc.textBuffer->getIndexBuffer(), indexSize)
@@ -750,7 +750,7 @@ void TextBufferManager::submitTextBuffer(TextBufferHandle _handle, uint8_t _id,
ibh.idx = bc.indexBufferHandleIdx;
}
- bgfx::setVertexBuffer(vbh, 0, bc.textBuffer->getVertexCount() );
+ bgfx::setVertexBuffer(0, vbh, 0, bc.textBuffer->getVertexCount() );
bgfx::setIndexBuffer(ibh, 0, bc.textBuffer->getIndexCount() );
}
break;
@@ -760,7 +760,7 @@ void TextBufferManager::submitTextBuffer(TextBufferHandle _handle, uint8_t _id,
bgfx::DynamicIndexBufferHandle ibh;
bgfx::DynamicVertexBufferHandle vbh;
- if (bgfx::invalidHandle == bc.vertexBufferHandleIdx )
+ if (bgfx::kInvalidHandle == bc.vertexBufferHandleIdx )
{
ibh = bgfx::createDynamicIndexBuffer(
bgfx::copy(bc.textBuffer->getIndexBuffer(), indexSize)
@@ -790,7 +790,7 @@ void TextBufferManager::submitTextBuffer(TextBufferHandle _handle, uint8_t _id,
);
}
- bgfx::setVertexBuffer(vbh, 0, bc.textBuffer->getVertexCount() );
+ bgfx::setVertexBuffer(0, vbh, 0, bc.textBuffer->getVertexCount() );
bgfx::setIndexBuffer(ibh, 0, bc.textBuffer->getIndexCount() );
}
break;
@@ -803,7 +803,7 @@ void TextBufferManager::submitTextBuffer(TextBufferHandle _handle, uint8_t _id,
bgfx::allocTransientVertexBuffer(&tvb, bc.textBuffer->getVertexCount(), m_vertexDecl);
bx::memCopy(tib.data, bc.textBuffer->getIndexBuffer(), indexSize);
bx::memCopy(tvb.data, bc.textBuffer->getVertexBuffer(), vertexSize);
- bgfx::setVertexBuffer(&tvb, 0, bc.textBuffer->getVertexCount() );
+ bgfx::setVertexBuffer(0, &tvb, 0, bc.textBuffer->getVertexCount() );
bgfx::setIndexBuffer(&tib, 0, bc.textBuffer->getIndexCount() );
}
break;