Changeset 27138

Timestamp:

Oct 9, 2022, 2:21:26 PM (22 months ago)

Author:

Vladislav Belov

Message:

Reduces the number of SetVertexAttributeFormat calls in Canvas2D.

Location:

ps/trunk/source/graphics

Files:

• Canvas2D.cpp (modified) (3 diffs)
• TextRenderer.cpp (modified) (4 diffs)

ps/trunk/source/graphics/Canvas2D.cpp

@@ -68 +68 @@
     deviceCommandContext->SetUniform(bindingSlots.grayscaleFactor, grayscaleFactor);
 
-    deviceCommandContext->SetVertexAttributeFormat(
-        Renderer::Backend::VertexAttributeStream::POSITION,
-        Renderer::Backend::Format::R32G32_SFLOAT, 0, sizeof(float) * 2,
-        Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0);
-    deviceCommandContext->SetVertexAttributeFormat(
-        Renderer::Backend::VertexAttributeStream::UV0,
-        Renderer::Backend::Format::R32G32_SFLOAT, 0, sizeof(float) * 2,
-        Renderer::Backend::VertexAttributeRate::PER_VERTEX, 1);
-
     deviceCommandContext->SetVertexBufferData(
         0, vertices.data(), vertices.size() * sizeof(vertices[0]));
@@ -127 +118 @@
         DeviceCommandContext->SetUniform(
             BindingSlots.translation, Translation.AsFloatArray());
+
+
+
+
+
+
+
+
+
     }
 
@@ -327 +327 @@
         m->BindingSlots.grayscaleFactor, 0.0f);
 
-    m->DeviceCommandContext->SetVertexAttributeFormat(
-        Renderer::Backend::VertexAttributeStream::POSITION,
-        Renderer::Backend::Format::R32G32_SFLOAT, 0, 0,
-        Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0);
-    m->DeviceCommandContext->SetVertexAttributeFormat(
-        Renderer::Backend::VertexAttributeStream::UV0,
-        Renderer::Backend::Format::R32G32_SFLOAT, 0, 0,
-        Renderer::Backend::VertexAttributeRate::PER_VERTEX, 1);
-
     m->DeviceCommandContext->SetVertexBufferData(0, vertices.data(), vertices.size() * sizeof(vertices[0]));
     m->DeviceCommandContext->SetVertexBufferData(1, uvs.data(), uvs.size() * sizeof(uvs[0]));

ps/trunk/source/graphics/TextRenderer.cpp

@@ -183 +183 @@
 }
 
-
-struct t2f_v2i
-{
-    t2f_v2i() : u(0), v(0), x(0), y(0) { }
-    float u, v;
-    i16 x, y;
-};
-
 struct SBatchCompare
 {
@@ -207 +199 @@
     const CVector2D& transformScale, const CVector2D& translation)
 {
-    std::vector<u16> indexes;
-    std::vector<t2f_v2i> vertexes;
+    std::vector<u16> indices;
+    std::vector<CVector2D> positions;
+    std::vector<CVector2D> uvs;
 
     // Try to merge non-consecutive batches that share the same font/color/translate:
@@ -264 +257 @@
         deviceCommandContext->SetUniform(colorMulBindingSlot, batch.color.AsFloatArray());
 
-        vertexes.resize(std::min(MAX_CHAR_COUNT_PER_BATCH, batch.chars) * 4);
-        indexes.resize(std::min(MAX_CHAR_COUNT_PER_BATCH, batch.chars) * 6);
+        positions.resize(std::min(MAX_CHAR_COUNT_PER_BATCH, batch.chars) * 4);
+        uvs.resize(std::min(MAX_CHAR_COUNT_PER_BATCH, batch.chars) * 4);
+        indices.resize(std::min(MAX_CHAR_COUNT_PER_BATCH, batch.chars) * 6);
 
         size_t idx = 0;
 
-        auto flush = [deviceCommandContext, &idx, &vertexes, &indexes]() -> void
+        auto flush = [deviceCommandContext, &idx, &es]() -> void
         {
             if (idx == 0)
                 return;
 
-            const uint32_t stride = sizeof(t2f_v2i);
-
-            deviceCommandContext->SetVertexAttributeFormat(
-                Renderer::Backend::VertexAttributeStream::POSITION,
-                Renderer::Backend::Format::R16G16_SINT, offsetof(t2f_v2i, x), stride,
-                Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0);
-            deviceCommandContext->SetVertexAttributeFormat(
-                Renderer::Backend::VertexAttributeStream::UV0,
-                Renderer::Backend::Format::R32G32_SFLOAT, offsetof(t2f_v2i, u), stride,
-                Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0);
-
             deviceCommandContext->SetVertexBufferData(
-                0, vertexes.data(), vertexes.size() * sizeof(vertexes[0]));
-            deviceCommandContext->SetIndexBufferData(indexes.data(), indexes.size() * sizeof(indexes[0]));
+                0, positions.data(), positions.size() * sizeof(positions[0]));
+            deviceCommandContext->SetVertexBufferData(
+                1, uvs.data(), uvs.size() * sizeof(uvs[0]));
+            deviceCommandContext->SetIndexBufferData(
+                indices.data(), indices.size() * sizeof(indices[0]));
 
             deviceCommandContext->DrawIndexed(0, idx * 6, 0);
@@ -307 +293 @@
                     continue;
 
-                vertexes[idx*4].u = g->u1;
-                vertexes[idx*4].v = g->v0;
-                vertexes[idx*4].x = g->x1 + x;
-                vertexes[idx*4].y = g->y0 + y;
-
-                vertexes[idx*4+1].u = g->u0;
-                vertexes[idx*4+1].v = g->v0;
-                vertexes[idx*4+1].x = g->x0 + x;
-                vertexes[idx*4+1].y = g->y0 + y;
-
-                vertexes[idx*4+2].u = g->u0;
-                vertexes[idx*4+2].v = g->v1;
-                vertexes[idx*4+2].x = g->x0 + x;
-                vertexes[idx*4+2].y = g->y1 + y;
-
-                vertexes[idx*4+3].u = g->u1;
-                vertexes[idx*4+3].v = g->v1;
-                vertexes[idx*4+3].x = g->x1 + x;
-                vertexes[idx*4+3].y = g->y1 + y;
-
-                indexes[idx*6+0] = static_cast<u16>(idx*4+0);
-                indexes[idx*6+1] = static_cast<u16>(idx*4+1);
-                indexes[idx*6+2] = static_cast<u16>(idx*4+2);
-                indexes[idx*6+3] = static_cast<u16>(idx*4+2);
-                indexes[idx*6+4] = static_cast<u16>(idx*4+3);
-                indexes[idx*6+5] = static_cast<u16>(idx*4+0);
+                 = g->u1;
+                 = g->v0;
+                 = g->x1 + x;
+                 = g->y0 + y;
+
+                 = g->u0;
+                 = g->v0;
+                 = g->x0 + x;
+                 = g->y0 + y;
+
+                 = g->u0;
+                 = g->v1;
+                 = g->x0 + x;
+                 = g->y1 + y;
+
+                 = g->u1;
+                 = g->v1;
+                 = g->x1 + x;
+                 = g->y1 + y;
+
+                indes[idx*6+0] = static_cast<u16>(idx*4+0);
+                indes[idx*6+1] = static_cast<u16>(idx*4+1);
+                indes[idx*6+2] = static_cast<u16>(idx*4+2);
+                indes[idx*6+3] = static_cast<u16>(idx*4+2);
+                indes[idx*6+4] = static_cast<u16>(idx*4+3);
+                indes[idx*6+5] = static_cast<u16>(idx*4+0);
 
                 x += g->xadvance;