Changeset 27136

Timestamp:

Oct 9, 2022, 12:44:51 PM (22 months ago)

Author:

Vladislav Belov

Message:

Reduces uniforms sizes for the Canvas2D shader.

Differential Revision: ​https://code.wildfiregames.com/D4796

Location:

ps/trunk

Files:

• binaries/data/mods/mod/shaders/arb/canvas2d.vp (modified) (1 diff)
• binaries/data/mods/mod/shaders/arb/canvas2d.xml (modified) (1 diff)
• binaries/data/mods/mod/shaders/glsl/canvas2d.vs (modified) (2 diffs)
• source/graphics/Canvas2D.cpp (modified) (5 diffs)
• source/graphics/TextRenderer.cpp (modified) (4 diffs)
• source/graphics/TextRenderer.h (modified) (1 diff)
• source/maths/Vector2D.h (modified) (3 diffs)

ps/trunk/binaries/data/mods/mod/shaders/arb/canvas2d.vp

@@ -1 +1 @@
 !!ARBvp1.0
 
-PARAM transform[4] = { program.local[0..3] };
+PARAM transform = program.local[0];
+PARAM translation = program.local[1];
 
 TEMP position;
 
-DP4 position.x, transform[0], vertex.position;
-DP4 position.y, transform[1], vertex.position;
+MUL position, transform, vertex.position.xyxy;
+ADD position.x, position.x, position.y;
+ADD position.y, position.z, position.w;
+ADD position, position, translation;
 MOV position.z, 0.0;
 MOV position.w, 1.0;

ps/trunk/binaries/data/mods/mod/shaders/arb/canvas2d.xml

@@ -5 +5 @@
         <stream name="pos"/>
         <stream name="uv0"/>
-        <uniform name="transform" loc="0" type="mat4"/>
+        <uniform name="transform" loc="0" type="vec4"/>
+        <uniform name="translation" loc="1" type="vec2"/>
     </vertex>
 

ps/trunk/binaries/data/mods/mod/shaders/glsl/canvas2d.vs

@@ -1 +1 @@
 #version 110
 
-uniform mat4 transform;
+uniform vec4 transform;
+uniform vec2 translation;
 
 attribute vec2 a_vertex;
@@ -11 +12 @@
 {
     v_uv = a_uv0;
-    gl_Position = transform * vec4(a_vertex, 0.0, 1.0);
+    gl_Position = , 0.0, 1.0);
 }

ps/trunk/source/graphics/Canvas2D.cpp

@@ -40 +40 @@
 {
     int32_t transform;
+
     int32_t colorAdd;
     int32_t colorMul;
@@ -112 +113 @@
 
         BindingSlots.transform = shader->GetBindingSlot(str_transform);
+
         BindingSlots.colorAdd = shader->GetBindingSlot(str_colorAdd);
         BindingSlots.colorMul = shader->GetBindingSlot(str_colorMul);
@@ -118 +120 @@
 
         const CMatrix3D transform = GetTransform();
+
+
         DeviceCommandContext->SetUniform(
-            BindingSlots.transform, transform.AsFloatArray());
+            BindingSlots.transform,
+            transform._11, transform._21, transform._12, transform._22);
+        DeviceCommandContext->SetUniform(
+            BindingSlots.translation, Translation.AsFloatArray());
     }
 
@@ -154 +161 @@
     uint32_t HeightInPixels = 1;
     float Scale = 1.0f;
+
+
 
     Renderer::Backend::IDeviceCommandContext* DeviceCommandContext = nullptr;
@@ -441 +450 @@
         m->BindingSlots.grayscaleFactor, 0.0f);
 
-    textRenderer.Render(m->DeviceCommandContext, m->Tech->GetShader(), m->GetTransform());
+    textRenderer.Render(
+        m->DeviceCommandContext, m->Tech->GetShader(), m->TransformScale, m->Translation);
 }
 

ps/trunk/source/graphics/TextRenderer.cpp

@@ -204 +204 @@
 void CTextRenderer::Render(
     Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
-    Renderer::Backend::IShaderProgram* shader, const CMatrix3D& transform)
+    Renderer::Backend::IShaderProgram* shader,
+    const CVector2D& transformScale, const CVector2D& translation)
 {
     std::vector<u16> indexes;
@@ -226 +227 @@
 
     const int32_t texBindingSlot = shader->GetBindingSlot(str_tex);
-    const int32_t transformBindingSlot = shader->GetBindingSlot(str_transform);
+    const int32_t trans);
     const int32_t colorAddBindingSlot = shader->GetBindingSlot(str_colorAdd);
     const int32_t colorMulBindingSlot = shader->GetBindingSlot(str_colorMul);
 
-    bool transformChanged = false;
+    bool transChanged = false;
 
     CTexture* lastTexture = nullptr;
@@ -248 +249 @@
         if (batch.translate.X != 0.0f || batch.translate.Y != 0.0f)
         {
-            CMatrix3D localTransform;
-            localTransform.SetTranslation(batch.translate.X, batch.translate.Y, 0.0f);
-            localTransform = transform * localTransform;
-            deviceCommandContext->SetUniform(transformBindingSlot, localTransform.AsFloatArray());
-            transformChanged = true;
+            const CVector2D localTranslation =
+                translation + CVector2D(batch.translate.X * transformScale.X, batch.translate.Y * transformScale.Y);
+            deviceCommandContext->SetUniform(translationBindingSlot, localTranslation.AsFloatArray());
+            translationChanged = true;
         }
 
@@ -347 +347 @@
     m_Batches.clear();
 
-    if (transformChanged)
-        deviceCommandContext->SetUniform(transformBindingSlot, transform.AsFloatArray());
-}
+    if (transChanged)
+        deviceCommandContext->SetUniform(trans.AsFloatArray());
+}

ps/trunk/source/graphics/TextRenderer.h

@@ -106 +106 @@
     void Render(
         Renderer::Backend::IDeviceCommandContext* deviceCommandContext,
-        Renderer::Backend::IShaderProgram* shader, const CMatrix3D& transform);
+        Renderer::Backend::IShaderProgram* shader,
+        const CVector2D& transformScale, const CVector2D& translation);
 
 private:

ps/trunk/source/maths/Vector2D.h

@@ -1 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -18 +18 @@
 #ifndef INCLUDED_VECTOR2D
 #define INCLUDED_VECTOR2D
+
+
 
 #include <math.h>
@@ -162 +164 @@
     void operator-=(const CSize2D& size);
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 public:
     float X, Y;