From 163640b3e5efd9873ac343e476fded783a73d66e Mon Sep 17 00:00:00 2001
From: Sergii Liebodkin <s.lebedkin@gmail.com>
Date: Thu, 28 Nov 2024 08:18:58 +0000
Subject: [PATCH] wg_engine: apply texture formats on creation (refactoring)
 Apply texture color space on texture creation, instead of shader side

---
 src/renderer/wg_engine/tvgWgRenderData.cpp |  8 +++++++-
 src/renderer/wg_engine/tvgWgShaderSrc.cpp  | 19 ++-----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/renderer/wg_engine/tvgWgRenderData.cpp b/src/renderer/wg_engine/tvgWgRenderData.cpp
index d85d1eb1..65c1198b 100755
--- a/src/renderer/wg_engine/tvgWgRenderData.cpp
+++ b/src/renderer/wg_engine/tvgWgRenderData.cpp
@@ -209,8 +209,14 @@ void WgMeshDataGroup::release(WgContext& context)
 
 void WgImageData::update(WgContext& context, const RenderSurface* surface)
 {
+    // get appropriate texture format from color space
+    WGPUTextureFormat texFormat = WGPUTextureFormat_BGRA8Unorm;
+    if (surface->cs == ColorSpace::ABGR8888S)
+        texFormat = WGPUTextureFormat_RGBA8Unorm;
+    if (surface->cs == ColorSpace::Grayscale8)
+        texFormat = WGPUTextureFormat_R8Unorm;
     // allocate new texture handle
-    bool texHandleChanged = context.allocateTexture(texture, surface->w, surface->h, WGPUTextureFormat_RGBA8Unorm, surface->data);
+    bool texHandleChanged = context.allocateTexture(texture, surface->w, surface->h, texFormat, surface->data);
     // update texture view of texture handle was changed
     if (texHandleChanged) {
         context.releaseTextureView(textureView);
diff --git a/src/renderer/wg_engine/tvgWgShaderSrc.cpp b/src/renderer/wg_engine/tvgWgShaderSrc.cpp
index 282f5348..7e838797 100755
--- a/src/renderer/wg_engine/tvgWgShaderSrc.cpp
+++ b/src/renderer/wg_engine/tvgWgShaderSrc.cpp
@@ -97,10 +97,9 @@ fn vs_main(in: VertexInput) -> VertexOutput {
 
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4f {
-    let Sc = uSolidColor.rgb;
-    let Sa = uSolidColor.a;
+    let Sc = uSolidColor;
     let So = uBlendSettings.a;
-    return vec4f(Sc * Sa * So, Sa * So);
+    return vec4f(Sc.rgb * Sc.a * So, Sc.a * So);
 }
 )";
 
@@ -211,13 +210,6 @@ fn vs_main(in: VertexInput) -> VertexOutput {
 fn fs_main(in: VertexOutput) -> @location(0) vec4f {
     var Sc: vec4f = textureSample(uTextureView, uSampler, in.vTexCoord.xy);
     let So: f32 = uBlendSettings.a;
-    switch u32(uBlendSettings.r) {
-        case 0u: { Sc = Sc.rgba; }
-        case 1u: { Sc = Sc.bgra; }
-        case 2u: { Sc = Sc.rgba; }
-        case 3u: { Sc = Sc.bgra; }
-        default: {}
-    }
     return vec4f(Sc.rgb * Sc.a * So, Sc.a * So);
 };
 )";
@@ -429,13 +421,6 @@ fn getFragData(in: VertexOutput) -> FragData {
     data.So = uBlendSettings.a;
     data.Dc = colorDst.rgb;
     data.Da = colorDst.a;
-    switch u32(uBlendSettings.r) {
-        case 0u: { data.Sc = data.Sc.rgb; }
-        case 1u: { data.Sc = data.Sc.bgr; }
-        case 2u: { data.Sc = data.Sc.rgb; }
-        case 3u: { data.Sc = data.Sc.bgr; }
-        default: {}
-    }
     data.Sc = data.Sc * data.So;
     data.Sa = data.Sa * data.So;
     return data;