townforge/tb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed batching bug, visible with the CJK font test.

Browse Source 
The batch wasn't always flushed when the oldest glyphs (bitmapfragments) was kicked out of the fragment map.
This commit is contained in:
Emil Segerås 2013-01-30 21:12:45 +01:00
parent eef2d81a70
commit ef7ad709f8
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Demo/renderers/tb_renderer_gl.cpp
View File

@ -23,7 +23,7 @@ static void Ortho2D(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top)
// == Batching ====================================================================================
#define VERTEX_BATCH_SIZE 3 * 4096
#define VERTEX_BATCH_SIZE 6 * 2048
#define VER_COL(r, g, b, a) (((a)<<24) + ((b)<<16) + ((g)<<8) + r)
#define VER_COL_OPACITY(a) (0x00ffffff + (((uint32)a) << 24))
@ -53,7 +53,7 @@ void BindBitmap(TBBitmap *bitmap)
class Batch
{
public:
Batch() : vertex_count(0), bitmap(nullptr), fragment(nullptr), is_flushing(false) {}
Batch() : vertex_count(0), bitmap(nullptr), fragment(nullptr), is_flushing(false), batch_id(0) {}
void Flush();
void AddVertex(int x, int y, float u, float v, uint32 color);
//private:
@ -63,6 +63,7 @@ public:
TBBitmap *bitmap;
TBBitmapFragment *fragment;
bool is_flushing;
uint32 batch_id;
};
void Batch::Flush()
@ -96,6 +97,8 @@ void Batch::Flush()
glDrawArrays(GL_TRIANGLES, 0, vertex_count);
vertex_count = 0;
batch_id++; // Will overflow eventually, but that doesn't really matter.
is_flushing = false;
}
@ -140,6 +143,10 @@ public:
batch.AddVertex(dst_rect.x, dst_rect.y, u, v, color);
batch.AddVertex(dst_rect.x + dst_rect.w, dst_rect.y + dst_rect.h, uu, vv, color);
batch.AddVertex(dst_rect.x + dst_rect.w, dst_rect.y, uu, v, color);
// Update fragments batch id (See FlushBitmapFragment)
if (fragment)
fragment->m_batch_id = batch.batch_id;
}
void Flush()
{
@ -153,8 +160,12 @@ public:
}
void FlushBitmapFragment(TBBitmapFragment *bitmap_fragment)
{
// Flush the batch if it's using this fragment (that is about to change or be deleted)
if (batch.vertex_count && bitmap_fragment == batch.fragment)
// Flush the batch if it is using this fragment (that is about to change or be deleted)
// We know if it is in use in the current batch if its batch_id matches the current
// batch_id in our (one and only) batch.
// If we switch to a more advance batching system with multiple batches, we need to
// solve this a bit differently.
if (batch.vertex_count && bitmap_fragment->m_batch_id == batch.batch_id)
batch.Flush();
}
private:

1
tinkerbell/src/tb_bitmap_fragment.cpp
View File

@ -254,6 +254,7 @@ TBBitmapFragment *TBBitmapFragmentMap::CreateNewFragment(int frag_w, int frag_h,
frag->m_row = best_row;
frag->m_space = space;
frag->m_rect.Set(space->x + border, best_row->y + border, frag_w, frag_h);
frag->m_batch_id = 0xffffffff;
CopyData(frag, data_stride, frag_data, border);
m_need_update = true;
m_allocated_pixels += frag->m_space->width * frag->m_row->height;

4
tinkerbell/src/tb_bitmap_fragment.h
View File

@ -153,6 +153,10 @@ public:
TBFragmentSpaceAllocator *m_row;
TBFragmentSpaceAllocator::Space *m_space;
TBID m_id;
/** This uint32 is reserved for batching renderer backends. It's not used
internally, but always initialized to 0xffffffff for all new fragments. */
uint32 m_batch_id;
};
/** TBBitmapFragmentManager manages loading bitmaps of arbitrary size,