Changeset 2091Tweet

Timestamp:

Nov 19, 2012, 1:45:44 AM (9 years ago)

Author:

sam

Message:

neercs: use gl_VertexID instead of sending a whole new vertex array.

Location:

trunk/tools/neercs/video

Files:

• text-render.cpp (modified) (5 diffs)
• text-render.h (modified) (1 diff)
• text.lolfx (modified) (3 diffs)

trunk/tools/neercs/video/text-render.cpp

@@ -45 +45 @@
 
     m_shader = Shader::Create(lolfx_text);
-    m_coord = m_shader->GetAttribLocation("in_Position",
-                                          VertexUsage::Position, 0);
     m_color = m_shader->GetAttribLocation("in_Attr",
                                           VertexUsage::Color, 0);
@@ -53 +51 @@
     m_texture = m_shader->GetUniformLocation("u_Texture");
     m_transform = m_shader->GetUniformLocation("u_Transform");
-    m_pointsize = m_shader->GetUniformLocation("u_PointSize");
+    m_datasize = m_shader->GetUniformLocation("u_DataSize");
     m_vdecl
-      = new VertexDeclaration(VertexStream<vec2>(VertexUsage::Position),
-                              VertexStream<uint32_t>(VertexUsage::Color),
+      = new VertexDeclaration(VertexStream<uint32_t>(VertexUsage::Color),
                               VertexStream<uint32_t>(VertexUsage::Color));
 
@@ -64 +61 @@
 void TextRender::CreateBuffers()
 {
-    m_vbo1 = new VertexBuffer(m_cells * sizeof(vec2));
-    vec2 *vertices = (vec2 *)m_vbo1->Lock(0, 0);
-    for (int j = 0; j < m_canvas_size.y; j++)
-    for (int i = 0; i < m_canvas_size.x; i++)
-        vertices[j * m_canvas_size.x + i] = vec2(i, j);
-    m_vbo1->Unlock();
-
     m_vbo2 = new VertexBuffer(m_cells * sizeof(int32_t));
     m_vbo3 = new VertexBuffer(m_cells * sizeof(int32_t));
@@ -84 +74 @@
     if (current_size != m_canvas_size)
     {
-        delete m_vbo1;
         delete m_vbo2;
         delete m_vbo3;
@@ -141 +130 @@
     m_shader->SetUniform(m_texture, 0);
     m_shader->SetUniform(m_transform, xform);
-    m_shader->SetUniform(m_pointsize, (float)max(m_font_size.x, m_font_size.y));
-    m_vdecl->SetStream(m_vbo1, m_coord);
+    m_shader->SetUniform(m_datasize, vec2(m_canvas_size.x,
+                                          max(m_font_size.x, m_font_size.y)));
     m_vdecl->SetStream(m_vbo2, m_color);
     m_vdecl->SetStream(m_vbo3, m_char);

trunk/tools/neercs/video/text-render.h

@@ -23 +23 @@
 
     Shader *m_shader;
-    ShaderAttrib m_coord, m_color, m_char;
-    ShaderUniform m_texture, m_transform, m_pointsize;
+    ShaderAttrib m_color, m_char;
+    ShaderUniform m_texture, m_transform, m_datasize;
     VertexDeclaration *m_vdecl;
-    VertexBuffer *m_vbo1, *m_vbo2, *m_vbo3;
+    VertexBuffer *m_vbo2, *m_vbo3;
 
     FrameBuffer *m_fbo;

trunk/tools/neercs/video/text.lolfx

@@ -5 +5 @@
 #define HAVE_UINT 1
 
-attribute vec2 in_Position;
 #if HAVE_UINT
 attribute uint in_Char, in_Attr;
@@ -16 +15 @@
 varying vec2 pass_UV;
 
-uniform float u_PointSize;
+uniform vec2 u_DataSize;
 uniform mat4 u_Transform;
 
@@ -58 +57 @@
 
     // This only works with glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
-    gl_PointSize = u_PointSize;
+    gl_PointSize = u_DataSize[1];
 
-    gl_Position = u_Transform * vec4(in_Position, 0.0, 1.0);
+    vec2 coord = vec2(gl_VertexID % int(u_DataSize[0]),
+                      gl_VertexID / int(u_DataSize[0]));
+    gl_Position = u_Transform * vec4(coord, 0.0, 1.0);
 }