A bunch of OpenGL debug annotations.

[ipdf/code.git] / src / objectrenderer.cpp

diff --git a/src/objectrenderer.cpp b/src/objectrenderer.cpp
index 8b3b7e4..998b62f 100644 (file)
--- a/src/objectrenderer.cpp
+++ b/src/objectrenderer.cpp
@@ -72,6 +72,7 @@ void ObjectRenderer::PrepareBuffers(unsigned max_objects)
        m_ibo.Invalidate();
        m_ibo.SetUsage(GraphicsBuffer::BufferUsageStaticDraw);
        m_ibo.SetType(GraphicsBuffer::BufferTypeIndex);
+       m_ibo.SetName("m_ibo: ObjectRenderer GPU indices");
        m_ibo.Resize(max_objects * 2 * sizeof(uint32_t));
        // BufferBuilder is used to construct the ibo
        m_buffer_builder = new BufferBuilder<uint32_t>(m_ibo.Map(false, true, true), m_ibo.GetSize()); // new matches delete in ObjectRenderer::FinaliseBuffers
@@ -241,9 +242,12 @@ void BezierRenderer::RenderUsingCPU(const Objects & objects, const View & view,
                
                Real x[2]; Real y[2];
                control.Evaluate(x[0], y[0], Real(0));
-               int64_t blen = max((int64_t)2, min((int64_t)100, pix_bounds.w));
+               //Debug("target is (%lu, %lu)", target.w, target.h);
+               int64_t blen = 100;
+               //blen = min(max((int64_t)2, (int64_t)(target.w/view.GetBounds().w)), (int64_t)100);
+               
                Real invblen(1); invblen /= blen;
-               Debug("Using %li lines, inverse %f", blen, Double(invblen));
+               //Debug("Using %li lines, inverse %f", blen, Double(invblen));
                for (int64_t j = 1; j <= blen; ++j)
                {
                        control.Evaluate(x[j % 2],y[j % 2], invblen*j);
@@ -274,6 +278,7 @@ void BezierRenderer::PrepareBezierGPUBuffer(const Objects& objects)
 {
        m_bezier_coeffs.SetType(GraphicsBuffer::BufferTypeTexture);
        m_bezier_coeffs.SetUsage(GraphicsBuffer::BufferUsageDynamicDraw);
+       m_bezier_coeffs.SetName("m_bezier_coeffs: Bezier coefficients");
        m_bezier_coeffs.Resize(objects.beziers.size()*sizeof(GPUBezierCoeffs));
        BufferBuilder<GPUBezierCoeffs> builder(m_bezier_coeffs.Map(false, true, true), m_bezier_coeffs.GetSize());
 
@@ -282,7 +287,8 @@ void BezierRenderer::PrepareBezierGPUBuffer(const Objects& objects)
                GPUBezierCoeffs coeffs = {
                        Float(bez->x0), Float(bez->y0),
                        Float(bez->x1), Float(bez->y1),
-                       Float(bez->x2), Float(bez->y2)
+                       Float(bez->x2), Float(bez->y2),
+                       Float(bez->x3), Float(bez->y3)
                        };
                builder.Add(coeffs);
        }
@@ -293,6 +299,7 @@ void BezierRenderer::PrepareBezierGPUBuffer(const Objects& objects)
 
        m_bezier_ids.SetType(GraphicsBuffer::BufferTypeTexture);
        m_bezier_ids.SetUsage(GraphicsBuffer::BufferUsageDynamicDraw);
+       m_bezier_ids.SetName("m_bezier_ids: object data_indices");
        m_bezier_ids.Upload(objects.data_indices.size() * sizeof(uint32_t), &objects.data_indices[0]);
        
        glGenTextures(1, &m_bezier_id_buffer_texture);
@@ -419,7 +426,7 @@ void ObjectRenderer::RenderLineOnCPU(int64_t x0, int64_t y0, int64_t x1, int64_t
                        if (neg_m) --y; else ++y;
                        p += two_dxdy;
                }
-       } while (++x < x_end);
+       } while (++x <= x_end);
 }
 
 }