mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed todos.

Browse Source
This commit is contained in:
Бранимир Караџић 2019-08-10 08:00:06 -07:00
parent f8866b5d73
commit 289afdc762
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bgfx.cpp
View File

@ -763,7 +763,9 @@ namespace bgfx
uint32_t ch = line->character; uint32_t ch = line->character;
uint8_t attr = line->attribute; uint8_t attr = line->attribute;
if (ch > 0xff) if (ch > 0xff)
ch = 0; // todo: render unicode code point , ch > 255) {
ch = 0;
}
if (0 != (ch|attr) if (0 != (ch|attr)
&& (' ' != ch || 0 != (attr&0xf0) ) ) && (' ' != ch || 0 != (attr&0xf0) ) )

12
src/glcontext_html5.cpp
View File

@ -85,19 +85,24 @@ namespace bgfx { namespace gl
if (m_primary) if (m_primary)
{ {
if (m_current == m_primary) if (m_current == m_primary)
{
m_current = NULL; m_current = NULL;
}
BX_DELETE(g_allocator, m_primary); BX_DELETE(g_allocator, m_primary);
m_primary = NULL; m_primary = NULL;
} }
} }
void GlContext::resize(uint32_t _width, uint32_t _height, uint32_t /* _flags */) void GlContext::resize(uint32_t _width, uint32_t _height, uint32_t /* _flags */)
{ {
if (m_primary == NULL) if (m_primary == NULL)
{
return; return;
}
emscripten_set_canvas_element_size(m_primary->m_canvas, (int) _width, (int) _height); emscripten_set_canvas_element_size(m_primary->m_canvas, (int) _width, (int) _height);
} }
SwapChainGL* GlContext::createSwapChain(void* _nwh) SwapChainGL* GlContext::createSwapChain(void* _nwh)
{ {
@ -108,8 +113,7 @@ namespace bgfx { namespace gl
s_attrs.stencil = true; s_attrs.stencil = true;
s_attrs.enableExtensionsByDefault = true; s_attrs.enableExtensionsByDefault = true;
// let emscripten figure out the best WebGL context to create // let emscripten figure out the best WebGL context to create
// TODO this isn't necessarily the right thing, I don't think the code actually does the fallback like it should
s_attrs.majorVersion = 0; s_attrs.majorVersion = 0;
s_attrs.majorVersion = 0; s_attrs.majorVersion = 0;

7
src/renderer_vk.cpp
View File

@ -379,7 +379,7 @@ VK_IMPORT_DEVICE
for (uint32_t inst = 0; inst < _numInstanceData; ++inst) for (uint32_t inst = 0; inst < _numInstanceData; ++inst)
{ {
inputAttrib->location = numAttribs; // TODO: is this usable for all case? what if the order of i_dataN is swizzled? inputAttrib->location = numAttribs;
inputAttrib->binding = numBindings; inputAttrib->binding = numBindings;
inputAttrib->format = VK_FORMAT_R32G32B32A32_SFLOAT; inputAttrib->format = VK_FORMAT_R32G32B32A32_SFLOAT;
inputAttrib->offset = inst * 16; inputAttrib->offset = inst * 16;
@ -3198,7 +3198,6 @@ VK_IMPORT_DEVICE
uint32_t borderColor = ((_samplerFlags & BGFX_SAMPLER_BORDER_COLOR_MASK) >> BGFX_SAMPLER_BORDER_COLOR_SHIFT); uint32_t borderColor = ((_samplerFlags & BGFX_SAMPLER_BORDER_COLOR_MASK) >> BGFX_SAMPLER_BORDER_COLOR_SHIFT);
if (borderColor > 0) if (borderColor > 0)
{ {
// TODO: set borderColor properly
sci.borderColor = VK_BORDER_COLOR_INT_OPAQUE_WHITE; sci.borderColor = VK_BORDER_COLOR_INT_OPAQUE_WHITE;
} }
@ -5987,7 +5986,7 @@ BX_UNUSED(currentSamplerStateIdx);
VkDeviceSize offset = 0; VkDeviceSize offset = 0;
vkCmdBindVertexBuffers(m_commandBuffer vkCmdBindVertexBuffers(m_commandBuffer
, 0 // TODO: multiple vertex stream , 0
, 1 , 1
, &vb.m_buffer , &vb.m_buffer
, &offset , &offset
@ -5998,7 +5997,7 @@ BX_UNUSED(currentSamplerStateIdx);
VkDeviceSize instanceOffset = draw.m_instanceDataOffset; VkDeviceSize instanceOffset = draw.m_instanceDataOffset;
VertexBufferVK& instanceBuffer = m_vertexBuffers[draw.m_instanceDataBuffer.idx]; VertexBufferVK& instanceBuffer = m_vertexBuffers[draw.m_instanceDataBuffer.idx];
vkCmdBindVertexBuffers(m_commandBuffer vkCmdBindVertexBuffers(m_commandBuffer
, 1 // TODO: multiple vertex stream , 1
, 1 , 1
, &instanceBuffer.m_buffer , &instanceBuffer.m_buffer
, &instanceOffset , &instanceOffset