haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor OpenGL GAL code changes

This commit is contained in:
Maciej Suminski 2016-08-08 14:17:40 +02:00
parent 7bc8cb56e0
commit 9f5f0ab31b
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/gal/opengl/gpu_manager.cpp
View File

@ -136,8 +136,9 @@ void GPU_CACHED_MANAGER::DrawAll()
{ {
wxASSERT( m_isDrawing ); wxASSERT( m_isDrawing );
m_indicesSize = m_container->GetSize();
for( unsigned int i = 0; i < m_indicesSize; *m_indicesPtr++ = i++ ); for( unsigned int i = 0; i < m_indicesSize; *m_indicesPtr++ = i++ );
m_indicesSize = m_container->GetSize();
} }

2
common/gal/opengl/opengl_gal.cpp
View File

@ -1615,7 +1615,7 @@ void CALLBACK VertexCallback( GLvoid* aVertexPtr, void* aData )
OPENGL_GAL::TessParams* param = static_cast<OPENGL_GAL::TessParams*>( aData ); OPENGL_GAL::TessParams* param = static_cast<OPENGL_GAL::TessParams*>( aData );
VERTEX_MANAGER* vboManager = param->vboManager; VERTEX_MANAGER* vboManager = param->vboManager;
if( vboManager ) assert( vboManager );
vboManager->Vertex( vertex[0], vertex[1], vertex[2] ); vboManager->Vertex( vertex[0], vertex[1], vertex[2] );
} }

5
common/gal/opengl/vertex_manager.cpp
View File

@ -239,13 +239,10 @@ void VERTEX_MANAGER::BeginDrawing() const
void VERTEX_MANAGER::DrawItem( const VERTEX_ITEM& aItem ) const void VERTEX_MANAGER::DrawItem( const VERTEX_ITEM& aItem ) const
{ {
int size = aItem.GetSize(); int size = aItem.GetSize();
if( size > 0 )
{
int offset = aItem.GetOffset(); int offset = aItem.GetOffset();
m_gpu->DrawIndices( offset, size ); m_gpu->DrawIndices( offset, size );
} }
}
void VERTEX_MANAGER::EndDrawing() const void VERTEX_MANAGER::EndDrawing() const