scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-25 09:08:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup.

Browse source
This commit is contained in:
Branimir Karadžić 2015-01-26 19:09:51 -08:00
parent a87b59a0c7
commit b2a91c4a29
5 changed files with 43 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bgfx.cpp
View file

@ -1376,9 +1376,9 @@ again:
RendererType::Enum first = RendererType::Direct3D9; RendererType::Enum first = RendererType::Direct3D9;
RendererType::Enum second = RendererType::Direct3D11; RendererType::Enum second = RendererType::Direct3D11;
if (windowsVersionIs(Condition::GreaterEqual, 0x0603) ) if (windowsVersionIs(Condition::GreaterEqual, 0x0602) )
{ {
first = RendererType::Direct3D11 /* Direct3D12 */; first = RendererType::Enum(RendererType::Direct3D11+1) /* Direct3D12 */;
second = RendererType::Direct3D11; second = RendererType::Direct3D11;
if (!s_rendererCreator[second].supported) if (!s_rendererCreator[second].supported)
second = RendererType::Direct3D9; second = RendererType::Direct3D9;

15
src/renderer_d3d11.cpp
View file

@ -1092,14 +1092,17 @@ namespace bgfx
void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE
{ {
ID3D11DeviceContext* deviceCtx = m_deviceCtx; const uint32_t numVertices = _numIndices*4/6;
if (0 < numVertices)
{
ID3D11DeviceContext* deviceCtx = m_deviceCtx;
uint32_t numVertices = _numIndices*4/6; m_indexBuffers [_blitter.m_ib->handle.idx].update(0, _numIndices*2, _blitter.m_ib->data);
m_indexBuffers [_blitter.m_ib->handle.idx].update(0, _numIndices*2, _blitter.m_ib->data); m_vertexBuffers[_blitter.m_vb->handle.idx].update(0, numVertices*_blitter.m_decl.m_stride, _blitter.m_vb->data, true);
m_vertexBuffers[_blitter.m_vb->handle.idx].update(0, numVertices*_blitter.m_decl.m_stride, _blitter.m_vb->data, true);
deviceCtx->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST); deviceCtx->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
deviceCtx->DrawIndexed(_numIndices, 0, 0); deviceCtx->DrawIndexed(_numIndices, 0, 0);
}
} }
void preReset() void preReset()

23
src/renderer_d3d9.cpp
View file

@ -924,17 +924,20 @@ namespace bgfx
void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE
{ {
uint32_t numVertices = _numIndices*4/6; const uint32_t numVertices = _numIndices*4/6;
m_indexBuffers [_blitter.m_ib->handle.idx].update(0, _numIndices*2, _blitter.m_ib->data, true); if (0 < numVertices)
m_vertexBuffers[_blitter.m_vb->handle.idx].update(0, numVertices*_blitter.m_decl.m_stride, _blitter.m_vb->data, true); {
m_indexBuffers[_blitter.m_ib->handle.idx].update(0, _numIndices * 2, _blitter.m_ib->data, true);
m_vertexBuffers[_blitter.m_vb->handle.idx].update(0, numVertices*_blitter.m_decl.m_stride, _blitter.m_vb->data, true);
DX_CHECK(m_device->DrawIndexedPrimitive(D3DPT_TRIANGLELIST DX_CHECK(m_device->DrawIndexedPrimitive(D3DPT_TRIANGLELIST
, 0 , 0
, 0 , 0
, numVertices , numVertices
, 0 , 0
, _numIndices/3 , _numIndices / 3
) ); ) );
}
} }
void updateMsaa() void updateMsaa()

4
src/renderer_d3d9.h
View file

@ -145,7 +145,7 @@ namespace bgfx
memcpy(buffer, _data, _size); memcpy(buffer, _data, _size);
m_ptr->Unlock(); DX_CHECK(m_ptr->Unlock() );
} }
void destroy() void destroy()
@ -185,7 +185,7 @@ namespace bgfx
memcpy(buffer, _data, _size); memcpy(buffer, _data, _size);
m_ptr->Unlock(); DX_CHECK(m_ptr->Unlock() );
} }
void destroy() void destroy()

31
src/renderer_gl.cpp
View file

@ -1703,24 +1703,27 @@ namespace bgfx
void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) BX_OVERRIDE
{ {
uint32_t numVertices = _numIndices*4/6; const uint32_t numVertices = _numIndices*4/6;
m_indexBuffers[_blitter.m_ib->handle.idx].update(0, _numIndices*2, _blitter.m_ib->data); if (0 < numVertices)
m_vertexBuffers[_blitter.m_vb->handle.idx].update(0, numVertices*_blitter.m_decl.m_stride, _blitter.m_vb->data); {
m_indexBuffers[_blitter.m_ib->handle.idx].update(0, _numIndices*2, _blitter.m_ib->data);
m_vertexBuffers[_blitter.m_vb->handle.idx].update(0, numVertices*_blitter.m_decl.m_stride, _blitter.m_vb->data);
VertexBufferGL& vb = m_vertexBuffers[_blitter.m_vb->handle.idx]; VertexBufferGL& vb = m_vertexBuffers[_blitter.m_vb->handle.idx];
GL_CHECK(glBindBuffer(GL_ARRAY_BUFFER, vb.m_id) ); GL_CHECK(glBindBuffer(GL_ARRAY_BUFFER, vb.m_id) );
IndexBufferGL& ib = m_indexBuffers[_blitter.m_ib->handle.idx]; IndexBufferGL& ib = m_indexBuffers[_blitter.m_ib->handle.idx];
GL_CHECK(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib.m_id) ); GL_CHECK(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib.m_id) );
ProgramGL& program = m_program[_blitter.m_program.idx]; ProgramGL& program = m_program[_blitter.m_program.idx];
program.bindAttributes(_blitter.m_decl, 0); program.bindAttributes(_blitter.m_decl, 0);
GL_CHECK(glDrawElements(GL_TRIANGLES GL_CHECK(glDrawElements(GL_TRIANGLES
, _numIndices , _numIndices
, GL_UNSIGNED_SHORT , GL_UNSIGNED_SHORT
, (void*)0 , (void*)0
) ); ) );
}
} }
void updateResolution(const Resolution& _resolution) void updateResolution(const Resolution& _resolution)