Fixing up Vulkan branch after merge to dali_1.3.26
authorDavid Steele <david.steele@samsung.com>
Thu, 31 May 2018 15:51:53 +0000 (16:51 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 31 May 2018 18:36:22 +0000 (18:36 +0000)
Re-wrote built-in shaders to match latest toolkit visual shaders
(Removed opacity and uAtlasRect uniforms)

Updated graphics-algorithms and scene-graph-renderer to handle new renderer opacity
Wrapped vulkan debug with test for environment variable.

Fix to texture order to ensure samplers are defined in binding order.

Change-Id: Ie75a0d41970ce31355f8038c7d2111decabf8455
Signed-off-by: David Steele <david.steele@samsung.com>
78 files changed:
build/tizen/Makefile.am
build/tizen/configure.ac
dali/graphics/file.list
dali/graphics/vulkan/api/internal/vulkan-ubo-manager.cpp
dali/graphics/vulkan/api/internal/vulkan-ubo-pool.cpp
dali/graphics/vulkan/api/vulkan-api-render-command.cpp
dali/graphics/vulkan/api/vulkan-api-shader.cpp
dali/graphics/vulkan/generated/basic-shader-frag.h
dali/graphics/vulkan/generated/basic-shader-vert.h
dali/graphics/vulkan/generated/border-visual-anti-aliasing-shader-frag.h
dali/graphics/vulkan/generated/border-visual-anti-aliasing-shader-vert.h
dali/graphics/vulkan/generated/border-visual-shader-frag.h
dali/graphics/vulkan/generated/border-visual-shader-vert.h
dali/graphics/vulkan/generated/builtin-shader-extern-gen.h
dali/graphics/vulkan/generated/builtin-shader-gen.cpp
dali/graphics/vulkan/generated/color-visual-shader-frag.h
dali/graphics/vulkan/generated/color-visual-shader-vert.h
dali/graphics/vulkan/generated/experimental-shader-vert.h
dali/graphics/vulkan/generated/image-visual-atlas-clamp-shader-frag.h
dali/graphics/vulkan/generated/image-visual-atlas-various-wrap-shader-frag.h
dali/graphics/vulkan/generated/image-visual-no-atlas-shader-frag.h
dali/graphics/vulkan/generated/image-visual-shader-frag.h
dali/graphics/vulkan/generated/image-visual-shader-vert.h
dali/graphics/vulkan/generated/mesh-visual-normal-map-shader-frag.h
dali/graphics/vulkan/generated/mesh-visual-normal-map-shader-vert.h
dali/graphics/vulkan/generated/mesh-visual-shader-frag.h
dali/graphics/vulkan/generated/mesh-visual-shader-vert.h
dali/graphics/vulkan/generated/mesh-visual-simple-shader-frag.h
dali/graphics/vulkan/generated/mesh-visual-simple-shader-vert.h
dali/graphics/vulkan/generated/npatch-visual-3x3-shader-vert.h
dali/graphics/vulkan/generated/npatch-visual-mask-shader-frag.h [new file with mode: 0644]
dali/graphics/vulkan/generated/npatch-visual-shader-frag.h
dali/graphics/vulkan/generated/npatch-visual-shader-vert.h
dali/graphics/vulkan/generated/text-visual-multi-color-text-shader-frag.h
dali/graphics/vulkan/generated/text-visual-multi-color-text-with-style-shader-frag.h
dali/graphics/vulkan/generated/text-visual-shader-vert.h
dali/graphics/vulkan/generated/text-visual-single-color-text-shader-frag.h
dali/graphics/vulkan/generated/text-visual-single-color-text-with-emoji-shader-frag.h
dali/graphics/vulkan/generated/text-visual-single-color-text-with-style-and-emoji-shader-frag.h
dali/graphics/vulkan/generated/text-visual-single-color-text-with-style-shader-frag.h
dali/graphics/vulkan/generated/wireframe-visual-shader-frag.h
dali/graphics/vulkan/generated/wireframe-visual-shader-vert.h
dali/graphics/vulkan/shaders/border-visual-anti-aliasing-shader.frag
dali/graphics/vulkan/shaders/border-visual-shader.frag
dali/graphics/vulkan/shaders/color-visual-shader.frag
dali/graphics/vulkan/shaders/image-visual-atlas-clamp-shader.frag
dali/graphics/vulkan/shaders/image-visual-atlas-various-wrap-shader.frag
dali/graphics/vulkan/shaders/image-visual-no-atlas-shader.frag
dali/graphics/vulkan/shaders/image-visual-shader.frag
dali/graphics/vulkan/shaders/mesh-visual-normal-map-shader.frag
dali/graphics/vulkan/shaders/mesh-visual-shader.frag
dali/graphics/vulkan/shaders/mesh-visual-simple-shader.frag
dali/graphics/vulkan/shaders/npatch-visual-3x3-shader.vert
dali/graphics/vulkan/shaders/npatch-visual-mask-shader.frag [new file with mode: 0644]
dali/graphics/vulkan/shaders/npatch-visual-shader.frag
dali/graphics/vulkan/shaders/npatch-visual-shader.vert
dali/graphics/vulkan/shaders/text-visual-multi-color-text-shader.frag
dali/graphics/vulkan/shaders/text-visual-multi-color-text-with-style-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-with-emoji-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag
dali/graphics/vulkan/shaders/text-visual-single-color-text-with-style-shader.frag
dali/graphics/vulkan/shaders/wireframe-visual-shader.frag
dali/graphics/vulkan/spirv/vulkan-spirv.cpp
dali/graphics/vulkan/vulkan-debug.cpp [new file with mode: 0644]
dali/graphics/vulkan/vulkan-debug.h [new file with mode: 0644]
dali/graphics/vulkan/vulkan-graphics.cpp
dali/graphics/vulkan/vulkan-standalone-test.cpp
dali/integration-api/core-enumerations.h
dali/integration-api/core.cpp
dali/integration-api/debug.h
dali/internal/common/core-impl.cpp
dali/internal/common/core-impl.h
dali/internal/event/rendering/renderer-impl.cpp
dali/internal/update/graphics/graphics-algorithms.cpp
dali/internal/update/rendering/scene-graph-renderer.cpp
dali/internal/update/rendering/scene-graph-renderer.h
dali/internal/update/rendering/scene-graph-texture-set.cpp

index afa2119..2ab9efb 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Samsung Electronics Co., Ltd.
+# Copyright (c) 2018 Samsung Electronics Co., Ltd.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
index c1a3dd6..a683716 100644 (file)
@@ -174,8 +174,8 @@ Configuration
   Data Dir (Read Only):             $dataReadOnlyDir
   Backtrace:                        $enable_backtrace
   ScopedLock Backtrace:             $enable_lock_backtrace
+  Vulkan Support:                   $enable_vulkan
   OpenGL ES version:                $enable_gles
   C++03 ABI:                        $enable_cxx03_abi
   Rename so file:                   $enable_rename_so
-  Vulkan Support:                   $enable_vulkan
 "
index a981487..b489b78 100644 (file)
@@ -15,6 +15,7 @@ graphics_src_files = \
     $(graphics_src_dir)/vulkan/vulkan-pipeline.cpp \
     $(graphics_src_dir)/vulkan/vulkan-pipeline-cache.cpp \
     $(graphics_src_dir)/vulkan/vulkan-buffer.cpp \
+    $(graphics_src_dir)/vulkan/vulkan-debug.cpp \
     $(graphics_src_dir)/vulkan/vulkan-graphics.cpp \
     $(graphics_src_dir)/vulkan/vulkan-shader.cpp \
     $(graphics_src_dir)/vulkan/vulkan-swapchain.cpp \
@@ -32,6 +33,3 @@ graphics_src_files = \
     $(graphics_src_dir)/vulkan/api/internal/vulkan-ubo-manager.cpp \
     $(graphics_src_dir)/vulkan/api/internal/vulkan-ubo-pool.cpp \
     $(graphics_src_dir)/vulkan/spirv/vulkan-spirv.cpp
-
-
-
index 657e314..b3027bc 100644 (file)
@@ -18,7 +18,6 @@
 #include <dali/graphics/vulkan/api/internal/vulkan-ubo-manager.h>
 #include <dali/graphics/vulkan/api/internal/vulkan-ubo-pool.h>
 
-#define debug( x ) std::cout << x << std::endl;
 
 namespace Dali
 {
index 66d4979..abf3f84 100644 (file)
 #include <dali/graphics/vulkan/api/internal/vulkan-ubo-pool.h>
 #include <dali/graphics/vulkan/vulkan-graphics.h>
 #include <dali/graphics/vulkan/vulkan-buffer.h>
+#include <dali/graphics/vulkan/vulkan-debug.h>
 #include <dali/graphics/vulkan/api/vulkan-api-controller.h>
 #include <dali/graphics/vulkan/gpu-memory/vulkan-gpu-memory-manager.h>
 #include <dali/graphics/vulkan/gpu-memory/vulkan-gpu-memory-allocator.h>
 
 #include <deque>
 
-
-#define debug( x ) std::cout << x << std::endl;
-
 namespace Dali
 {
 namespace Graphics
@@ -79,7 +77,7 @@ struct Ubo::Impl
   uint32_t WriteKeepMapped( const void* data, uint32_t offset, uint32_t size )
   {
     void* ptr = mPool.Map( mUbo );
-    debug( "[UBO] Writing " << size << " bytes into: " << ptr );
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General,  "[UBO] Writing " << size << " bytes into: " << ptr );
     memcpy( ptr, reinterpret_cast<const char*>(data)+offset, size );
     return size;
   }
@@ -139,7 +137,7 @@ struct UboPool::Impl
     mAllocationQueue.pop_back();
     uint32_t heapIndex = allocationIndex / mInitialCapacity;
 
-    debug("[POOL] Allocated block size " << mBlockSize << ", index: " << allocationIndex);
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[POOL] Allocated block size " << mBlockSize << ", index: " << allocationIndex);
 
     auto allocationIndexInPage = uint32_t(allocationIndex % mInitialCapacity);
 
@@ -166,7 +164,7 @@ struct UboPool::Impl
 
   void NewUboBuffer()
   {
-    debug("[POOL] Allocating new page of block size " << mBlockSize << ", capacity: " << mInitialCapacity);
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[POOL] Allocating new page of block size " << mBlockSize << ", capacity: " << mInitialCapacity);
     // add new Vulkan Buffer object
     auto& graphics = mController.GetGraphics();
     mBuffers.emplace_back( Vulkan::Buffer::New( graphics, vk::BufferCreateInfo{}
@@ -191,7 +189,7 @@ struct UboPool::Impl
     auto bufferIndex = uint32_t(impl.mAllocationInfo.allocationIndex / mInitialCapacity);
     auto allocationIndex = uint32_t(impl.mAllocationInfo.allocationIndex % mInitialCapacity);
 
-    debug("[POOL] Mapping UBO = alloc_index = " << impl.mAllocationInfo.allocationIndex);
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[POOL] Mapping UBO = alloc_index = " << impl.mAllocationInfo.allocationIndex);
 
     return MapBuffer<char>( bufferIndex ) + (allocationIndex*mBlockSize);
   }
@@ -201,7 +199,7 @@ struct UboPool::Impl
   {
     if( !mBuffers[bufferIndex].mappedPtr )
     {
-      debug("[POOL] Mapping PAGE = " << bufferIndex);
+      DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[POOL] Mapping PAGE = " << bufferIndex);
       mBuffers[bufferIndex].mappedPtr = mBuffers[bufferIndex].buffer->GetMemoryHandle()->Map();
     }
 
@@ -212,7 +210,7 @@ struct UboPool::Impl
   {
     if( mBuffers[bufferIndex].mappedPtr )
     {
-      debug("[POOL] Unmapping PAGE = " << bufferIndex);
+      DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[POOL] Unmapping PAGE = " << bufferIndex);
       mBuffers[bufferIndex].buffer->GetMemoryHandle()->Unmap();
       mBuffers[bufferIndex].mappedPtr = nullptr;
     }
@@ -221,7 +219,7 @@ struct UboPool::Impl
   void Unmap( Ubo& ubo )
   {
     auto& impl = ubo.GetImplementation();
-    debug("[POOL] Mapping UBO = alloc[" << impl.mAllocationInfo.allocationIndex);
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[POOL] Mapping UBO = alloc[" << impl.mAllocationInfo.allocationIndex);
     auto bufferIndex = uint32_t(impl.mAllocationInfo.allocationIndex / mInitialCapacity);
     UnmapBuffer( bufferIndex );
   }
@@ -353,4 +351,3 @@ Ubo::Impl& Ubo::GetImplementation()
 }
 }
 }
-
index ac31aab..8fef24b 100644 (file)
@@ -35,9 +35,8 @@
 #include <dali/graphics/vulkan/api/internal/vulkan-ubo-manager.h>
 #include <dali/graphics/vulkan/api/internal/vulkan-ubo-pool.h>
 #include <dali/graphics/vulkan/api/vulkan-api-controller.h>
+#include <dali/graphics/vulkan/vulkan-debug.h>
 
-#include <iostream>
-#define debug( x ) std::cout << x << std::endl;
 
 namespace Dali
 {
@@ -473,8 +472,8 @@ void RenderCommand::BindUniformBuffers()
 
     auto offset = ubo->GetBindingOffset();
     auto size = ubo->GetBindingSize();
-    std::cout << "offset: " << offset << ", size: " << size << std::endl;
-    debug("[RenderCommand] BindingUBO: binding = " << pc.binding);
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General, "offset: " << offset << ", size: " << size);
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[RenderCommand] BindingUBO: binding = " << pc.binding);
     mDescriptorSets[0]->WriteUniformBuffer( pc.binding, ubo->GetBuffer(), ubo->GetBindingOffset(), ubo->GetBindingSize() );
   }
 }
@@ -485,7 +484,7 @@ void RenderCommand::BindTexturesAndSamplers()
   for( auto&& texture : mTextureBindings )
   {
     auto& image = static_cast<VulkanAPI::Texture&>( texture.texture.Get() );
-    debug("[RenderCommand] BindingTextureSampler: binding = " << texture.binding);
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General, "[RenderCommand] BindingTextureSampler: binding = " << texture.binding);
     mDescriptorSets[0]->WriteCombinedImageSampler( texture.binding, image.GetTextureRef()->GetSampler(), image.GetTextureRef()->GetImageView() );
   }
 }
@@ -498,4 +497,4 @@ const std::vector<Vulkan::RefCountedDescriptorSet>& RenderCommand::GetDescriptor
 
 } // namespace VulkanAPI
 } // namespace Graphics
-} // namespace Dali
\ No newline at end of file
+} // namespace Dali
index 2a7b23a..ae1c821 100644 (file)
@@ -308,6 +308,12 @@ std::vector<API::ShaderDetails::UniformInfo> Shader::GetSamplers() const
       retval.emplace_back( info );
     }
   }
+  std::sort(retval.begin(), retval.end(),
+            []( const API::ShaderDetails::UniformInfo& a, const API::ShaderDetails::UniformInfo& b )
+            {
+              return a.binding < b.binding;
+            } );
+
   return retval;
 }
 
index 3e03036..44ad75a 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_BASIC_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000019,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000019,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0008000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000011,0x00000015,
        0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,
index af3567e..c07c255 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_BASIC_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x0000003b,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000003b,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000001f,0x00000030,
        0x00000036,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
index 6652b6d..e2ab0d8 100644 (file)
@@ -1,50 +1,47 @@
 std::vector<uint32_t> SHADER_BORDER_VISUAL_ANTI_ALIASING_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x0000003a,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000038,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000027,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000024,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
        0x00000000,0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000000b,
        0x67617246,0x61746144,0x00000000,0x00050006,0x0000000b,0x00000000,0x6c6f4375,0x0000726f,
        0x00060006,0x0000000b,0x00000001,0x64726f62,0x6f437265,0x00726f6c,0x00060006,0x0000000b,
-       0x00000002,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000b,0x00000003,0x6361706f,
-       0x00797469,0x00060006,0x0000000b,0x00000004,0x64726f62,0x69537265,0x0000657a,0x00030005,
-       0x0000000d,0x00000000,0x00040005,0x00000027,0x706c4176,0x00006168,0x00040047,0x00000009,
-       0x0000001e,0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,0x00000000,0x00050048,
-       0x0000000b,0x00000001,0x00000023,0x00000010,0x00050048,0x0000000b,0x00000002,0x00000023,
-       0x00000020,0x00050048,0x0000000b,0x00000003,0x00000023,0x0000002c,0x00050048,0x0000000b,
-       0x00000004,0x00000023,0x00000030,0x00030047,0x0000000b,0x00000002,0x00040047,0x0000000d,
-       0x00000022,0x00000001,0x00040047,0x0000000d,0x00000021,0x00000000,0x00040047,0x00000027,
-       0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,
-       0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
-       0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x00040017,0x0000000a,
-       0x00000006,0x00000003,0x0007001e,0x0000000b,0x00000007,0x00000007,0x0000000a,0x00000006,
-       0x00000006,0x00040020,0x0000000c,0x00000002,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
-       0x00000002,0x00040015,0x0000000e,0x00000020,0x00000001,0x0004002b,0x0000000e,0x0000000f,
-       0x00000002,0x00040020,0x00000010,0x00000002,0x0000000a,0x0004002b,0x0000000e,0x00000013,
-       0x00000003,0x00040020,0x00000014,0x00000002,0x00000006,0x0004002b,0x0000000e,0x0000001b,
-       0x00000001,0x00040020,0x0000001c,0x00000002,0x00000007,0x0004002b,0x0000000e,0x00000020,
-       0x00000000,0x0004002b,0x00000006,0x00000024,0x00000000,0x0004002b,0x00000006,0x00000025,
-       0x3fc00000,0x00040020,0x00000026,0x00000001,0x00000006,0x0004003b,0x00000026,0x00000027,
-       0x00000001,0x0004002b,0x0000000e,0x0000002a,0x00000004,0x00040015,0x00000033,0x00000020,
-       0x00000000,0x0004002b,0x00000033,0x00000034,0x00000003,0x00040020,0x00000035,0x00000003,
-       0x00000006,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
-       0x00050041,0x00000010,0x00000011,0x0000000d,0x0000000f,0x0004003d,0x0000000a,0x00000012,
-       0x00000011,0x00050041,0x00000014,0x00000015,0x0000000d,0x00000013,0x0004003d,0x00000006,
-       0x00000016,0x00000015,0x00050051,0x00000006,0x00000017,0x00000012,0x00000000,0x00050051,
-       0x00000006,0x00000018,0x00000012,0x00000001,0x00050051,0x00000006,0x00000019,0x00000012,
-       0x00000002,0x00070050,0x00000007,0x0000001a,0x00000017,0x00000018,0x00000019,0x00000016,
-       0x00050041,0x0000001c,0x0000001d,0x0000000d,0x0000001b,0x0004003d,0x00000007,0x0000001e,
-       0x0000001d,0x00050085,0x00000007,0x0000001f,0x0000001a,0x0000001e,0x00050041,0x0000001c,
-       0x00000021,0x0000000d,0x00000020,0x0004003d,0x00000007,0x00000022,0x00000021,0x00050085,
-       0x00000007,0x00000023,0x0000001f,0x00000022,0x0003003e,0x00000009,0x00000023,0x0004003d,
-       0x00000006,0x00000028,0x00000027,0x0008000c,0x00000006,0x00000029,0x00000001,0x00000031,
-       0x00000024,0x00000025,0x00000028,0x00050041,0x00000014,0x0000002b,0x0000000d,0x0000002a,
-       0x0004003d,0x00000006,0x0000002c,0x0000002b,0x00050081,0x00000006,0x0000002d,0x0000002c,
-       0x00000025,0x00050041,0x00000014,0x0000002e,0x0000000d,0x0000002a,0x0004003d,0x00000006,
-       0x0000002f,0x0000002e,0x0004003d,0x00000006,0x00000030,0x00000027,0x0008000c,0x00000006,
-       0x00000031,0x00000001,0x00000031,0x0000002d,0x0000002f,0x00000030,0x00050085,0x00000006,
-       0x00000032,0x00000029,0x00000031,0x00050041,0x00000035,0x00000036,0x00000009,0x00000034,
-       0x0004003d,0x00000006,0x00000037,0x00000036,0x00050085,0x00000006,0x00000038,0x00000037,
-       0x00000032,0x00050041,0x00000035,0x00000039,0x00000009,0x00000034,0x0003003e,0x00000039,
-       0x00000038,0x000100fd,0x00010038
+       0x00000002,0x4378696d,0x726f6c6f,0x00000000,0x00060006,0x0000000b,0x00000003,0x64726f62,
+       0x69537265,0x0000657a,0x00030005,0x0000000d,0x00000000,0x00040005,0x00000024,0x706c4176,
+       0x00006168,0x00040047,0x00000009,0x0000001e,0x00000000,0x00050048,0x0000000b,0x00000000,
+       0x00000023,0x00000000,0x00050048,0x0000000b,0x00000001,0x00000023,0x00000010,0x00050048,
+       0x0000000b,0x00000002,0x00000023,0x00000020,0x00050048,0x0000000b,0x00000003,0x00000023,
+       0x0000002c,0x00030047,0x0000000b,0x00000002,0x00040047,0x0000000d,0x00000022,0x00000001,
+       0x00040047,0x0000000d,0x00000021,0x00000000,0x00040047,0x00000024,0x0000001e,0x00000000,
+       0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
+       0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,0x00000007,
+       0x0004003b,0x00000008,0x00000009,0x00000003,0x00040017,0x0000000a,0x00000006,0x00000003,
+       0x0006001e,0x0000000b,0x00000007,0x00000007,0x0000000a,0x00000006,0x00040020,0x0000000c,
+       0x00000002,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000002,0x00040015,0x0000000e,
+       0x00000020,0x00000001,0x0004002b,0x0000000e,0x0000000f,0x00000002,0x00040020,0x00000010,
+       0x00000002,0x0000000a,0x0004002b,0x00000006,0x00000013,0x3f800000,0x0004002b,0x0000000e,
+       0x00000018,0x00000001,0x00040020,0x00000019,0x00000002,0x00000007,0x0004002b,0x0000000e,
+       0x0000001d,0x00000000,0x0004002b,0x00000006,0x00000021,0x00000000,0x0004002b,0x00000006,
+       0x00000022,0x3fc00000,0x00040020,0x00000023,0x00000001,0x00000006,0x0004003b,0x00000023,
+       0x00000024,0x00000001,0x0004002b,0x0000000e,0x00000027,0x00000003,0x00040020,0x00000028,
+       0x00000002,0x00000006,0x00040015,0x00000031,0x00000020,0x00000000,0x0004002b,0x00000031,
+       0x00000032,0x00000003,0x00040020,0x00000033,0x00000003,0x00000006,0x00050036,0x00000002,
+       0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x00000010,0x00000011,
+       0x0000000d,0x0000000f,0x0004003d,0x0000000a,0x00000012,0x00000011,0x00050051,0x00000006,
+       0x00000014,0x00000012,0x00000000,0x00050051,0x00000006,0x00000015,0x00000012,0x00000001,
+       0x00050051,0x00000006,0x00000016,0x00000012,0x00000002,0x00070050,0x00000007,0x00000017,
+       0x00000014,0x00000015,0x00000016,0x00000013,0x00050041,0x00000019,0x0000001a,0x0000000d,
+       0x00000018,0x0004003d,0x00000007,0x0000001b,0x0000001a,0x00050085,0x00000007,0x0000001c,
+       0x00000017,0x0000001b,0x00050041,0x00000019,0x0000001e,0x0000000d,0x0000001d,0x0004003d,
+       0x00000007,0x0000001f,0x0000001e,0x00050085,0x00000007,0x00000020,0x0000001c,0x0000001f,
+       0x0003003e,0x00000009,0x00000020,0x0004003d,0x00000006,0x00000025,0x00000024,0x0008000c,
+       0x00000006,0x00000026,0x00000001,0x00000031,0x00000021,0x00000022,0x00000025,0x00050041,
+       0x00000028,0x00000029,0x0000000d,0x00000027,0x0004003d,0x00000006,0x0000002a,0x00000029,
+       0x00050081,0x00000006,0x0000002b,0x0000002a,0x00000022,0x00050041,0x00000028,0x0000002c,
+       0x0000000d,0x00000027,0x0004003d,0x00000006,0x0000002d,0x0000002c,0x0004003d,0x00000006,
+       0x0000002e,0x00000024,0x0008000c,0x00000006,0x0000002f,0x00000001,0x00000031,0x0000002b,
+       0x0000002d,0x0000002e,0x00050085,0x00000006,0x00000030,0x00000026,0x0000002f,0x00050041,
+       0x00000033,0x00000034,0x00000009,0x00000032,0x0004003d,0x00000006,0x00000035,0x00000034,
+       0x00050085,0x00000006,0x00000036,0x00000035,0x00000030,0x00050041,0x00000033,0x00000037,
+       0x00000009,0x00000032,0x0003003e,0x00000037,0x00000036,0x000100fd,0x00010038
 };
index 3af0bd9..f3427d7 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_BORDER_VISUAL_ANTI_ALIASING_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x00000049,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000049,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x0000000b,0x0000001d,0x0000002c,
        0x0000003b,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
index ed6cbe2..0dc4039 100644 (file)
@@ -1,34 +1,31 @@
 std::vector<uint32_t> SHADER_BORDER_VISUAL_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000024,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000021,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
        0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
        0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000000b,0x67617246,
        0x61746144,0x00000000,0x00050006,0x0000000b,0x00000000,0x6c6f4375,0x0000726f,0x00060006,
        0x0000000b,0x00000001,0x64726f62,0x6f437265,0x00726f6c,0x00060006,0x0000000b,0x00000002,
-       0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000b,0x00000003,0x6361706f,0x00797469,
-       0x00030005,0x0000000d,0x00000000,0x00040047,0x00000009,0x0000001e,0x00000000,0x00050048,
-       0x0000000b,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000b,0x00000001,0x00000023,
-       0x00000010,0x00050048,0x0000000b,0x00000002,0x00000023,0x00000020,0x00050048,0x0000000b,
-       0x00000003,0x00000023,0x0000002c,0x00030047,0x0000000b,0x00000002,0x00040047,0x0000000d,
-       0x00000022,0x00000001,0x00040047,0x0000000d,0x00000021,0x00000000,0x00020013,0x00000002,
-       0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,
-       0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,
-       0x00000009,0x00000003,0x00040017,0x0000000a,0x00000006,0x00000003,0x0006001e,0x0000000b,
-       0x00000007,0x00000007,0x0000000a,0x00000006,0x00040020,0x0000000c,0x00000002,0x0000000b,
-       0x0004003b,0x0000000c,0x0000000d,0x00000002,0x00040015,0x0000000e,0x00000020,0x00000001,
-       0x0004002b,0x0000000e,0x0000000f,0x00000002,0x00040020,0x00000010,0x00000002,0x0000000a,
-       0x0004002b,0x0000000e,0x00000013,0x00000003,0x00040020,0x00000014,0x00000002,0x00000006,
-       0x0004002b,0x0000000e,0x0000001b,0x00000001,0x00040020,0x0000001c,0x00000002,0x00000007,
-       0x0004002b,0x0000000e,0x00000020,0x00000000,0x00050036,0x00000002,0x00000004,0x00000000,
-       0x00000003,0x000200f8,0x00000005,0x00050041,0x00000010,0x00000011,0x0000000d,0x0000000f,
-       0x0004003d,0x0000000a,0x00000012,0x00000011,0x00050041,0x00000014,0x00000015,0x0000000d,
-       0x00000013,0x0004003d,0x00000006,0x00000016,0x00000015,0x00050051,0x00000006,0x00000017,
-       0x00000012,0x00000000,0x00050051,0x00000006,0x00000018,0x00000012,0x00000001,0x00050051,
-       0x00000006,0x00000019,0x00000012,0x00000002,0x00070050,0x00000007,0x0000001a,0x00000017,
-       0x00000018,0x00000019,0x00000016,0x00050041,0x0000001c,0x0000001d,0x0000000d,0x0000001b,
-       0x0004003d,0x00000007,0x0000001e,0x0000001d,0x00050085,0x00000007,0x0000001f,0x0000001a,
-       0x0000001e,0x00050041,0x0000001c,0x00000021,0x0000000d,0x00000020,0x0004003d,0x00000007,
-       0x00000022,0x00000021,0x00050085,0x00000007,0x00000023,0x0000001f,0x00000022,0x0003003e,
-       0x00000009,0x00000023,0x000100fd,0x00010038
+       0x4378696d,0x726f6c6f,0x00000000,0x00030005,0x0000000d,0x00000000,0x00040047,0x00000009,
+       0x0000001e,0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,0x00000000,0x00050048,
+       0x0000000b,0x00000001,0x00000023,0x00000010,0x00050048,0x0000000b,0x00000002,0x00000023,
+       0x00000020,0x00030047,0x0000000b,0x00000002,0x00040047,0x0000000d,0x00000022,0x00000001,
+       0x00040047,0x0000000d,0x00000021,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,
+       0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,
+       0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,
+       0x00040017,0x0000000a,0x00000006,0x00000003,0x0005001e,0x0000000b,0x00000007,0x00000007,
+       0x0000000a,0x00040020,0x0000000c,0x00000002,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
+       0x00000002,0x00040015,0x0000000e,0x00000020,0x00000001,0x0004002b,0x0000000e,0x0000000f,
+       0x00000002,0x00040020,0x00000010,0x00000002,0x0000000a,0x0004002b,0x00000006,0x00000013,
+       0x3f800000,0x0004002b,0x0000000e,0x00000018,0x00000001,0x00040020,0x00000019,0x00000002,
+       0x00000007,0x0004002b,0x0000000e,0x0000001d,0x00000000,0x00050036,0x00000002,0x00000004,
+       0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x00000010,0x00000011,0x0000000d,
+       0x0000000f,0x0004003d,0x0000000a,0x00000012,0x00000011,0x00050051,0x00000006,0x00000014,
+       0x00000012,0x00000000,0x00050051,0x00000006,0x00000015,0x00000012,0x00000001,0x00050051,
+       0x00000006,0x00000016,0x00000012,0x00000002,0x00070050,0x00000007,0x00000017,0x00000014,
+       0x00000015,0x00000016,0x00000013,0x00050041,0x00000019,0x0000001a,0x0000000d,0x00000018,
+       0x0004003d,0x00000007,0x0000001b,0x0000001a,0x00050085,0x00000007,0x0000001c,0x00000017,
+       0x0000001b,0x00050041,0x00000019,0x0000001e,0x0000000d,0x0000001d,0x0004003d,0x00000007,
+       0x0000001f,0x0000001e,0x00050085,0x00000007,0x00000020,0x0000001c,0x0000001f,0x0003003e,
+       0x00000009,0x00000020,0x000100fd,0x00010038
 };
index 4dea567..1438cc1 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_BORDER_VISUAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x00000066,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000066,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000035,0x0000004b,0x00000058,
        0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,
index 7b4975a..2eaaeec 100644 (file)
@@ -25,6 +25,7 @@ extern std::vector<uint32_t> SHADER_MESH_VISUAL_SHADER_VERT;
 extern std::vector<uint32_t> SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG;
 extern std::vector<uint32_t> SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT;
 extern std::vector<uint32_t> SHADER_NPATCH_VISUAL_3X3_SHADER_VERT;
+extern std::vector<uint32_t> SHADER_NPATCH_VISUAL_MASK_SHADER_FRAG;
 extern std::vector<uint32_t> SHADER_NPATCH_VISUAL_SHADER_FRAG;
 extern std::vector<uint32_t> SHADER_NPATCH_VISUAL_SHADER_VERT;
 extern std::vector<uint32_t> SHADER_TEXT_VISUAL_MULTI_COLOR_TEXT_SHADER_FRAG;
index 2518c4b..4a567a9 100644 (file)
@@ -24,6 +24,7 @@
 #include "mesh-visual-simple-shader-frag.h"
 #include "mesh-visual-simple-shader-vert.h"
 #include "npatch-visual-3x3-shader-vert.h"
+#include "npatch-visual-mask-shader-frag.h"
 #include "npatch-visual-shader-frag.h"
 #include "npatch-visual-shader-vert.h"
 #include "text-visual-multi-color-text-shader-frag.h"
@@ -57,6 +58,7 @@ static std::map<std::string, std::vector<uint32_t>> gGraphicsBuiltinShader = {
   { "SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG", SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG },
   { "SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT", SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT },
   { "SHADER_NPATCH_VISUAL_3X3_SHADER_VERT", SHADER_NPATCH_VISUAL_3X3_SHADER_VERT },
+  { "SHADER_NPATCH_VISUAL_MASK_SHADER_FRAG", SHADER_NPATCH_VISUAL_MASK_SHADER_FRAG },
   { "SHADER_NPATCH_VISUAL_SHADER_FRAG", SHADER_NPATCH_VISUAL_SHADER_FRAG },
   { "SHADER_NPATCH_VISUAL_SHADER_VERT", SHADER_NPATCH_VISUAL_SHADER_VERT },
   { "SHADER_TEXT_VISUAL_MULTI_COLOR_TEXT_SHADER_FRAG", SHADER_TEXT_VISUAL_MULTI_COLOR_TEXT_SHADER_FRAG },
index 8aa4a15..0693600 100644 (file)
@@ -1,30 +1,27 @@
 std::vector<uint32_t> SHADER_COLOR_VISUAL_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000020,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000001d,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
        0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
        0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000000b,0x67617246,
        0x61746144,0x00000000,0x00050006,0x0000000b,0x00000000,0x6c6f4375,0x0000726f,0x00060006,
-       0x0000000b,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000b,0x00000002,
-       0x6361706f,0x00797469,0x00030005,0x0000000d,0x00000000,0x00040047,0x00000009,0x0000001e,
-       0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000b,
-       0x00000001,0x00000023,0x00000010,0x00050048,0x0000000b,0x00000002,0x00000023,0x0000001c,
-       0x00030047,0x0000000b,0x00000002,0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,
-       0x0000000d,0x00000021,0x00000001,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,
-       0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,
-       0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x00040017,
-       0x0000000a,0x00000006,0x00000003,0x0005001e,0x0000000b,0x00000007,0x0000000a,0x00000006,
-       0x00040020,0x0000000c,0x00000002,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000002,
-       0x00040015,0x0000000e,0x00000020,0x00000001,0x0004002b,0x0000000e,0x0000000f,0x00000001,
-       0x00040020,0x00000010,0x00000002,0x0000000a,0x0004002b,0x0000000e,0x00000013,0x00000002,
-       0x00040020,0x00000014,0x00000002,0x00000006,0x0004002b,0x0000000e,0x0000001b,0x00000000,
-       0x00040020,0x0000001c,0x00000002,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,
-       0x00000003,0x000200f8,0x00000005,0x00050041,0x00000010,0x00000011,0x0000000d,0x0000000f,
-       0x0004003d,0x0000000a,0x00000012,0x00000011,0x00050041,0x00000014,0x00000015,0x0000000d,
-       0x00000013,0x0004003d,0x00000006,0x00000016,0x00000015,0x00050051,0x00000006,0x00000017,
-       0x00000012,0x00000000,0x00050051,0x00000006,0x00000018,0x00000012,0x00000001,0x00050051,
-       0x00000006,0x00000019,0x00000012,0x00000002,0x00070050,0x00000007,0x0000001a,0x00000017,
-       0x00000018,0x00000019,0x00000016,0x00050041,0x0000001c,0x0000001d,0x0000000d,0x0000001b,
-       0x0004003d,0x00000007,0x0000001e,0x0000001d,0x00050085,0x00000007,0x0000001f,0x0000001a,
-       0x0000001e,0x0003003e,0x00000009,0x0000001f,0x000100fd,0x00010038
+       0x0000000b,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00030005,0x0000000d,0x00000000,
+       0x00040047,0x00000009,0x0000001e,0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,
+       0x00000000,0x00050048,0x0000000b,0x00000001,0x00000023,0x00000010,0x00030047,0x0000000b,
+       0x00000002,0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,0x0000000d,0x00000021,
+       0x00000001,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
+       0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
+       0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x00040017,0x0000000a,0x00000006,
+       0x00000003,0x0004001e,0x0000000b,0x00000007,0x0000000a,0x00040020,0x0000000c,0x00000002,
+       0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000002,0x00040015,0x0000000e,0x00000020,
+       0x00000001,0x0004002b,0x0000000e,0x0000000f,0x00000001,0x00040020,0x00000010,0x00000002,
+       0x0000000a,0x0004002b,0x00000006,0x00000013,0x3f800000,0x0004002b,0x0000000e,0x00000018,
+       0x00000000,0x00040020,0x00000019,0x00000002,0x00000007,0x00050036,0x00000002,0x00000004,
+       0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x00000010,0x00000011,0x0000000d,
+       0x0000000f,0x0004003d,0x0000000a,0x00000012,0x00000011,0x00050051,0x00000006,0x00000014,
+       0x00000012,0x00000000,0x00050051,0x00000006,0x00000015,0x00000012,0x00000001,0x00050051,
+       0x00000006,0x00000016,0x00000012,0x00000002,0x00070050,0x00000007,0x00000017,0x00000014,
+       0x00000015,0x00000016,0x00000013,0x00050041,0x00000019,0x0000001a,0x0000000d,0x00000018,
+       0x0004003d,0x00000007,0x0000001b,0x0000001a,0x00050085,0x00000007,0x0000001c,0x00000017,
+       0x0000001b,0x0003003e,0x00000009,0x0000001c,0x000100fd,0x00010038
 };
index 26194e7..067b00a 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_COLOR_VISUAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x0000005c,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000005c,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0007000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000035,0x00000053,0x00030003,
        0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,0x00000009,
index 9bb5679..c8bb235 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_EXPERIMENTAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x00000050,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000050,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x0000000d,0x0000001f,0x00000026,
        0x00000031,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
index 8021c19..f81d257 100644 (file)
@@ -1,63 +1,54 @@
 std::vector<uint32_t> SHADER_IMAGE_VISUAL_ATLAS_CLAMP_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x0000004b,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000003a,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000032,0x0000003d,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000019,0x00000024,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00060006,0x0000000c,0x00000000,0x6c744175,
-       0x65527361,0x00007463,0x00050006,0x0000000c,0x00000001,0x6c6f4375,0x0000726f,0x00060006,
-       0x0000000c,0x00000002,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000c,0x00000003,
-       0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000004,0x4d657270,0x69746c75,0x65696c70,
-       0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,0x00000028,0x43786574,
-       0x64726f6f,0x00000000,0x00050005,0x00000032,0x78655476,0x726f6f43,0x00000064,0x00050005,
-       0x0000003d,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x00000041,0x78655473,0x65727574,
-       0x00000000,0x00050048,0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,
-       0x00000001,0x00000023,0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,0x00000020,
-       0x00050048,0x0000000c,0x00000003,0x00000023,0x0000002c,0x00050048,0x0000000c,0x00000004,
-       0x00000023,0x00000030,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,
-       0x00000001,0x00040047,0x0000000e,0x00000021,0x00000000,0x00040047,0x00000032,0x0000001e,
-       0x00000000,0x00040047,0x0000003d,0x0000001e,0x00000000,0x00040047,0x00000041,0x00000022,
-       0x00000001,0x00040047,0x00000041,0x00000021,0x00000001,0x00020013,0x00000002,0x00030021,
-       0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,
-       0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,
-       0x0007001e,0x0000000c,0x00000007,0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,
-       0x0000000d,0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,
-       0x0000000f,0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000002,0x00040020,
-       0x00000011,0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,
-       0x0000000f,0x00000015,0x00000003,0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,
-       0x0000000f,0x00000019,0x00000004,0x00040017,0x00000026,0x00000006,0x00000002,0x00040020,
-       0x00000027,0x00000007,0x00000026,0x0004002b,0x0000000f,0x00000029,0x00000000,0x00040020,
-       0x0000002a,0x00000002,0x00000007,0x00040020,0x00000031,0x00000001,0x00000026,0x0004003b,
-       0x00000031,0x00000032,0x00000001,0x00040020,0x0000003c,0x00000003,0x00000007,0x0004003b,
-       0x0000003c,0x0000003d,0x00000003,0x00090019,0x0000003e,0x00000006,0x00000001,0x00000000,
-       0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000003f,0x0000003e,0x00040020,
-       0x00000040,0x00000000,0x0000003f,0x0004003b,0x00000040,0x00000041,0x00000000,0x0004002b,
-       0x0000000f,0x00000045,0x00000001,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
-       0x000200f8,0x00000005,0x0004003b,0x00000027,0x00000028,0x00000007,0x00050041,0x0000002a,
-       0x0000002b,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002c,0x0000002b,0x0007004f,
-       0x00000026,0x0000002d,0x0000002c,0x0000002c,0x00000000,0x00000001,0x00050041,0x0000002a,
-       0x0000002e,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002f,0x0000002e,0x0007004f,
-       0x00000026,0x00000030,0x0000002f,0x0000002f,0x00000002,0x00000003,0x0004003d,0x00000026,
-       0x00000033,0x00000032,0x0008000c,0x00000026,0x00000034,0x00000001,0x0000002e,0x0000002d,
-       0x00000030,0x00000033,0x00050041,0x0000002a,0x00000035,0x0000000e,0x00000029,0x0004003d,
-       0x00000007,0x00000036,0x00000035,0x0007004f,0x00000026,0x00000037,0x00000036,0x00000036,
-       0x00000000,0x00000001,0x00050041,0x0000002a,0x00000038,0x0000000e,0x00000029,0x0004003d,
-       0x00000007,0x00000039,0x00000038,0x0007004f,0x00000026,0x0000003a,0x00000039,0x00000039,
-       0x00000002,0x00000003,0x0008000c,0x00000026,0x0000003b,0x00000001,0x0000002b,0x00000034,
-       0x00000037,0x0000003a,0x0003003e,0x00000028,0x0000003b,0x0004003d,0x0000003f,0x00000042,
-       0x00000041,0x0004003d,0x00000026,0x00000043,0x00000028,0x00050057,0x00000007,0x00000044,
-       0x00000042,0x00000043,0x00050041,0x0000002a,0x00000046,0x0000000e,0x00000045,0x0004003d,
-       0x00000007,0x00000047,0x00000046,0x00050085,0x00000007,0x00000048,0x00000044,0x00000047,
-       0x00040039,0x00000007,0x00000049,0x00000009,0x00050085,0x00000007,0x0000004a,0x00000048,
-       0x00000049,0x0003003e,0x0000003d,0x0000004a,0x000100fd,0x00010038,0x00050036,0x00000007,
-       0x00000009,0x00000000,0x00000008,0x000200f8,0x0000000a,0x00050041,0x00000011,0x00000012,
-       0x0000000e,0x00000010,0x0004003d,0x0000000b,0x00000013,0x00000012,0x00050041,0x00000016,
-       0x00000017,0x0000000e,0x00000015,0x0004003d,0x00000006,0x00000018,0x00000017,0x00050041,
-       0x00000016,0x0000001a,0x0000000e,0x00000019,0x0004003d,0x00000006,0x0000001b,0x0000001a,
-       0x0008000c,0x00000006,0x0000001c,0x00000001,0x0000002e,0x00000014,0x00000018,0x0000001b,
-       0x0005008e,0x0000000b,0x0000001d,0x00000013,0x0000001c,0x00050041,0x00000016,0x0000001e,
-       0x0000000e,0x00000015,0x0004003d,0x00000006,0x0000001f,0x0000001e,0x00050051,0x00000006,
-       0x00000020,0x0000001d,0x00000000,0x00050051,0x00000006,0x00000021,0x0000001d,0x00000001,
-       0x00050051,0x00000006,0x00000022,0x0000001d,0x00000002,0x00070050,0x00000007,0x00000023,
-       0x00000020,0x00000021,0x00000022,0x0000001f,0x000200fe,0x00000023,0x00010038
+       0x00000000,0x00050005,0x00000009,0x43786574,0x64726f6f,0x00000000,0x00050005,0x0000000c,
+       0x67617246,0x61746144,0x00000000,0x00060006,0x0000000c,0x00000000,0x6c744175,0x65527361,
+       0x00007463,0x00050006,0x0000000c,0x00000001,0x6c6f4375,0x0000726f,0x00060006,0x0000000c,
+       0x00000002,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000c,0x00000003,0x6361706f,
+       0x00797469,0x00080006,0x0000000c,0x00000004,0x4d657270,0x69746c75,0x65696c70,0x706c4164,
+       0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,0x00000019,0x78655476,0x726f6f43,
+       0x00000064,0x00050005,0x00000024,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x00000028,
+       0x78655473,0x65727574,0x00000000,0x00050048,0x0000000c,0x00000000,0x00000023,0x00000000,
+       0x00050048,0x0000000c,0x00000001,0x00000023,0x00000010,0x00050048,0x0000000c,0x00000002,
+       0x00000023,0x00000020,0x00050048,0x0000000c,0x00000003,0x00000023,0x0000002c,0x00050048,
+       0x0000000c,0x00000004,0x00000023,0x00000030,0x00030047,0x0000000c,0x00000002,0x00040047,
+       0x0000000e,0x00000022,0x00000001,0x00040047,0x0000000e,0x00000021,0x00000000,0x00040047,
+       0x00000019,0x0000001e,0x00000000,0x00040047,0x00000024,0x0000001e,0x00000000,0x00040047,
+       0x00000028,0x00000022,0x00000001,0x00040047,0x00000028,0x00000021,0x00000001,0x00020013,
+       0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,
+       0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,0x00000007,0x00000007,0x00040017,
+       0x0000000a,0x00000006,0x00000004,0x00040017,0x0000000b,0x00000006,0x00000003,0x0007001e,
+       0x0000000c,0x0000000a,0x0000000a,0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,
+       0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,
+       0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000000,0x00040020,0x00000011,
+       0x00000002,0x0000000a,0x00040020,0x00000018,0x00000001,0x00000007,0x0004003b,0x00000018,
+       0x00000019,0x00000001,0x00040020,0x00000023,0x00000003,0x0000000a,0x0004003b,0x00000023,
+       0x00000024,0x00000003,0x00090019,0x00000025,0x00000006,0x00000001,0x00000000,0x00000000,
+       0x00000000,0x00000001,0x00000000,0x0003001b,0x00000026,0x00000025,0x00040020,0x00000027,
+       0x00000000,0x00000026,0x0004003b,0x00000027,0x00000028,0x00000000,0x0004002b,0x0000000f,
+       0x0000002c,0x00000001,0x0004002b,0x0000000f,0x00000030,0x00000002,0x00040020,0x00000031,
+       0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000034,0x3f800000,0x00050036,0x00000002,
+       0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,
+       0x00000007,0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000a,
+       0x00000013,0x00000012,0x0007004f,0x00000007,0x00000014,0x00000013,0x00000013,0x00000000,
+       0x00000001,0x00050041,0x00000011,0x00000015,0x0000000e,0x00000010,0x0004003d,0x0000000a,
+       0x00000016,0x00000015,0x0007004f,0x00000007,0x00000017,0x00000016,0x00000016,0x00000002,
+       0x00000003,0x0004003d,0x00000007,0x0000001a,0x00000019,0x0008000c,0x00000007,0x0000001b,
+       0x00000001,0x0000002e,0x00000014,0x00000017,0x0000001a,0x00050041,0x00000011,0x0000001c,
+       0x0000000e,0x00000010,0x0004003d,0x0000000a,0x0000001d,0x0000001c,0x0007004f,0x00000007,
+       0x0000001e,0x0000001d,0x0000001d,0x00000000,0x00000001,0x00050041,0x00000011,0x0000001f,
+       0x0000000e,0x00000010,0x0004003d,0x0000000a,0x00000020,0x0000001f,0x0007004f,0x00000007,
+       0x00000021,0x00000020,0x00000020,0x00000002,0x00000003,0x0008000c,0x00000007,0x00000022,
+       0x00000001,0x0000002b,0x0000001b,0x0000001e,0x00000021,0x0003003e,0x00000009,0x00000022,
+       0x0004003d,0x00000026,0x00000029,0x00000028,0x0004003d,0x00000007,0x0000002a,0x00000009,
+       0x00050057,0x0000000a,0x0000002b,0x00000029,0x0000002a,0x00050041,0x00000011,0x0000002d,
+       0x0000000e,0x0000002c,0x0004003d,0x0000000a,0x0000002e,0x0000002d,0x00050085,0x0000000a,
+       0x0000002f,0x0000002b,0x0000002e,0x00050041,0x00000031,0x00000032,0x0000000e,0x00000030,
+       0x0004003d,0x0000000b,0x00000033,0x00000032,0x00050051,0x00000006,0x00000035,0x00000033,
+       0x00000000,0x00050051,0x00000006,0x00000036,0x00000033,0x00000001,0x00050051,0x00000006,
+       0x00000037,0x00000033,0x00000002,0x00070050,0x0000000a,0x00000038,0x00000035,0x00000036,
+       0x00000037,0x00000034,0x00050085,0x0000000a,0x00000039,0x0000002f,0x00000038,0x0003003e,
+       0x00000024,0x00000039,0x000100fd,0x00010038
 };
index 77da654..791ef01 100644 (file)
 std::vector<uint32_t> SHADER_IMAGE_VISUAL_ATLAS_VARIOUS_WRAP_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000082,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000072,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000058,0x00000074,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000040,0x0000005d,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
        0x00000000,0x00090005,0x0000000e,0x70617277,0x726f6f43,0x616e6964,0x76286574,0x663b3266,
        0x31663b31,0x0000003b,0x00040005,0x0000000b,0x676e6172,0x00000065,0x00050005,0x0000000c,
-       0x726f6f63,0x616e6964,0x00006574,0x00040005,0x0000000d,0x70617277,0x00000000,0x00060005,
-       0x00000012,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00040005,0x0000001a,0x726f6f63,
-       0x00000064,0x00050005,0x0000003c,0x67617246,0x61746144,0x00000000,0x00060006,0x0000003c,
-       0x00000000,0x6c744175,0x65527361,0x00007463,0x00060006,0x0000003c,0x00000001,0x70617277,
-       0x65646f4d,0x00000000,0x00050006,0x0000003c,0x00000002,0x6c6f4375,0x0000726f,0x00060006,
-       0x0000003c,0x00000003,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000003c,0x00000004,
-       0x6361706f,0x00797469,0x00080006,0x0000003c,0x00000005,0x4d657270,0x69746c75,0x65696c70,
-       0x706c4164,0x00006168,0x00030005,0x0000003e,0x00000000,0x00050005,0x00000055,0x43786574,
-       0x64726f6f,0x00000000,0x00050005,0x00000058,0x78655476,0x726f6f43,0x00000064,0x00040005,
-       0x0000005a,0x61726170,0x0000006d,0x00040005,0x0000005f,0x61726170,0x0000006d,0x00040005,
-       0x00000063,0x61726170,0x0000006d,0x00040005,0x00000067,0x61726170,0x0000006d,0x00040005,
-       0x0000006b,0x61726170,0x0000006d,0x00040005,0x0000006e,0x61726170,0x0000006d,0x00050005,
-       0x00000074,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x00000078,0x78655473,0x65727574,
-       0x00000000,0x00050048,0x0000003c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000003c,
-       0x00000001,0x00000023,0x00000010,0x00050048,0x0000003c,0x00000002,0x00000023,0x00000020,
-       0x00050048,0x0000003c,0x00000003,0x00000023,0x00000030,0x00050048,0x0000003c,0x00000004,
-       0x00000023,0x0000003c,0x00050048,0x0000003c,0x00000005,0x00000023,0x00000040,0x00030047,
-       0x0000003c,0x00000002,0x00040047,0x0000003e,0x00000022,0x00000001,0x00040047,0x0000003e,
-       0x00000021,0x00000000,0x00040047,0x00000058,0x0000001e,0x00000000,0x00040047,0x00000074,
-       0x0000001e,0x00000000,0x00040047,0x00000078,0x00000022,0x00000001,0x00040047,0x00000078,
-       0x00000021,0x00000001,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,
-       0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
-       0x00000007,0x00000007,0x00040020,0x00000009,0x00000007,0x00000006,0x00060021,0x0000000a,
-       0x00000006,0x00000008,0x00000009,0x00000009,0x00040017,0x00000010,0x00000006,0x00000004,
-       0x00030021,0x00000011,0x00000010,0x0004002b,0x00000006,0x00000015,0x3fc00000,0x00020014,
-       0x00000016,0x0004002b,0x00000006,0x0000001b,0x3f800000,0x0004002b,0x00000006,0x0000001d,
-       0x3f000000,0x0004002b,0x00000006,0x00000020,0x40000000,0x00040015,0x0000002b,0x00000020,
-       0x00000000,0x0004002b,0x0000002b,0x0000002c,0x00000000,0x0004002b,0x0000002b,0x0000002f,
-       0x00000001,0x00040017,0x0000003b,0x00000006,0x00000003,0x0008001e,0x0000003c,0x00000010,
-       0x00000007,0x00000010,0x0000003b,0x00000006,0x00000006,0x00040020,0x0000003d,0x00000002,
-       0x0000003c,0x0004003b,0x0000003d,0x0000003e,0x00000002,0x00040015,0x0000003f,0x00000020,
-       0x00000001,0x0004002b,0x0000003f,0x00000040,0x00000003,0x00040020,0x00000041,0x00000002,
-       0x0000003b,0x0004002b,0x0000003f,0x00000044,0x00000004,0x00040020,0x00000045,0x00000002,
-       0x00000006,0x0004002b,0x0000003f,0x00000048,0x00000005,0x0004002b,0x0000003f,0x00000056,
-       0x00000000,0x00040020,0x00000057,0x00000001,0x00000007,0x0004003b,0x00000057,0x00000058,
-       0x00000001,0x0004002b,0x0000003f,0x00000059,0x00000001,0x00040020,0x0000005b,0x00000002,
-       0x00000010,0x00040020,0x00000060,0x00000001,0x00000006,0x00040020,0x00000073,0x00000003,
-       0x00000010,0x0004003b,0x00000073,0x00000074,0x00000003,0x00090019,0x00000075,0x00000006,
-       0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x00000076,
-       0x00000075,0x00040020,0x00000077,0x00000000,0x00000076,0x0004003b,0x00000077,0x00000078,
-       0x00000000,0x0004002b,0x0000003f,0x0000007c,0x00000002,0x00050036,0x00000002,0x00000004,
-       0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000055,0x00000007,
-       0x0004003b,0x00000008,0x0000005a,0x00000007,0x0004003b,0x00000009,0x0000005f,0x00000007,
-       0x0004003b,0x00000009,0x00000063,0x00000007,0x0004003b,0x00000008,0x00000067,0x00000007,
-       0x0004003b,0x00000009,0x0000006b,0x00000007,0x0004003b,0x00000009,0x0000006e,0x00000007,
-       0x00050041,0x0000005b,0x0000005c,0x0000003e,0x00000056,0x0004003d,0x00000010,0x0000005d,
-       0x0000005c,0x0007004f,0x00000007,0x0000005e,0x0000005d,0x0000005d,0x00000000,0x00000002,
-       0x0003003e,0x0000005a,0x0000005e,0x00050041,0x00000060,0x00000061,0x00000058,0x0000002c,
-       0x0004003d,0x00000006,0x00000062,0x00000061,0x0003003e,0x0000005f,0x00000062,0x00060041,
-       0x00000045,0x00000064,0x0000003e,0x00000059,0x0000002c,0x0004003d,0x00000006,0x00000065,
-       0x00000064,0x0003003e,0x00000063,0x00000065,0x00070039,0x00000006,0x00000066,0x0000000e,
-       0x0000005a,0x0000005f,0x00000063,0x00050041,0x0000005b,0x00000068,0x0000003e,0x00000056,
-       0x0004003d,0x00000010,0x00000069,0x00000068,0x0007004f,0x00000007,0x0000006a,0x00000069,
-       0x00000069,0x00000001,0x00000003,0x0003003e,0x00000067,0x0000006a,0x00050041,0x00000060,
-       0x0000006c,0x00000058,0x0000002f,0x0004003d,0x00000006,0x0000006d,0x0000006c,0x0003003e,
-       0x0000006b,0x0000006d,0x00060041,0x00000045,0x0000006f,0x0000003e,0x00000059,0x0000002f,
-       0x0004003d,0x00000006,0x00000070,0x0000006f,0x0003003e,0x0000006e,0x00000070,0x00070039,
-       0x00000006,0x00000071,0x0000000e,0x00000067,0x0000006b,0x0000006e,0x00050050,0x00000007,
-       0x00000072,0x00000066,0x00000071,0x0003003e,0x00000055,0x00000072,0x0004003d,0x00000076,
-       0x00000079,0x00000078,0x0004003d,0x00000007,0x0000007a,0x00000055,0x00050057,0x00000010,
-       0x0000007b,0x00000079,0x0000007a,0x00050041,0x0000005b,0x0000007d,0x0000003e,0x0000007c,
-       0x0004003d,0x00000010,0x0000007e,0x0000007d,0x00050085,0x00000010,0x0000007f,0x0000007b,
-       0x0000007e,0x00040039,0x00000010,0x00000080,0x00000012,0x00050085,0x00000010,0x00000081,
-       0x0000007f,0x00000080,0x0003003e,0x00000074,0x00000081,0x000100fd,0x00010038,0x00050036,
-       0x00000006,0x0000000e,0x00000000,0x0000000a,0x00030037,0x00000008,0x0000000b,0x00030037,
-       0x00000009,0x0000000c,0x00030037,0x00000009,0x0000000d,0x000200f8,0x0000000f,0x0004003b,
-       0x00000009,0x0000001a,0x00000007,0x0004003d,0x00000006,0x00000014,0x0000000d,0x000500ba,
-       0x00000016,0x00000017,0x00000014,0x00000015,0x000300f7,0x00000019,0x00000000,0x000400fa,
-       0x00000017,0x00000018,0x00000025,0x000200f8,0x00000018,0x0004003d,0x00000006,0x0000001c,
-       0x0000000c,0x00050085,0x00000006,0x0000001e,0x0000001c,0x0000001d,0x0006000c,0x00000006,
-       0x0000001f,0x00000001,0x0000000a,0x0000001e,0x00050085,0x00000006,0x00000021,0x0000001f,
-       0x00000020,0x00050083,0x00000006,0x00000022,0x00000021,0x0000001b,0x0006000c,0x00000006,
-       0x00000023,0x00000001,0x00000004,0x00000022,0x00050083,0x00000006,0x00000024,0x0000001b,
-       0x00000023,0x0003003e,0x0000001a,0x00000024,0x000200f9,0x00000019,0x000200f8,0x00000025,
-       0x0004003d,0x00000006,0x00000026,0x0000000c,0x0004003d,0x00000006,0x00000027,0x0000000c,
-       0x0006000c,0x00000006,0x00000028,0x00000001,0x0000000a,0x00000027,0x0004003d,0x00000006,
-       0x00000029,0x0000000d,0x0008000c,0x00000006,0x0000002a,0x00000001,0x0000002e,0x00000026,
-       0x00000028,0x00000029,0x0003003e,0x0000001a,0x0000002a,0x000200f9,0x00000019,0x000200f8,
-       0x00000019,0x00050041,0x00000009,0x0000002d,0x0000000b,0x0000002c,0x0004003d,0x00000006,
-       0x0000002e,0x0000002d,0x00050041,0x00000009,0x00000030,0x0000000b,0x0000002f,0x0004003d,
-       0x00000006,0x00000031,0x00000030,0x0004003d,0x00000006,0x00000032,0x0000001a,0x0008000c,
-       0x00000006,0x00000033,0x00000001,0x0000002e,0x0000002e,0x00000031,0x00000032,0x00050041,
-       0x00000009,0x00000034,0x0000000b,0x0000002c,0x0004003d,0x00000006,0x00000035,0x00000034,
-       0x00050041,0x00000009,0x00000036,0x0000000b,0x0000002f,0x0004003d,0x00000006,0x00000037,
-       0x00000036,0x0008000c,0x00000006,0x00000038,0x00000001,0x0000002b,0x00000033,0x00000035,
-       0x00000037,0x000200fe,0x00000038,0x00010038,0x00050036,0x00000010,0x00000012,0x00000000,
-       0x00000011,0x000200f8,0x00000013,0x00050041,0x00000041,0x00000042,0x0000003e,0x00000040,
-       0x0004003d,0x0000003b,0x00000043,0x00000042,0x00050041,0x00000045,0x00000046,0x0000003e,
-       0x00000044,0x0004003d,0x00000006,0x00000047,0x00000046,0x00050041,0x00000045,0x00000049,
-       0x0000003e,0x00000048,0x0004003d,0x00000006,0x0000004a,0x00000049,0x0008000c,0x00000006,
-       0x0000004b,0x00000001,0x0000002e,0x0000001b,0x00000047,0x0000004a,0x0005008e,0x0000003b,
-       0x0000004c,0x00000043,0x0000004b,0x00050041,0x00000045,0x0000004d,0x0000003e,0x00000044,
-       0x0004003d,0x00000006,0x0000004e,0x0000004d,0x00050051,0x00000006,0x0000004f,0x0000004c,
-       0x00000000,0x00050051,0x00000006,0x00000050,0x0000004c,0x00000001,0x00050051,0x00000006,
-       0x00000051,0x0000004c,0x00000002,0x00070050,0x00000010,0x00000052,0x0000004f,0x00000050,
-       0x00000051,0x0000004e,0x000200fe,0x00000052,0x00010038
+       0x726f6f63,0x616e6964,0x00006574,0x00040005,0x0000000d,0x70617277,0x00000000,0x00040005,
+       0x00000016,0x726f6f63,0x00000064,0x00050005,0x00000037,0x43786574,0x64726f6f,0x00000000,
+       0x00050005,0x0000003a,0x67617246,0x61746144,0x00000000,0x00060006,0x0000003a,0x00000000,
+       0x6c744175,0x65527361,0x00007463,0x00060006,0x0000003a,0x00000001,0x70617277,0x65646f4d,
+       0x00000000,0x00050006,0x0000003a,0x00000002,0x6c6f4375,0x0000726f,0x00060006,0x0000003a,
+       0x00000003,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000003a,0x00000004,0x6361706f,
+       0x00797469,0x00080006,0x0000003a,0x00000005,0x4d657270,0x69746c75,0x65696c70,0x706c4164,
+       0x00006168,0x00030005,0x0000003c,0x00000000,0x00050005,0x00000040,0x78655476,0x726f6f43,
+       0x00000064,0x00040005,0x00000042,0x61726170,0x0000006d,0x00040005,0x00000047,0x61726170,
+       0x0000006d,0x00040005,0x0000004b,0x61726170,0x0000006d,0x00040005,0x00000050,0x61726170,
+       0x0000006d,0x00040005,0x00000054,0x61726170,0x0000006d,0x00040005,0x00000057,0x61726170,
+       0x0000006d,0x00050005,0x0000005d,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x00000061,
+       0x78655473,0x65727574,0x00000000,0x00050048,0x0000003a,0x00000000,0x00000023,0x00000000,
+       0x00050048,0x0000003a,0x00000001,0x00000023,0x00000010,0x00050048,0x0000003a,0x00000002,
+       0x00000023,0x00000020,0x00050048,0x0000003a,0x00000003,0x00000023,0x00000030,0x00050048,
+       0x0000003a,0x00000004,0x00000023,0x0000003c,0x00050048,0x0000003a,0x00000005,0x00000023,
+       0x00000040,0x00030047,0x0000003a,0x00000002,0x00040047,0x0000003c,0x00000022,0x00000001,
+       0x00040047,0x0000003c,0x00000021,0x00000000,0x00040047,0x00000040,0x0000001e,0x00000000,
+       0x00040047,0x0000005d,0x0000001e,0x00000000,0x00040047,0x00000061,0x00000022,0x00000001,
+       0x00040047,0x00000061,0x00000021,0x00000001,0x00020013,0x00000002,0x00030021,0x00000003,
+       0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000002,
+       0x00040020,0x00000008,0x00000007,0x00000007,0x00040020,0x00000009,0x00000007,0x00000006,
+       0x00060021,0x0000000a,0x00000006,0x00000008,0x00000009,0x00000009,0x0004002b,0x00000006,
+       0x00000011,0x3fc00000,0x00020014,0x00000012,0x0004002b,0x00000006,0x00000017,0x3f800000,
+       0x0004002b,0x00000006,0x00000019,0x3f000000,0x0004002b,0x00000006,0x0000001c,0x40000000,
+       0x00040015,0x00000027,0x00000020,0x00000000,0x0004002b,0x00000027,0x00000028,0x00000000,
+       0x0004002b,0x00000027,0x0000002b,0x00000001,0x00040017,0x00000038,0x00000006,0x00000004,
+       0x00040017,0x00000039,0x00000006,0x00000003,0x0008001e,0x0000003a,0x00000038,0x00000007,
+       0x00000038,0x00000039,0x00000006,0x00000006,0x00040020,0x0000003b,0x00000002,0x0000003a,
+       0x0004003b,0x0000003b,0x0000003c,0x00000002,0x00040015,0x0000003d,0x00000020,0x00000001,
+       0x0004002b,0x0000003d,0x0000003e,0x00000000,0x00040020,0x0000003f,0x00000001,0x00000007,
+       0x0004003b,0x0000003f,0x00000040,0x00000001,0x0004002b,0x0000003d,0x00000041,0x00000001,
+       0x00040020,0x00000043,0x00000002,0x00000038,0x00040020,0x00000048,0x00000001,0x00000006,
+       0x00040020,0x0000004c,0x00000002,0x00000006,0x00040020,0x0000005c,0x00000003,0x00000038,
+       0x0004003b,0x0000005c,0x0000005d,0x00000003,0x00090019,0x0000005e,0x00000006,0x00000001,
+       0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000005f,0x0000005e,
+       0x00040020,0x00000060,0x00000000,0x0000005f,0x0004003b,0x00000060,0x00000061,0x00000000,
+       0x0004002b,0x0000003d,0x00000065,0x00000002,0x0004002b,0x0000003d,0x00000069,0x00000003,
+       0x00040020,0x0000006a,0x00000002,0x00000039,0x00050036,0x00000002,0x00000004,0x00000000,
+       0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000037,0x00000007,0x0004003b,
+       0x00000008,0x00000042,0x00000007,0x0004003b,0x00000009,0x00000047,0x00000007,0x0004003b,
+       0x00000009,0x0000004b,0x00000007,0x0004003b,0x00000008,0x00000050,0x00000007,0x0004003b,
+       0x00000009,0x00000054,0x00000007,0x0004003b,0x00000009,0x00000057,0x00000007,0x00050041,
+       0x00000043,0x00000044,0x0000003c,0x0000003e,0x0004003d,0x00000038,0x00000045,0x00000044,
+       0x0007004f,0x00000007,0x00000046,0x00000045,0x00000045,0x00000000,0x00000002,0x0003003e,
+       0x00000042,0x00000046,0x00050041,0x00000048,0x00000049,0x00000040,0x00000028,0x0004003d,
+       0x00000006,0x0000004a,0x00000049,0x0003003e,0x00000047,0x0000004a,0x00060041,0x0000004c,
+       0x0000004d,0x0000003c,0x00000041,0x00000028,0x0004003d,0x00000006,0x0000004e,0x0000004d,
+       0x0003003e,0x0000004b,0x0000004e,0x00070039,0x00000006,0x0000004f,0x0000000e,0x00000042,
+       0x00000047,0x0000004b,0x00050041,0x00000043,0x00000051,0x0000003c,0x0000003e,0x0004003d,
+       0x00000038,0x00000052,0x00000051,0x0007004f,0x00000007,0x00000053,0x00000052,0x00000052,
+       0x00000001,0x00000003,0x0003003e,0x00000050,0x00000053,0x00050041,0x00000048,0x00000055,
+       0x00000040,0x0000002b,0x0004003d,0x00000006,0x00000056,0x00000055,0x0003003e,0x00000054,
+       0x00000056,0x00060041,0x0000004c,0x00000058,0x0000003c,0x00000041,0x0000002b,0x0004003d,
+       0x00000006,0x00000059,0x00000058,0x0003003e,0x00000057,0x00000059,0x00070039,0x00000006,
+       0x0000005a,0x0000000e,0x00000050,0x00000054,0x00000057,0x00050050,0x00000007,0x0000005b,
+       0x0000004f,0x0000005a,0x0003003e,0x00000037,0x0000005b,0x0004003d,0x0000005f,0x00000062,
+       0x00000061,0x0004003d,0x00000007,0x00000063,0x00000037,0x00050057,0x00000038,0x00000064,
+       0x00000062,0x00000063,0x00050041,0x00000043,0x00000066,0x0000003c,0x00000065,0x0004003d,
+       0x00000038,0x00000067,0x00000066,0x00050085,0x00000038,0x00000068,0x00000064,0x00000067,
+       0x00050041,0x0000006a,0x0000006b,0x0000003c,0x00000069,0x0004003d,0x00000039,0x0000006c,
+       0x0000006b,0x00050051,0x00000006,0x0000006d,0x0000006c,0x00000000,0x00050051,0x00000006,
+       0x0000006e,0x0000006c,0x00000001,0x00050051,0x00000006,0x0000006f,0x0000006c,0x00000002,
+       0x00070050,0x00000038,0x00000070,0x0000006d,0x0000006e,0x0000006f,0x00000017,0x00050085,
+       0x00000038,0x00000071,0x00000068,0x00000070,0x0003003e,0x0000005d,0x00000071,0x000100fd,
+       0x00010038,0x00050036,0x00000006,0x0000000e,0x00000000,0x0000000a,0x00030037,0x00000008,
+       0x0000000b,0x00030037,0x00000009,0x0000000c,0x00030037,0x00000009,0x0000000d,0x000200f8,
+       0x0000000f,0x0004003b,0x00000009,0x00000016,0x00000007,0x0004003d,0x00000006,0x00000010,
+       0x0000000d,0x000500ba,0x00000012,0x00000013,0x00000010,0x00000011,0x000300f7,0x00000015,
+       0x00000000,0x000400fa,0x00000013,0x00000014,0x00000021,0x000200f8,0x00000014,0x0004003d,
+       0x00000006,0x00000018,0x0000000c,0x00050085,0x00000006,0x0000001a,0x00000018,0x00000019,
+       0x0006000c,0x00000006,0x0000001b,0x00000001,0x0000000a,0x0000001a,0x00050085,0x00000006,
+       0x0000001d,0x0000001b,0x0000001c,0x00050083,0x00000006,0x0000001e,0x0000001d,0x00000017,
+       0x0006000c,0x00000006,0x0000001f,0x00000001,0x00000004,0x0000001e,0x00050083,0x00000006,
+       0x00000020,0x00000017,0x0000001f,0x0003003e,0x00000016,0x00000020,0x000200f9,0x00000015,
+       0x000200f8,0x00000021,0x0004003d,0x00000006,0x00000022,0x0000000c,0x0004003d,0x00000006,
+       0x00000023,0x0000000c,0x0006000c,0x00000006,0x00000024,0x00000001,0x0000000a,0x00000023,
+       0x0004003d,0x00000006,0x00000025,0x0000000d,0x0008000c,0x00000006,0x00000026,0x00000001,
+       0x0000002e,0x00000022,0x00000024,0x00000025,0x0003003e,0x00000016,0x00000026,0x000200f9,
+       0x00000015,0x000200f8,0x00000015,0x00050041,0x00000009,0x00000029,0x0000000b,0x00000028,
+       0x0004003d,0x00000006,0x0000002a,0x00000029,0x00050041,0x00000009,0x0000002c,0x0000000b,
+       0x0000002b,0x0004003d,0x00000006,0x0000002d,0x0000002c,0x0004003d,0x00000006,0x0000002e,
+       0x00000016,0x0008000c,0x00000006,0x0000002f,0x00000001,0x0000002e,0x0000002a,0x0000002d,
+       0x0000002e,0x00050041,0x00000009,0x00000030,0x0000000b,0x00000028,0x0004003d,0x00000006,
+       0x00000031,0x00000030,0x00050041,0x00000009,0x00000032,0x0000000b,0x0000002b,0x0004003d,
+       0x00000006,0x00000033,0x00000032,0x0008000c,0x00000006,0x00000034,0x00000001,0x0000002b,
+       0x0000002f,0x00000031,0x00000033,0x000200fe,0x00000034,0x00010038
 };
index 19816d9..28ed893 100644 (file)
@@ -1,49 +1,38 @@
 std::vector<uint32_t> SHADER_IMAGE_VISUAL_NO_ATLAS_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000039,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000028,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000027,0x0000002f,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000011,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00060005,
-       0x0000000c,0x67617246,0x61746144,0x74416f4e,0x0073616c,0x00050006,0x0000000c,0x00000000,
-       0x6c6f4375,0x0000726f,0x00060006,0x0000000c,0x00000001,0x4378696d,0x726f6c6f,0x00000000,
-       0x00050006,0x0000000c,0x00000002,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000003,
-       0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,
-       0x00050005,0x00000027,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000002b,0x78655473,
-       0x65727574,0x00000000,0x00050005,0x0000002f,0x78655476,0x726f6f43,0x00000064,0x00050048,
-       0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,
-       0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,0x0000001c,0x00050048,0x0000000c,
-       0x00000003,0x00000023,0x00000020,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,
-       0x00000022,0x00000000,0x00040047,0x0000000e,0x00000021,0x00000001,0x00040047,0x00000027,
-       0x0000001e,0x00000000,0x00040047,0x0000002b,0x00000022,0x00000000,0x00040047,0x0000002b,
-       0x00000021,0x00000002,0x00040047,0x0000002f,0x0000001e,0x00000000,0x00020013,0x00000002,
+       0x00000000,0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000000d,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,0x00000064,
+       0x00060005,0x00000015,0x67617246,0x61746144,0x74416f4e,0x0073616c,0x00050006,0x00000015,
+       0x00000000,0x6c6f4375,0x0000726f,0x00060006,0x00000015,0x00000001,0x4378696d,0x726f6c6f,
+       0x00000000,0x00080006,0x00000015,0x00000002,0x4d657270,0x69746c75,0x65696c70,0x706c4164,
+       0x00006168,0x00030005,0x00000017,0x00000000,0x00040047,0x00000009,0x0000001e,0x00000000,
+       0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,0x0000000d,0x00000021,0x00000002,
+       0x00040047,0x00000011,0x0000001e,0x00000000,0x00050048,0x00000015,0x00000000,0x00000023,
+       0x00000000,0x00050048,0x00000015,0x00000001,0x00000023,0x00000010,0x00050048,0x00000015,
+       0x00000002,0x00000023,0x0000001c,0x00030047,0x00000015,0x00000002,0x00040047,0x00000017,
+       0x00000022,0x00000000,0x00040047,0x00000017,0x00000021,0x00000001,0x00020013,0x00000002,
        0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,
-       0x00000006,0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,
-       0x00000003,0x0006001e,0x0000000c,0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,
-       0x0000000d,0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,
-       0x0000000f,0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000001,0x00040020,
-       0x00000011,0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,
-       0x0000000f,0x00000015,0x00000002,0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,
-       0x0000000f,0x00000019,0x00000003,0x00040020,0x00000026,0x00000003,0x00000007,0x0004003b,
-       0x00000026,0x00000027,0x00000003,0x00090019,0x00000028,0x00000006,0x00000001,0x00000000,
-       0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x00000029,0x00000028,0x00040020,
-       0x0000002a,0x00000000,0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000000,0x00040017,
-       0x0000002d,0x00000006,0x00000002,0x00040020,0x0000002e,0x00000001,0x0000002d,0x0004003b,
-       0x0000002e,0x0000002f,0x00000001,0x0004002b,0x0000000f,0x00000032,0x00000000,0x00040020,
-       0x00000033,0x00000002,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
-       0x000200f8,0x00000005,0x0004003d,0x00000029,0x0000002c,0x0000002b,0x0004003d,0x0000002d,
-       0x00000030,0x0000002f,0x00050057,0x00000007,0x00000031,0x0000002c,0x00000030,0x00050041,
-       0x00000033,0x00000034,0x0000000e,0x00000032,0x0004003d,0x00000007,0x00000035,0x00000034,
-       0x00050085,0x00000007,0x00000036,0x00000031,0x00000035,0x00040039,0x00000007,0x00000037,
-       0x00000009,0x00050085,0x00000007,0x00000038,0x00000036,0x00000037,0x0003003e,0x00000027,
-       0x00000038,0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,0x00000000,0x00000008,
-       0x000200f8,0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,
-       0x0000000b,0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,0x0000000e,0x00000015,
-       0x0004003d,0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,0x0000001a,0x0000000e,
-       0x00000019,0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,0x00000006,0x0000001c,
-       0x00000001,0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,0x0000000b,0x0000001d,
-       0x00000013,0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,0x00000015,0x0004003d,
-       0x00000006,0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,0x0000001d,0x00000000,
-       0x00050051,0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,0x00000006,0x00000022,
-       0x0000001d,0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,0x00000021,0x00000022,
-       0x0000001f,0x000200fe,0x00000023,0x00010038
+       0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,
+       0x00000009,0x00000003,0x00090019,0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,
+       0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,
+       0x00000000,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,
+       0x00000006,0x00000002,0x00040020,0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,
+       0x00000011,0x00000001,0x00040017,0x00000014,0x00000006,0x00000003,0x0005001e,0x00000015,
+       0x00000007,0x00000014,0x00000006,0x00040020,0x00000016,0x00000002,0x00000015,0x0004003b,
+       0x00000016,0x00000017,0x00000002,0x00040015,0x00000018,0x00000020,0x00000001,0x0004002b,
+       0x00000018,0x00000019,0x00000000,0x00040020,0x0000001a,0x00000002,0x00000007,0x0004002b,
+       0x00000018,0x0000001e,0x00000001,0x00040020,0x0000001f,0x00000002,0x00000014,0x0004002b,
+       0x00000006,0x00000022,0x3f800000,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
+       0x000200f8,0x00000005,0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d,0x0000000f,
+       0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,0x00000012,0x00050041,
+       0x0000001a,0x0000001b,0x00000017,0x00000019,0x0004003d,0x00000007,0x0000001c,0x0000001b,
+       0x00050085,0x00000007,0x0000001d,0x00000013,0x0000001c,0x00050041,0x0000001f,0x00000020,
+       0x00000017,0x0000001e,0x0004003d,0x00000014,0x00000021,0x00000020,0x00050051,0x00000006,
+       0x00000023,0x00000021,0x00000000,0x00050051,0x00000006,0x00000024,0x00000021,0x00000001,
+       0x00050051,0x00000006,0x00000025,0x00000021,0x00000002,0x00070050,0x00000007,0x00000026,
+       0x00000023,0x00000024,0x00000025,0x00000022,0x00050085,0x00000007,0x00000027,0x0000001d,
+       0x00000026,0x0003003e,0x00000009,0x00000027,0x000100fd,0x00010038
 };
index 1c38b0f..0de5f71 100644 (file)
@@ -1,49 +1,38 @@
 std::vector<uint32_t> SHADER_IMAGE_VISUAL_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000039,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000028,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000027,0x0000002f,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000011,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00050006,0x0000000c,0x00000000,0x6c6f4375,
-       0x0000726f,0x00060006,0x0000000c,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00050006,
-       0x0000000c,0x00000002,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000003,0x4d657270,
-       0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,
-       0x00000027,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000002b,0x78655473,0x65727574,
-       0x00000000,0x00050005,0x0000002f,0x78655476,0x726f6f43,0x00000064,0x00050048,0x0000000c,
-       0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,0x00000010,
-       0x00050048,0x0000000c,0x00000002,0x00000023,0x0000001c,0x00050048,0x0000000c,0x00000003,
-       0x00000023,0x00000020,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,
-       0x00000000,0x00040047,0x0000000e,0x00000021,0x00000001,0x00040047,0x00000027,0x0000001e,
-       0x00000000,0x00040047,0x0000002b,0x00000022,0x00000000,0x00040047,0x0000002b,0x00000021,
-       0x00000002,0x00040047,0x0000002f,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,
+       0x00000000,0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000000d,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,0x00000064,
+       0x00050005,0x00000015,0x67617246,0x61746144,0x00000000,0x00050006,0x00000015,0x00000000,
+       0x6c6f4375,0x0000726f,0x00060006,0x00000015,0x00000001,0x4378696d,0x726f6c6f,0x00000000,
+       0x00080006,0x00000015,0x00000002,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,
+       0x00030005,0x00000017,0x00000000,0x00040047,0x00000009,0x0000001e,0x00000000,0x00040047,
+       0x0000000d,0x00000022,0x00000000,0x00040047,0x0000000d,0x00000021,0x00000002,0x00040047,
+       0x00000011,0x0000001e,0x00000000,0x00050048,0x00000015,0x00000000,0x00000023,0x00000000,
+       0x00050048,0x00000015,0x00000001,0x00000023,0x00000010,0x00050048,0x00000015,0x00000002,
+       0x00000023,0x0000001c,0x00030047,0x00000015,0x00000002,0x00040047,0x00000017,0x00000022,
+       0x00000000,0x00040047,0x00000017,0x00000021,0x00000001,0x00020013,0x00000002,0x00030021,
        0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,
-       0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,
-       0x0006001e,0x0000000c,0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,
-       0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,
-       0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000001,0x00040020,0x00000011,
-       0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,0x0000000f,
-       0x00000015,0x00000002,0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,0x0000000f,
-       0x00000019,0x00000003,0x00040020,0x00000026,0x00000003,0x00000007,0x0004003b,0x00000026,
-       0x00000027,0x00000003,0x00090019,0x00000028,0x00000006,0x00000001,0x00000000,0x00000000,
-       0x00000000,0x00000001,0x00000000,0x0003001b,0x00000029,0x00000028,0x00040020,0x0000002a,
-       0x00000000,0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000000,0x00040017,0x0000002d,
-       0x00000006,0x00000002,0x00040020,0x0000002e,0x00000001,0x0000002d,0x0004003b,0x0000002e,
-       0x0000002f,0x00000001,0x0004002b,0x0000000f,0x00000032,0x00000000,0x00040020,0x00000033,
-       0x00000002,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
-       0x00000005,0x0004003d,0x00000029,0x0000002c,0x0000002b,0x0004003d,0x0000002d,0x00000030,
-       0x0000002f,0x00050057,0x00000007,0x00000031,0x0000002c,0x00000030,0x00050041,0x00000033,
-       0x00000034,0x0000000e,0x00000032,0x0004003d,0x00000007,0x00000035,0x00000034,0x00050085,
-       0x00000007,0x00000036,0x00000031,0x00000035,0x00040039,0x00000007,0x00000037,0x00000009,
-       0x00050085,0x00000007,0x00000038,0x00000036,0x00000037,0x0003003e,0x00000027,0x00000038,
-       0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,0x00000000,0x00000008,0x000200f8,
-       0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000b,
-       0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,0x0000000e,0x00000015,0x0004003d,
-       0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,0x0000001a,0x0000000e,0x00000019,
-       0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,0x00000006,0x0000001c,0x00000001,
-       0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,0x0000000b,0x0000001d,0x00000013,
-       0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,0x00000015,0x0004003d,0x00000006,
-       0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,0x0000001d,0x00000000,0x00050051,
-       0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,0x00000006,0x00000022,0x0000001d,
-       0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,0x00000021,0x00000022,0x0000001f,
-       0x000200fe,0x00000023,0x00010038
+       0x00000004,0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,
+       0x00000003,0x00090019,0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,
+       0x00000001,0x00000000,0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,0x00000000,
+       0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,0x00000006,
+       0x00000002,0x00040020,0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,0x00000011,
+       0x00000001,0x00040017,0x00000014,0x00000006,0x00000003,0x0005001e,0x00000015,0x00000007,
+       0x00000014,0x00000006,0x00040020,0x00000016,0x00000002,0x00000015,0x0004003b,0x00000016,
+       0x00000017,0x00000002,0x00040015,0x00000018,0x00000020,0x00000001,0x0004002b,0x00000018,
+       0x00000019,0x00000000,0x00040020,0x0000001a,0x00000002,0x00000007,0x0004002b,0x00000018,
+       0x0000001e,0x00000001,0x00040020,0x0000001f,0x00000002,0x00000014,0x0004002b,0x00000006,
+       0x00000022,0x3f800000,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
+       0x00000005,0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d,0x0000000f,0x00000012,
+       0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,0x00000012,0x00050041,0x0000001a,
+       0x0000001b,0x00000017,0x00000019,0x0004003d,0x00000007,0x0000001c,0x0000001b,0x00050085,
+       0x00000007,0x0000001d,0x00000013,0x0000001c,0x00050041,0x0000001f,0x00000020,0x00000017,
+       0x0000001e,0x0004003d,0x00000014,0x00000021,0x00000020,0x00050051,0x00000006,0x00000023,
+       0x00000021,0x00000000,0x00050051,0x00000006,0x00000024,0x00000021,0x00000001,0x00050051,
+       0x00000006,0x00000025,0x00000021,0x00000002,0x00070050,0x00000007,0x00000026,0x00000023,
+       0x00000024,0x00000025,0x00000022,0x00050085,0x00000007,0x00000027,0x0000001d,0x00000026,
+       0x0003003e,0x00000009,0x00000027,0x000100fd,0x00010038
 };
index 2f9482b..343839c 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_IMAGE_VISUAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x00000085,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000085,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000035,0x0000006e,0x00000081,
        0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,
index 82cb266..1ffc49c 100644 (file)
 std::vector<uint32_t> SHADER_MESH_VISUAL_NORMAL_MAP_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x0000007e,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000006e,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0009000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000002f,0x0000004a,0x00000054,
-       0x0000005d,0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,
-       0x00000004,0x6e69616d,0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,
-       0x0028726f,0x00050005,0x0000000c,0x67617246,0x61746144,0x00000000,0x00050006,0x0000000c,
-       0x00000000,0x6c6f4375,0x0000726f,0x00060006,0x0000000c,0x00000001,0x4378696d,0x726f6c6f,
-       0x00000000,0x00050006,0x0000000c,0x00000002,0x6361706f,0x00797469,0x00080006,0x0000000c,
-       0x00000003,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,
-       0x00000000,0x00040005,0x00000027,0x66666964,0x00657375,0x00050005,0x0000002b,0x66694473,
-       0x65737566,0x00000000,0x00050005,0x0000002f,0x78655476,0x726f6f43,0x00000064,0x00040005,
-       0x00000033,0x6d726f6e,0x00006c61,0x00040005,0x00000034,0x726f4e73,0x006c616d,0x00050005,
-       0x0000003e,0x736f6c67,0x70614d73,0x00000000,0x00040005,0x0000003f,0x6f6c4773,0x00007373,
-       0x00060005,0x00000043,0x75736976,0x694d6c61,0x6c6f4378,0x0000726f,0x00060005,0x00000046,
-       0x6867696c,0x66694474,0x65737566,0x00000000,0x00060005,0x0000004a,0x67694c76,0x69447468,
-       0x74636572,0x006e6f69,0x00050005,0x00000053,0x6e696873,0x73656e69,0x00000073,0x00050005,
-       0x00000054,0x6c614876,0x63655666,0x00726f74,0x00050005,0x0000005d,0x67617266,0x6f6c6f43,
-       0x00000072,0x00050048,0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,
-       0x00000001,0x00000023,0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,0x0000001c,
-       0x00050048,0x0000000c,0x00000003,0x00000023,0x00000020,0x00030047,0x0000000c,0x00000002,
-       0x00040047,0x0000000e,0x00000022,0x00000000,0x00040047,0x0000000e,0x00000021,0x00000001,
-       0x00040047,0x0000002b,0x00000022,0x00000000,0x00040047,0x0000002b,0x00000021,0x00000002,
-       0x00040047,0x0000002f,0x0000001e,0x00000000,0x00040047,0x00000034,0x00000022,0x00000000,
-       0x00040047,0x00000034,0x00000021,0x00000003,0x00040047,0x0000003f,0x00000022,0x00000000,
-       0x00040047,0x0000003f,0x00000021,0x00000004,0x00040047,0x0000004a,0x0000001e,0x00000001,
-       0x00040047,0x00000054,0x0000001e,0x00000002,0x00040047,0x0000005d,0x0000001e,0x00000000,
-       0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
-       0x00040017,0x00000007,0x00000006,0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,
-       0x0000000b,0x00000006,0x00000003,0x0006001e,0x0000000c,0x00000007,0x0000000b,0x00000006,
-       0x00000006,0x00040020,0x0000000d,0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,
-       0x00000002,0x00040015,0x0000000f,0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,
-       0x00000001,0x00040020,0x00000011,0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,
-       0x3f800000,0x0004002b,0x0000000f,0x00000015,0x00000002,0x00040020,0x00000016,0x00000002,
-       0x00000006,0x0004002b,0x0000000f,0x00000019,0x00000003,0x00040020,0x00000026,0x00000007,
-       0x00000007,0x00090019,0x00000028,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,
-       0x00000001,0x00000000,0x0003001b,0x00000029,0x00000028,0x00040020,0x0000002a,0x00000000,
-       0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000000,0x00040017,0x0000002d,0x00000006,
-       0x00000002,0x00040020,0x0000002e,0x00000001,0x0000002d,0x0004003b,0x0000002e,0x0000002f,
-       0x00000001,0x00040020,0x00000032,0x00000007,0x0000000b,0x0004003b,0x0000002a,0x00000034,
-       0x00000000,0x0004002b,0x00000006,0x00000039,0x40000000,0x0004003b,0x0000002a,0x0000003f,
-       0x00000000,0x00040020,0x00000045,0x00000007,0x00000006,0x0004002b,0x00000006,0x00000047,
-       0x00000000,0x00040020,0x00000049,0x00000001,0x0000000b,0x0004003b,0x00000049,0x0000004a,
-       0x00000001,0x0004002b,0x00000006,0x00000050,0x3f000000,0x0004003b,0x00000049,0x00000054,
-       0x00000001,0x0004002b,0x00000006,0x0000005a,0x41800000,0x00040020,0x0000005c,0x00000003,
-       0x00000007,0x0004003b,0x0000005c,0x0000005d,0x00000003,0x0004002b,0x0000000f,0x00000060,
-       0x00000000,0x00040020,0x00000061,0x00000002,0x00000007,0x00040015,0x00000070,0x00000020,
-       0x00000000,0x0004002b,0x00000070,0x00000071,0x00000003,0x00050036,0x00000002,0x00000004,
-       0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000026,0x00000027,0x00000007,
-       0x0004003b,0x00000032,0x00000033,0x00000007,0x0004003b,0x00000026,0x0000003e,0x00000007,
-       0x0004003b,0x00000026,0x00000043,0x00000007,0x0004003b,0x00000045,0x00000046,0x00000007,
-       0x0004003b,0x00000045,0x00000053,0x00000007,0x0004003d,0x00000029,0x0000002c,0x0000002b,
-       0x0004003d,0x0000002d,0x00000030,0x0000002f,0x00050057,0x00000007,0x00000031,0x0000002c,
-       0x00000030,0x0003003e,0x00000027,0x00000031,0x0004003d,0x00000029,0x00000035,0x00000034,
-       0x0004003d,0x0000002d,0x00000036,0x0000002f,0x00050057,0x00000007,0x00000037,0x00000035,
-       0x00000036,0x0008004f,0x0000000b,0x00000038,0x00000037,0x00000037,0x00000000,0x00000001,
-       0x00000002,0x0005008e,0x0000000b,0x0000003a,0x00000038,0x00000039,0x00060050,0x0000000b,
-       0x0000003b,0x00000014,0x00000014,0x00000014,0x00050083,0x0000000b,0x0000003c,0x0000003a,
-       0x0000003b,0x0006000c,0x0000000b,0x0000003d,0x00000001,0x00000045,0x0000003c,0x0003003e,
-       0x00000033,0x0000003d,0x0004003d,0x00000029,0x00000040,0x0000003f,0x0004003d,0x0000002d,
-       0x00000041,0x0000002f,0x00050057,0x00000007,0x00000042,0x00000040,0x00000041,0x0003003e,
-       0x0000003e,0x00000042,0x00040039,0x00000007,0x00000044,0x00000009,0x0003003e,0x00000043,
-       0x00000044,0x0004003d,0x0000000b,0x00000048,0x00000033,0x0004003d,0x0000000b,0x0000004b,
-       0x0000004a,0x0006000c,0x0000000b,0x0000004c,0x00000001,0x00000045,0x0000004b,0x00050094,
-       0x00000006,0x0000004d,0x00000048,0x0000004c,0x0007000c,0x00000006,0x0000004e,0x00000001,
-       0x00000028,0x00000047,0x0000004d,0x0003003e,0x00000046,0x0000004e,0x0004003d,0x00000006,
-       0x0000004f,0x00000046,0x00050085,0x00000006,0x00000051,0x0000004f,0x00000050,0x00050081,
-       0x00000006,0x00000052,0x00000051,0x00000050,0x0003003e,0x00000046,0x00000052,0x0004003d,
-       0x0000000b,0x00000055,0x00000054,0x0006000c,0x0000000b,0x00000056,0x00000001,0x00000045,
-       0x00000055,0x0004003d,0x0000000b,0x00000057,0x00000033,0x00050094,0x00000006,0x00000058,
-       0x00000056,0x00000057,0x0007000c,0x00000006,0x00000059,0x00000001,0x00000028,0x00000058,
-       0x00000047,0x0007000c,0x00000006,0x0000005b,0x00000001,0x0000001a,0x00000059,0x0000005a,
-       0x0003003e,0x00000053,0x0000005b,0x0004003d,0x00000007,0x0000005e,0x00000027,0x0008004f,
-       0x0000000b,0x0000005f,0x0000005e,0x0000005e,0x00000000,0x00000001,0x00000002,0x00050041,
-       0x00000061,0x00000062,0x0000000e,0x00000060,0x0004003d,0x00000007,0x00000063,0x00000062,
-       0x0008004f,0x0000000b,0x00000064,0x00000063,0x00000063,0x00000000,0x00000001,0x00000002,
-       0x00050085,0x0000000b,0x00000065,0x0000005f,0x00000064,0x0004003d,0x00000007,0x00000066,
-       0x00000043,0x0008004f,0x0000000b,0x00000067,0x00000066,0x00000066,0x00000000,0x00000001,
-       0x00000002,0x00050085,0x0000000b,0x00000068,0x00000065,0x00000067,0x0004003d,0x00000006,
-       0x00000069,0x00000046,0x0005008e,0x0000000b,0x0000006a,0x00000068,0x00000069,0x0004003d,
-       0x00000006,0x0000006b,0x00000053,0x0004003d,0x00000007,0x0000006c,0x0000003e,0x0008004f,
-       0x0000000b,0x0000006d,0x0000006c,0x0000006c,0x00000000,0x00000001,0x00000002,0x0005008e,
-       0x0000000b,0x0000006e,0x0000006d,0x0000006b,0x00050081,0x0000000b,0x0000006f,0x0000006a,
-       0x0000006e,0x00050041,0x00000045,0x00000072,0x00000027,0x00000071,0x0004003d,0x00000006,
-       0x00000073,0x00000072,0x00060041,0x00000016,0x00000074,0x0000000e,0x00000060,0x00000071,
-       0x0004003d,0x00000006,0x00000075,0x00000074,0x00050085,0x00000006,0x00000076,0x00000073,
-       0x00000075,0x00050041,0x00000045,0x00000077,0x00000043,0x00000071,0x0004003d,0x00000006,
-       0x00000078,0x00000077,0x00050085,0x00000006,0x00000079,0x00000076,0x00000078,0x00050051,
-       0x00000006,0x0000007a,0x0000006f,0x00000000,0x00050051,0x00000006,0x0000007b,0x0000006f,
-       0x00000001,0x00050051,0x00000006,0x0000007c,0x0000006f,0x00000002,0x00070050,0x00000007,
-       0x0000007d,0x0000007a,0x0000007b,0x0000007c,0x00000079,0x0003003e,0x0000005d,0x0000007d,
-       0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,0x00000000,0x00000008,0x000200f8,
-       0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000b,
-       0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,0x0000000e,0x00000015,0x0004003d,
-       0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,0x0000001a,0x0000000e,0x00000019,
-       0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,0x00000006,0x0000001c,0x00000001,
-       0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,0x0000000b,0x0000001d,0x00000013,
-       0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,0x00000015,0x0004003d,0x00000006,
-       0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,0x0000001d,0x00000000,0x00050051,
-       0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,0x00000006,0x00000022,0x0000001d,
-       0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,0x00000021,0x00000022,0x0000001f,
-       0x000200fe,0x00000023,0x00010038
+       0x0009000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x00000039,0x00000043,
+       0x0000004c,0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,
+       0x00000004,0x6e69616d,0x00000000,0x00040005,0x00000009,0x66666964,0x00657375,0x00050005,
+       0x0000000d,0x66694473,0x65737566,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,
+       0x00000064,0x00040005,0x00000016,0x6d726f6e,0x00006c61,0x00040005,0x00000017,0x726f4e73,
+       0x006c616d,0x00050005,0x00000022,0x736f6c67,0x70614d73,0x00000000,0x00040005,0x00000023,
+       0x6f6c4773,0x00007373,0x00060005,0x00000027,0x75736976,0x694d6c61,0x6c6f4378,0x0000726f,
+       0x00050005,0x00000028,0x67617246,0x61746144,0x00000000,0x00050006,0x00000028,0x00000000,
+       0x6c6f4375,0x0000726f,0x00060006,0x00000028,0x00000001,0x4378696d,0x726f6c6f,0x00000000,
+       0x00050006,0x00000028,0x00000002,0x6361706f,0x00797469,0x00080006,0x00000028,0x00000003,
+       0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000002a,0x00000000,
+       0x00060005,0x00000035,0x6867696c,0x66694474,0x65737566,0x00000000,0x00060005,0x00000039,
+       0x67694c76,0x69447468,0x74636572,0x006e6f69,0x00050005,0x00000042,0x6e696873,0x73656e69,
+       0x00000073,0x00050005,0x00000043,0x6c614876,0x63655666,0x00726f74,0x00050005,0x0000004c,
+       0x67617266,0x6f6c6f43,0x00000072,0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,
+       0x0000000d,0x00000021,0x00000002,0x00040047,0x00000011,0x0000001e,0x00000000,0x00040047,
+       0x00000017,0x00000022,0x00000000,0x00040047,0x00000017,0x00000021,0x00000003,0x00040047,
+       0x00000023,0x00000022,0x00000000,0x00040047,0x00000023,0x00000021,0x00000004,0x00050048,
+       0x00000028,0x00000000,0x00000023,0x00000000,0x00050048,0x00000028,0x00000001,0x00000023,
+       0x00000010,0x00050048,0x00000028,0x00000002,0x00000023,0x0000001c,0x00050048,0x00000028,
+       0x00000003,0x00000023,0x00000020,0x00030047,0x00000028,0x00000002,0x00040047,0x0000002a,
+       0x00000022,0x00000000,0x00040047,0x0000002a,0x00000021,0x00000001,0x00040047,0x00000039,
+       0x0000001e,0x00000001,0x00040047,0x00000043,0x0000001e,0x00000002,0x00040047,0x0000004c,
+       0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,
+       0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
+       0x00000007,0x00000007,0x00090019,0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,
+       0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,
+       0x00000000,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,
+       0x00000006,0x00000002,0x00040020,0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,
+       0x00000011,0x00000001,0x00040017,0x00000014,0x00000006,0x00000003,0x00040020,0x00000015,
+       0x00000007,0x00000014,0x0004003b,0x0000000c,0x00000017,0x00000000,0x0004002b,0x00000006,
+       0x0000001c,0x40000000,0x0004002b,0x00000006,0x0000001e,0x3f800000,0x0004003b,0x0000000c,
+       0x00000023,0x00000000,0x0006001e,0x00000028,0x00000007,0x00000014,0x00000006,0x00000006,
+       0x00040020,0x00000029,0x00000002,0x00000028,0x0004003b,0x00000029,0x0000002a,0x00000002,
+       0x00040015,0x0000002b,0x00000020,0x00000001,0x0004002b,0x0000002b,0x0000002c,0x00000001,
+       0x00040020,0x0000002d,0x00000002,0x00000014,0x00040020,0x00000034,0x00000007,0x00000006,
+       0x0004002b,0x00000006,0x00000036,0x00000000,0x00040020,0x00000038,0x00000001,0x00000014,
+       0x0004003b,0x00000038,0x00000039,0x00000001,0x0004002b,0x00000006,0x0000003f,0x3f000000,
+       0x0004003b,0x00000038,0x00000043,0x00000001,0x0004002b,0x00000006,0x00000049,0x41800000,
+       0x00040020,0x0000004b,0x00000003,0x00000007,0x0004003b,0x0000004b,0x0000004c,0x00000003,
+       0x0004002b,0x0000002b,0x0000004f,0x00000000,0x00040020,0x00000050,0x00000002,0x00000007,
+       0x00040015,0x0000005f,0x00000020,0x00000000,0x0004002b,0x0000005f,0x00000060,0x00000003,
+       0x00040020,0x00000063,0x00000002,0x00000006,0x00050036,0x00000002,0x00000004,0x00000000,
+       0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
+       0x00000015,0x00000016,0x00000007,0x0004003b,0x00000008,0x00000022,0x00000007,0x0004003b,
+       0x00000008,0x00000027,0x00000007,0x0004003b,0x00000034,0x00000035,0x00000007,0x0004003b,
+       0x00000034,0x00000042,0x00000007,0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d,
+       0x0000000f,0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,0x00000012,
+       0x0003003e,0x00000009,0x00000013,0x0004003d,0x0000000b,0x00000018,0x00000017,0x0004003d,
+       0x0000000f,0x00000019,0x00000011,0x00050057,0x00000007,0x0000001a,0x00000018,0x00000019,
+       0x0008004f,0x00000014,0x0000001b,0x0000001a,0x0000001a,0x00000000,0x00000001,0x00000002,
+       0x0005008e,0x00000014,0x0000001d,0x0000001b,0x0000001c,0x00060050,0x00000014,0x0000001f,
+       0x0000001e,0x0000001e,0x0000001e,0x00050083,0x00000014,0x00000020,0x0000001d,0x0000001f,
+       0x0006000c,0x00000014,0x00000021,0x00000001,0x00000045,0x00000020,0x0003003e,0x00000016,
+       0x00000021,0x0004003d,0x0000000b,0x00000024,0x00000023,0x0004003d,0x0000000f,0x00000025,
+       0x00000011,0x00050057,0x00000007,0x00000026,0x00000024,0x00000025,0x0003003e,0x00000022,
+       0x00000026,0x00050041,0x0000002d,0x0000002e,0x0000002a,0x0000002c,0x0004003d,0x00000014,
+       0x0000002f,0x0000002e,0x00050051,0x00000006,0x00000030,0x0000002f,0x00000000,0x00050051,
+       0x00000006,0x00000031,0x0000002f,0x00000001,0x00050051,0x00000006,0x00000032,0x0000002f,
+       0x00000002,0x00070050,0x00000007,0x00000033,0x00000030,0x00000031,0x00000032,0x0000001e,
+       0x0003003e,0x00000027,0x00000033,0x0004003d,0x00000014,0x00000037,0x00000016,0x0004003d,
+       0x00000014,0x0000003a,0x00000039,0x0006000c,0x00000014,0x0000003b,0x00000001,0x00000045,
+       0x0000003a,0x00050094,0x00000006,0x0000003c,0x00000037,0x0000003b,0x0007000c,0x00000006,
+       0x0000003d,0x00000001,0x00000028,0x00000036,0x0000003c,0x0003003e,0x00000035,0x0000003d,
+       0x0004003d,0x00000006,0x0000003e,0x00000035,0x00050085,0x00000006,0x00000040,0x0000003e,
+       0x0000003f,0x00050081,0x00000006,0x00000041,0x00000040,0x0000003f,0x0003003e,0x00000035,
+       0x00000041,0x0004003d,0x00000014,0x00000044,0x00000043,0x0006000c,0x00000014,0x00000045,
+       0x00000001,0x00000045,0x00000044,0x0004003d,0x00000014,0x00000046,0x00000016,0x00050094,
+       0x00000006,0x00000047,0x00000045,0x00000046,0x0007000c,0x00000006,0x00000048,0x00000001,
+       0x00000028,0x00000047,0x00000036,0x0007000c,0x00000006,0x0000004a,0x00000001,0x0000001a,
+       0x00000048,0x00000049,0x0003003e,0x00000042,0x0000004a,0x0004003d,0x00000007,0x0000004d,
+       0x00000009,0x0008004f,0x00000014,0x0000004e,0x0000004d,0x0000004d,0x00000000,0x00000001,
+       0x00000002,0x00050041,0x00000050,0x00000051,0x0000002a,0x0000004f,0x0004003d,0x00000007,
+       0x00000052,0x00000051,0x0008004f,0x00000014,0x00000053,0x00000052,0x00000052,0x00000000,
+       0x00000001,0x00000002,0x00050085,0x00000014,0x00000054,0x0000004e,0x00000053,0x0004003d,
+       0x00000007,0x00000055,0x00000027,0x0008004f,0x00000014,0x00000056,0x00000055,0x00000055,
+       0x00000000,0x00000001,0x00000002,0x00050085,0x00000014,0x00000057,0x00000054,0x00000056,
+       0x0004003d,0x00000006,0x00000058,0x00000035,0x0005008e,0x00000014,0x00000059,0x00000057,
+       0x00000058,0x0004003d,0x00000006,0x0000005a,0x00000042,0x0004003d,0x00000007,0x0000005b,
+       0x00000022,0x0008004f,0x00000014,0x0000005c,0x0000005b,0x0000005b,0x00000000,0x00000001,
+       0x00000002,0x0005008e,0x00000014,0x0000005d,0x0000005c,0x0000005a,0x00050081,0x00000014,
+       0x0000005e,0x00000059,0x0000005d,0x00050041,0x00000034,0x00000061,0x00000009,0x00000060,
+       0x0004003d,0x00000006,0x00000062,0x00000061,0x00060041,0x00000063,0x00000064,0x0000002a,
+       0x0000004f,0x00000060,0x0004003d,0x00000006,0x00000065,0x00000064,0x00050085,0x00000006,
+       0x00000066,0x00000062,0x00000065,0x00050041,0x00000034,0x00000067,0x00000027,0x00000060,
+       0x0004003d,0x00000006,0x00000068,0x00000067,0x00050085,0x00000006,0x00000069,0x00000066,
+       0x00000068,0x00050051,0x00000006,0x0000006a,0x0000005e,0x00000000,0x00050051,0x00000006,
+       0x0000006b,0x0000005e,0x00000001,0x00050051,0x00000006,0x0000006c,0x0000005e,0x00000002,
+       0x00070050,0x00000007,0x0000006d,0x0000006a,0x0000006b,0x0000006c,0x00000069,0x0003003e,
+       0x0000004c,0x0000006d,0x000100fd,0x00010038
 };
index 513db9e..487a893 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_MESH_VISUAL_NORMAL_MAP_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x0000011d,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000011d,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x000e000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000061,0x0000009e,0x000000b5,
        0x000000cc,0x000000ec,0x00000104,0x00000112,0x00000114,0x00000119,0x00030003,0x00000002,
index 637c364..4bf94ce 100644 (file)
@@ -1,74 +1,62 @@
 std::vector<uint32_t> SHADER_MESH_VISUAL_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x0000005b,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000004b,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0009000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x0000002f,0x00000035,0x00000037,
-       0x00000046,0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,
-       0x00000004,0x6e69616d,0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,
-       0x0028726f,0x00050005,0x0000000c,0x67617246,0x61746144,0x00000000,0x00050006,0x0000000c,
-       0x00000000,0x6c6f4375,0x0000726f,0x00060006,0x0000000c,0x00000001,0x4378696d,0x726f6c6f,
-       0x00000000,0x00050006,0x0000000c,0x00000002,0x6361706f,0x00797469,0x00080006,0x0000000c,
-       0x00000003,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,
-       0x00000000,0x00040005,0x00000027,0x74786574,0x00657275,0x00050005,0x0000002b,0x66694473,
-       0x65737566,0x00000000,0x00050005,0x0000002f,0x78655476,0x726f6f43,0x00000064,0x00060005,
-       0x00000032,0x75736976,0x694d6c61,0x6c6f4378,0x0000726f,0x00050005,0x00000035,0x67617266,
-       0x6f6c6f43,0x00000072,0x00060005,0x00000037,0x6c6c4976,0x6e696d75,0x6f697461,0x0000006e,
-       0x00050005,0x00000046,0x65705376,0x616c7563,0x00000072,0x00050048,0x0000000c,0x00000000,
-       0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,0x00000010,0x00050048,
-       0x0000000c,0x00000002,0x00000023,0x0000001c,0x00050048,0x0000000c,0x00000003,0x00000023,
-       0x00000020,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,0x00000000,
-       0x00040047,0x0000000e,0x00000021,0x00000001,0x00040047,0x0000002b,0x00000022,0x00000000,
-       0x00040047,0x0000002b,0x00000021,0x00000002,0x00040047,0x0000002f,0x0000001e,0x00000000,
-       0x00040047,0x00000035,0x0000001e,0x00000000,0x00040047,0x00000037,0x0000001e,0x00000001,
-       0x00040047,0x00000046,0x0000001e,0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,
-       0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,
-       0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,0x0006001e,
-       0x0000000c,0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,0x00000002,
-       0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,0x00000020,
-       0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000001,0x00040020,0x00000011,0x00000002,
-       0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,0x0000000f,0x00000015,
-       0x00000002,0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,0x0000000f,0x00000019,
-       0x00000003,0x00040020,0x00000026,0x00000007,0x00000007,0x00090019,0x00000028,0x00000006,
-       0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x00000029,
-       0x00000028,0x00040020,0x0000002a,0x00000000,0x00000029,0x0004003b,0x0000002a,0x0000002b,
-       0x00000000,0x00040017,0x0000002d,0x00000006,0x00000002,0x00040020,0x0000002e,0x00000001,
-       0x0000002d,0x0004003b,0x0000002e,0x0000002f,0x00000001,0x00040020,0x00000034,0x00000003,
-       0x00000007,0x0004003b,0x00000034,0x00000035,0x00000003,0x00040020,0x00000036,0x00000001,
-       0x0000000b,0x0004003b,0x00000036,0x00000037,0x00000001,0x0004002b,0x0000000f,0x0000003c,
-       0x00000000,0x00040020,0x0000003d,0x00000002,0x00000007,0x00040020,0x00000045,0x00000001,
-       0x00000006,0x0004003b,0x00000045,0x00000046,0x00000001,0x0004002b,0x00000006,0x00000048,
-       0x3e99999a,0x00040015,0x0000004c,0x00000020,0x00000000,0x0004002b,0x0000004c,0x0000004d,
-       0x00000003,0x00040020,0x0000004e,0x00000007,0x00000006,0x00050036,0x00000002,0x00000004,
-       0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000026,0x00000027,0x00000007,
-       0x0004003b,0x00000026,0x00000032,0x00000007,0x0004003d,0x00000029,0x0000002c,0x0000002b,
-       0x0004003d,0x0000002d,0x00000030,0x0000002f,0x00050057,0x00000007,0x00000031,0x0000002c,
-       0x00000030,0x0003003e,0x00000027,0x00000031,0x00040039,0x00000007,0x00000033,0x00000009,
-       0x0003003e,0x00000032,0x00000033,0x0004003d,0x0000000b,0x00000038,0x00000037,0x0004003d,
-       0x00000007,0x00000039,0x00000027,0x0008004f,0x0000000b,0x0000003a,0x00000039,0x00000039,
-       0x00000000,0x00000001,0x00000002,0x00050085,0x0000000b,0x0000003b,0x00000038,0x0000003a,
-       0x00050041,0x0000003d,0x0000003e,0x0000000e,0x0000003c,0x0004003d,0x00000007,0x0000003f,
-       0x0000003e,0x0008004f,0x0000000b,0x00000040,0x0000003f,0x0000003f,0x00000000,0x00000001,
-       0x00000002,0x00050085,0x0000000b,0x00000041,0x0000003b,0x00000040,0x0004003d,0x00000007,
-       0x00000042,0x00000032,0x0008004f,0x0000000b,0x00000043,0x00000042,0x00000042,0x00000000,
-       0x00000001,0x00000002,0x00050085,0x0000000b,0x00000044,0x00000041,0x00000043,0x0004003d,
-       0x00000006,0x00000047,0x00000046,0x00050085,0x00000006,0x00000049,0x00000047,0x00000048,
-       0x00060050,0x0000000b,0x0000004a,0x00000049,0x00000049,0x00000049,0x00050081,0x0000000b,
-       0x0000004b,0x00000044,0x0000004a,0x00050041,0x0000004e,0x0000004f,0x00000027,0x0000004d,
-       0x0004003d,0x00000006,0x00000050,0x0000004f,0x00060041,0x00000016,0x00000051,0x0000000e,
-       0x0000003c,0x0000004d,0x0004003d,0x00000006,0x00000052,0x00000051,0x00050085,0x00000006,
-       0x00000053,0x00000050,0x00000052,0x00050041,0x0000004e,0x00000054,0x00000032,0x0000004d,
-       0x0004003d,0x00000006,0x00000055,0x00000054,0x00050085,0x00000006,0x00000056,0x00000053,
-       0x00000055,0x00050051,0x00000006,0x00000057,0x0000004b,0x00000000,0x00050051,0x00000006,
-       0x00000058,0x0000004b,0x00000001,0x00050051,0x00000006,0x00000059,0x0000004b,0x00000002,
-       0x00070050,0x00000007,0x0000005a,0x00000057,0x00000058,0x00000059,0x00000056,0x0003003e,
-       0x00000035,0x0000005a,0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,0x00000000,
-       0x00000008,0x000200f8,0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,
-       0x0004003d,0x0000000b,0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,0x0000000e,
-       0x00000015,0x0004003d,0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,0x0000001a,
-       0x0000000e,0x00000019,0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,0x00000006,
-       0x0000001c,0x00000001,0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,0x0000000b,
-       0x0000001d,0x00000013,0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,0x00000015,
-       0x0004003d,0x00000006,0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,0x0000001d,
-       0x00000000,0x00050051,0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,0x00000006,
-       0x00000022,0x0000001d,0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,0x00000021,
-       0x00000022,0x0000001f,0x000200fe,0x00000023,0x00010038
+       0x0009000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x00000024,0x00000026,
+       0x00000035,0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,
+       0x00000004,0x6e69616d,0x00000000,0x00040005,0x00000009,0x74786574,0x00657275,0x00050005,
+       0x0000000d,0x66694473,0x65737566,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,
+       0x00000064,0x00060005,0x00000014,0x75736976,0x694d6c61,0x6c6f4378,0x0000726f,0x00050005,
+       0x00000016,0x67617246,0x61746144,0x00000000,0x00050006,0x00000016,0x00000000,0x6c6f4375,
+       0x0000726f,0x00060006,0x00000016,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00030005,
+       0x00000018,0x00000000,0x00050005,0x00000024,0x67617266,0x6f6c6f43,0x00000072,0x00060005,
+       0x00000026,0x6c6c4976,0x6e696d75,0x6f697461,0x0000006e,0x00050005,0x00000035,0x65705376,
+       0x616c7563,0x00000072,0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,0x0000000d,
+       0x00000021,0x00000002,0x00040047,0x00000011,0x0000001e,0x00000000,0x00050048,0x00000016,
+       0x00000000,0x00000023,0x00000000,0x00050048,0x00000016,0x00000001,0x00000023,0x00000010,
+       0x00030047,0x00000016,0x00000002,0x00040047,0x00000018,0x00000022,0x00000000,0x00040047,
+       0x00000018,0x00000021,0x00000001,0x00040047,0x00000024,0x0000001e,0x00000000,0x00040047,
+       0x00000026,0x0000001e,0x00000001,0x00040047,0x00000035,0x0000001e,0x00000002,0x00020013,
+       0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,
+       0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000007,0x00000007,0x00090019,
+       0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,
+       0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,0x00000000,0x0000000b,0x0004003b,
+       0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,0x00000006,0x00000002,0x00040020,
+       0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,0x00000011,0x00000001,0x00040017,
+       0x00000015,0x00000006,0x00000003,0x0004001e,0x00000016,0x00000007,0x00000015,0x00040020,
+       0x00000017,0x00000002,0x00000016,0x0004003b,0x00000017,0x00000018,0x00000002,0x00040015,
+       0x00000019,0x00000020,0x00000001,0x0004002b,0x00000019,0x0000001a,0x00000001,0x00040020,
+       0x0000001b,0x00000002,0x00000015,0x0004002b,0x00000006,0x0000001e,0x3f800000,0x00040020,
+       0x00000023,0x00000003,0x00000007,0x0004003b,0x00000023,0x00000024,0x00000003,0x00040020,
+       0x00000025,0x00000001,0x00000015,0x0004003b,0x00000025,0x00000026,0x00000001,0x0004002b,
+       0x00000019,0x0000002b,0x00000000,0x00040020,0x0000002c,0x00000002,0x00000007,0x00040020,
+       0x00000034,0x00000001,0x00000006,0x0004003b,0x00000034,0x00000035,0x00000001,0x0004002b,
+       0x00000006,0x00000037,0x3e99999a,0x00040015,0x0000003b,0x00000020,0x00000000,0x0004002b,
+       0x0000003b,0x0000003c,0x00000003,0x00040020,0x0000003d,0x00000007,0x00000006,0x00040020,
+       0x00000040,0x00000002,0x00000006,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
+       0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,
+       0x00000014,0x00000007,0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d,0x0000000f,
+       0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,0x00000012,0x0003003e,
+       0x00000009,0x00000013,0x00050041,0x0000001b,0x0000001c,0x00000018,0x0000001a,0x0004003d,
+       0x00000015,0x0000001d,0x0000001c,0x00050051,0x00000006,0x0000001f,0x0000001d,0x00000000,
+       0x00050051,0x00000006,0x00000020,0x0000001d,0x00000001,0x00050051,0x00000006,0x00000021,
+       0x0000001d,0x00000002,0x00070050,0x00000007,0x00000022,0x0000001f,0x00000020,0x00000021,
+       0x0000001e,0x0003003e,0x00000014,0x00000022,0x0004003d,0x00000015,0x00000027,0x00000026,
+       0x0004003d,0x00000007,0x00000028,0x00000009,0x0008004f,0x00000015,0x00000029,0x00000028,
+       0x00000028,0x00000000,0x00000001,0x00000002,0x00050085,0x00000015,0x0000002a,0x00000027,
+       0x00000029,0x00050041,0x0000002c,0x0000002d,0x00000018,0x0000002b,0x0004003d,0x00000007,
+       0x0000002e,0x0000002d,0x0008004f,0x00000015,0x0000002f,0x0000002e,0x0000002e,0x00000000,
+       0x00000001,0x00000002,0x00050085,0x00000015,0x00000030,0x0000002a,0x0000002f,0x0004003d,
+       0x00000007,0x00000031,0x00000014,0x0008004f,0x00000015,0x00000032,0x00000031,0x00000031,
+       0x00000000,0x00000001,0x00000002,0x00050085,0x00000015,0x00000033,0x00000030,0x00000032,
+       0x0004003d,0x00000006,0x00000036,0x00000035,0x00050085,0x00000006,0x00000038,0x00000036,
+       0x00000037,0x00060050,0x00000015,0x00000039,0x00000038,0x00000038,0x00000038,0x00050081,
+       0x00000015,0x0000003a,0x00000033,0x00000039,0x00050041,0x0000003d,0x0000003e,0x00000009,
+       0x0000003c,0x0004003d,0x00000006,0x0000003f,0x0000003e,0x00060041,0x00000040,0x00000041,
+       0x00000018,0x0000002b,0x0000003c,0x0004003d,0x00000006,0x00000042,0x00000041,0x00050085,
+       0x00000006,0x00000043,0x0000003f,0x00000042,0x00050041,0x0000003d,0x00000044,0x00000014,
+       0x0000003c,0x0004003d,0x00000006,0x00000045,0x00000044,0x00050085,0x00000006,0x00000046,
+       0x00000043,0x00000045,0x00050051,0x00000006,0x00000047,0x0000003a,0x00000000,0x00050051,
+       0x00000006,0x00000048,0x0000003a,0x00000001,0x00050051,0x00000006,0x00000049,0x0000003a,
+       0x00000002,0x00070050,0x00000007,0x0000004a,0x00000047,0x00000048,0x00000049,0x00000046,
+       0x0003003e,0x00000024,0x0000004a,0x000100fd,0x00010038
 };
index faac020..9473e34 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_MESH_VISUAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x000000e8,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x000000e8,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x000c000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000061,0x0000009e,0x000000c9,
        0x000000d5,0x000000dd,0x000000df,0x000000e4,0x00030003,0x00000002,0x000001ae,0x00040005,
index 8a794f0..973a186 100644 (file)
@@ -1,49 +1,37 @@
 std::vector<uint32_t> SHADER_MESH_VISUAL_SIMPLE_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x0000003b,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000002b,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000027,0x00000029,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x0000000c,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00050006,0x0000000c,0x00000000,0x6c6f4375,
-       0x0000726f,0x00060006,0x0000000c,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00050006,
-       0x0000000c,0x00000002,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000003,0x4d657270,
-       0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,
-       0x00000027,0x67617266,0x6f6c6f43,0x00000072,0x00060005,0x00000029,0x6c6c4976,0x6e696d75,
-       0x6f697461,0x0000006e,0x00050048,0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,
-       0x0000000c,0x00000001,0x00000023,0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,
-       0x0000001c,0x00050048,0x0000000c,0x00000003,0x00000023,0x00000020,0x00030047,0x0000000c,
-       0x00000002,0x00040047,0x0000000e,0x00000022,0x00000000,0x00040047,0x0000000e,0x00000021,
-       0x00000001,0x00040047,0x00000027,0x0000001e,0x00000000,0x00040047,0x00000029,0x0000001e,
-       0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
-       0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00030021,0x00000008,0x00000007,
-       0x00040017,0x0000000b,0x00000006,0x00000003,0x0006001e,0x0000000c,0x00000007,0x0000000b,
-       0x00000006,0x00000006,0x00040020,0x0000000d,0x00000002,0x0000000c,0x0004003b,0x0000000d,
-       0x0000000e,0x00000002,0x00040015,0x0000000f,0x00000020,0x00000001,0x0004002b,0x0000000f,
-       0x00000010,0x00000001,0x00040020,0x00000011,0x00000002,0x0000000b,0x0004002b,0x00000006,
-       0x00000014,0x3f800000,0x0004002b,0x0000000f,0x00000015,0x00000002,0x00040020,0x00000016,
-       0x00000002,0x00000006,0x0004002b,0x0000000f,0x00000019,0x00000003,0x00040020,0x00000026,
-       0x00000003,0x00000007,0x0004003b,0x00000026,0x00000027,0x00000003,0x00040020,0x00000028,
-       0x00000001,0x0000000b,0x0004003b,0x00000028,0x00000029,0x00000001,0x0004002b,0x0000000f,
-       0x0000002b,0x00000000,0x00040020,0x0000002c,0x00000002,0x00000007,0x00040015,0x00000031,
-       0x00000020,0x00000000,0x0004002b,0x00000031,0x00000032,0x00000003,0x00050036,0x00000002,
-       0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003d,0x0000000b,0x0000002a,
-       0x00000029,0x00050041,0x0000002c,0x0000002d,0x0000000e,0x0000002b,0x0004003d,0x00000007,
-       0x0000002e,0x0000002d,0x0008004f,0x0000000b,0x0000002f,0x0000002e,0x0000002e,0x00000000,
-       0x00000001,0x00000002,0x00050085,0x0000000b,0x00000030,0x0000002a,0x0000002f,0x00060041,
-       0x00000016,0x00000033,0x0000000e,0x0000002b,0x00000032,0x0004003d,0x00000006,0x00000034,
-       0x00000033,0x00050051,0x00000006,0x00000035,0x00000030,0x00000000,0x00050051,0x00000006,
-       0x00000036,0x00000030,0x00000001,0x00050051,0x00000006,0x00000037,0x00000030,0x00000002,
-       0x00070050,0x00000007,0x00000038,0x00000035,0x00000036,0x00000037,0x00000034,0x00040039,
-       0x00000007,0x00000039,0x00000009,0x00050085,0x00000007,0x0000003a,0x00000038,0x00000039,
-       0x0003003e,0x00000027,0x0000003a,0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,
-       0x00000000,0x00000008,0x000200f8,0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,
-       0x00000010,0x0004003d,0x0000000b,0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,
-       0x0000000e,0x00000015,0x0004003d,0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,
-       0x0000001a,0x0000000e,0x00000019,0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,
-       0x00000006,0x0000001c,0x00000001,0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,
-       0x0000000b,0x0000001d,0x00000013,0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,
-       0x00000015,0x0004003d,0x00000006,0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,
-       0x0000001d,0x00000000,0x00050051,0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,
-       0x00000006,0x00000022,0x0000001d,0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,
-       0x00000021,0x00000022,0x0000001f,0x000200fe,0x00000023,0x00010038
+       0x00000000,0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00060005,0x0000000c,
+       0x6c6c4976,0x6e696d75,0x6f697461,0x0000006e,0x00050005,0x0000000e,0x67617246,0x61746144,
+       0x00000000,0x00050006,0x0000000e,0x00000000,0x6c6f4375,0x0000726f,0x00060006,0x0000000e,
+       0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00030005,0x00000010,0x00000000,0x00040047,
+       0x00000009,0x0000001e,0x00000000,0x00040047,0x0000000c,0x0000001e,0x00000000,0x00050048,
+       0x0000000e,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000e,0x00000001,0x00000023,
+       0x00000010,0x00030047,0x0000000e,0x00000002,0x00040047,0x00000010,0x00000022,0x00000000,
+       0x00040047,0x00000010,0x00000021,0x00000001,0x00020013,0x00000002,0x00030021,0x00000003,
+       0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,
+       0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,
+       0x00040017,0x0000000a,0x00000006,0x00000003,0x00040020,0x0000000b,0x00000001,0x0000000a,
+       0x0004003b,0x0000000b,0x0000000c,0x00000001,0x0004001e,0x0000000e,0x00000007,0x0000000a,
+       0x00040020,0x0000000f,0x00000002,0x0000000e,0x0004003b,0x0000000f,0x00000010,0x00000002,
+       0x00040015,0x00000011,0x00000020,0x00000001,0x0004002b,0x00000011,0x00000012,0x00000000,
+       0x00040020,0x00000013,0x00000002,0x00000007,0x00040015,0x00000018,0x00000020,0x00000000,
+       0x0004002b,0x00000018,0x00000019,0x00000003,0x00040020,0x0000001a,0x00000002,0x00000006,
+       0x0004002b,0x00000011,0x00000021,0x00000001,0x00040020,0x00000022,0x00000002,0x0000000a,
+       0x0004002b,0x00000006,0x00000025,0x3f800000,0x00050036,0x00000002,0x00000004,0x00000000,
+       0x00000003,0x000200f8,0x00000005,0x0004003d,0x0000000a,0x0000000d,0x0000000c,0x00050041,
+       0x00000013,0x00000014,0x00000010,0x00000012,0x0004003d,0x00000007,0x00000015,0x00000014,
+       0x0008004f,0x0000000a,0x00000016,0x00000015,0x00000015,0x00000000,0x00000001,0x00000002,
+       0x00050085,0x0000000a,0x00000017,0x0000000d,0x00000016,0x00060041,0x0000001a,0x0000001b,
+       0x00000010,0x00000012,0x00000019,0x0004003d,0x00000006,0x0000001c,0x0000001b,0x00050051,
+       0x00000006,0x0000001d,0x00000017,0x00000000,0x00050051,0x00000006,0x0000001e,0x00000017,
+       0x00000001,0x00050051,0x00000006,0x0000001f,0x00000017,0x00000002,0x00070050,0x00000007,
+       0x00000020,0x0000001d,0x0000001e,0x0000001f,0x0000001c,0x00050041,0x00000022,0x00000023,
+       0x00000010,0x00000021,0x0004003d,0x0000000a,0x00000024,0x00000023,0x00050051,0x00000006,
+       0x00000026,0x00000024,0x00000000,0x00050051,0x00000006,0x00000027,0x00000024,0x00000001,
+       0x00050051,0x00000006,0x00000028,0x00000024,0x00000002,0x00070050,0x00000007,0x00000029,
+       0x00000026,0x00000027,0x00000028,0x00000025,0x00050085,0x00000007,0x0000002a,0x00000020,
+       0x00000029,0x0003003e,0x00000009,0x0000002a,0x000100fd,0x00010038
 };
index d136a42..0ca1865 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_MESH_VISUAL_SIMPLE_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x000000cf,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x000000cf,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000061,0x0000009e,0x000000c2,
        0x000000cb,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
index e053c18..bc7d507 100644 (file)
 std::vector<uint32_t> SHADER_NPATCH_VISUAL_3X3_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x0000009b,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x000000a2,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000039,0x00000086,0x00000096,
-       0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,
-       0x00000009,0x75736976,0x69536c61,0x0000657a,0x00050005,0x00000010,0x74726556,0x61746144,
-       0x00000000,0x00070006,0x00000010,0x00000000,0x646f4d75,0x614d6c65,0x78697274,0x00000000,
-       0x00060006,0x00000010,0x00000001,0x70764d75,0x7274614d,0x00007869,0x00050006,0x00000010,
-       0x00000002,0x7a695375,0x00000065,0x00050006,0x00000010,0x00000003,0x78694675,0x00006465,
-       0x00070006,0x00000010,0x00000004,0x72745375,0x68637465,0x61746f54,0x0000006c,0x00050006,
-       0x00000010,0x00000005,0x7366666f,0x00007465,0x00050006,0x00000010,0x00000006,0x657a6973,
-       0x00000000,0x00070006,0x00000010,0x00000007,0x7366666f,0x69537465,0x6f4d657a,0x00006564,
-       0x00050006,0x00000010,0x00000008,0x6769726f,0x00006e69,0x00060006,0x00000010,0x00000009,
-       0x68636e61,0x6f50726f,0x00746e69,0x00030005,0x00000012,0x00000000,0x00060005,0x00000026,
-       0x75736976,0x664f6c61,0x74657366,0x00000000,0x00040005,0x00000034,0x657a6973,0x00000000,
-       0x00050005,0x00000036,0x65786966,0x63614664,0x00726f74,0x00050005,0x00000039,0x736f5061,
-       0x6f697469,0x0000006e,0x00040005,0x0000004f,0x65727473,0x00686374,0x00050005,0x00000053,
-       0x65786966,0x746f5464,0x00006c61,0x00060005,0x00000057,0x74726576,0x6f507865,0x69746973,
-       0x00006e6f,0x00050005,0x00000086,0x78655476,0x726f6f43,0x00000064,0x00060005,0x00000094,
-       0x505f6c67,0x65567265,0x78657472,0x00000000,0x00060006,0x00000094,0x00000000,0x505f6c67,
-       0x7469736f,0x006e6f69,0x00070006,0x00000094,0x00000001,0x505f6c67,0x746e696f,0x657a6953,
-       0x00000000,0x00070006,0x00000094,0x00000002,0x435f6c67,0x4470696c,0x61747369,0x0065636e,
-       0x00030005,0x00000096,0x00000000,0x00040047,0x0000000f,0x00000006,0x00000010,0x00040048,
-       0x00000010,0x00000000,0x00000005,0x00050048,0x00000010,0x00000000,0x00000023,0x00000000,
-       0x00050048,0x00000010,0x00000000,0x00000007,0x00000010,0x00040048,0x00000010,0x00000001,
-       0x00000005,0x00050048,0x00000010,0x00000001,0x00000023,0x00000040,0x00050048,0x00000010,
-       0x00000001,0x00000007,0x00000010,0x00050048,0x00000010,0x00000002,0x00000023,0x00000080,
-       0x00050048,0x00000010,0x00000003,0x00000023,0x00000090,0x00050048,0x00000010,0x00000004,
-       0x00000023,0x000000c0,0x00050048,0x00000010,0x00000005,0x00000023,0x000000c8,0x00050048,
-       0x00000010,0x00000006,0x00000023,0x000000d0,0x00050048,0x00000010,0x00000007,0x00000023,
-       0x000000e0,0x00050048,0x00000010,0x00000008,0x00000023,0x000000f0,0x00050048,0x00000010,
-       0x00000009,0x00000023,0x000000f8,0x00030047,0x00000010,0x00000002,0x00040047,0x00000012,
-       0x00000022,0x00000000,0x00040047,0x00000012,0x00000021,0x00000000,0x00040047,0x00000039,
-       0x0000001e,0x00000000,0x00040047,0x00000086,0x0000001e,0x00000000,0x00050048,0x00000094,
-       0x00000000,0x0000000b,0x00000000,0x00050048,0x00000094,0x00000001,0x0000000b,0x00000001,
-       0x00050048,0x00000094,0x00000002,0x0000000b,0x00000003,0x00030047,0x00000094,0x00000002,
-       0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
-       0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,0x00000007,0x00000007,
-       0x00040017,0x0000000a,0x00000006,0x00000004,0x00040018,0x0000000b,0x0000000a,0x00000004,
-       0x00040017,0x0000000c,0x00000006,0x00000003,0x00040015,0x0000000d,0x00000020,0x00000000,
-       0x0004002b,0x0000000d,0x0000000e,0x00000003,0x0004001c,0x0000000f,0x00000007,0x0000000e,
-       0x000c001e,0x00000010,0x0000000b,0x0000000b,0x0000000c,0x0000000f,0x00000007,0x00000007,
-       0x00000007,0x0000000a,0x00000007,0x00000007,0x00040020,0x00000011,0x00000002,0x00000010,
-       0x0004003b,0x00000011,0x00000012,0x00000002,0x00040015,0x00000013,0x00000020,0x00000001,
-       0x0004002b,0x00000013,0x00000014,0x00000002,0x00040020,0x00000015,0x00000002,0x0000000c,
-       0x0004002b,0x00000013,0x00000019,0x00000006,0x00040020,0x0000001a,0x00000002,0x00000007,
-       0x0004002b,0x00000013,0x00000020,0x00000007,0x00040020,0x00000021,0x00000002,0x0000000a,
-       0x0004002b,0x00000013,0x00000027,0x00000005,0x0004002b,0x00000013,0x00000037,0x00000003,
-       0x00040020,0x00000038,0x00000001,0x00000007,0x0004003b,0x00000038,0x00000039,0x00000001,
-       0x0004002b,0x0000000d,0x0000003a,0x00000000,0x00040020,0x0000003b,0x00000001,0x00000006,
-       0x0004002b,0x00000006,0x0000003e,0x3f800000,0x0004002b,0x00000006,0x00000040,0x3f000000,
-       0x00040020,0x00000043,0x00000002,0x00000006,0x0004002b,0x0000000d,0x00000046,0x00000001,
-       0x00040020,0x00000056,0x00000007,0x0000000a,0x0004002b,0x00000006,0x0000005f,0x00000000,
-       0x0005002c,0x00000007,0x00000064,0x00000040,0x00000040,0x0004002b,0x00000013,0x0000006d,
-       0x00000009,0x0004002b,0x00000013,0x00000074,0x00000008,0x0004002b,0x00000013,0x0000007f,
-       0x00000001,0x00040020,0x00000080,0x00000002,0x0000000b,0x00040020,0x00000085,0x00000003,
-       0x00000007,0x0004003b,0x00000085,0x00000086,0x00000003,0x0004002b,0x00000013,0x00000089,
-       0x00000004,0x0004001c,0x00000093,0x00000006,0x00000046,0x0005001e,0x00000094,0x0000000a,
-       0x00000006,0x00000093,0x00040020,0x00000095,0x00000003,0x00000094,0x0004003b,0x00000095,
-       0x00000096,0x00000003,0x0004002b,0x00000013,0x00000097,0x00000000,0x00040020,0x00000099,
-       0x00000003,0x0000000a,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
-       0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,0x00000026,
-       0x00000007,0x0004003b,0x00000008,0x00000034,0x00000007,0x0004003b,0x00000008,0x00000036,
-       0x00000007,0x0004003b,0x00000008,0x0000004f,0x00000007,0x0004003b,0x00000008,0x00000053,
-       0x00000007,0x0004003b,0x00000056,0x00000057,0x00000007,0x00050041,0x00000015,0x00000016,
-       0x00000012,0x00000014,0x0004003d,0x0000000c,0x00000017,0x00000016,0x0007004f,0x00000007,
-       0x00000018,0x00000017,0x00000017,0x00000000,0x00000001,0x00050041,0x0000001a,0x0000001b,
-       0x00000012,0x00000019,0x0004003d,0x00000007,0x0000001c,0x0000001b,0x00050085,0x00000007,
-       0x0000001d,0x00000018,0x0000001c,0x00050041,0x0000001a,0x0000001e,0x00000012,0x00000019,
-       0x0004003d,0x00000007,0x0000001f,0x0000001e,0x00050041,0x00000021,0x00000022,0x00000012,
-       0x00000020,0x0004003d,0x0000000a,0x00000023,0x00000022,0x0007004f,0x00000007,0x00000024,
-       0x00000023,0x00000023,0x00000002,0x00000003,0x0008000c,0x00000007,0x00000025,0x00000001,
-       0x0000002e,0x0000001d,0x0000001f,0x00000024,0x0003003e,0x00000009,0x00000025,0x00050041,
-       0x0000001a,0x00000028,0x00000012,0x00000027,0x0004003d,0x00000007,0x00000029,0x00000028,
-       0x00050041,0x0000001a,0x0000002a,0x00000012,0x00000027,0x0004003d,0x00000007,0x0000002b,
-       0x0000002a,0x00050041,0x00000015,0x0000002c,0x00000012,0x00000014,0x0004003d,0x0000000c,
-       0x0000002d,0x0000002c,0x0007004f,0x00000007,0x0000002e,0x0000002d,0x0000002d,0x00000000,
-       0x00000001,0x00050088,0x00000007,0x0000002f,0x0000002b,0x0000002e,0x00050041,0x00000021,
-       0x00000030,0x00000012,0x00000020,0x0004003d,0x0000000a,0x00000031,0x00000030,0x0007004f,
-       0x00000007,0x00000032,0x00000031,0x00000031,0x00000000,0x00000001,0x0008000c,0x00000007,
-       0x00000033,0x00000001,0x0000002e,0x00000029,0x0000002f,0x00000032,0x0003003e,0x00000026,
-       0x00000033,0x0004003d,0x00000007,0x00000035,0x00000009,0x0003003e,0x00000034,0x00000035,
-       0x00050041,0x0000003b,0x0000003c,0x00000039,0x0000003a,0x0004003d,0x00000006,0x0000003d,
-       0x0000003c,0x00050081,0x00000006,0x0000003f,0x0000003d,0x0000003e,0x00050085,0x00000006,
-       0x00000041,0x0000003f,0x00000040,0x0004006e,0x00000013,0x00000042,0x00000041,0x00070041,
-       0x00000043,0x00000044,0x00000012,0x00000037,0x00000042,0x0000003a,0x0004003d,0x00000006,
-       0x00000045,0x00000044,0x00050041,0x0000003b,0x00000047,0x00000039,0x00000046,0x0004003d,
-       0x00000006,0x00000048,0x00000047,0x00050081,0x00000006,0x00000049,0x00000048,0x0000003e,
-       0x00050085,0x00000006,0x0000004a,0x00000049,0x00000040,0x0004006e,0x00000013,0x0000004b,
-       0x0000004a,0x00070041,0x00000043,0x0000004c,0x00000012,0x00000037,0x0000004b,0x00000046,
-       0x0004003d,0x00000006,0x0000004d,0x0000004c,0x00050050,0x00000007,0x0000004e,0x00000045,
-       0x0000004d,0x0003003e,0x00000036,0x0000004e,0x0004003d,0x00000007,0x00000050,0x00000039,
-       0x0005008e,0x00000007,0x00000051,0x00000050,0x00000040,0x0006000c,0x00000007,0x00000052,
-       0x00000001,0x00000008,0x00000051,0x0003003e,0x0000004f,0x00000052,0x00060041,0x0000001a,
-       0x00000054,0x00000012,0x00000037,0x00000014,0x0004003d,0x00000007,0x00000055,0x00000054,
-       0x0003003e,0x00000053,0x00000055,0x0004003d,0x00000007,0x00000058,0x00000036,0x0004003d,
-       0x00000007,0x00000059,0x00000034,0x0004003d,0x00000007,0x0000005a,0x00000053,0x00050083,
-       0x00000007,0x0000005b,0x00000059,0x0000005a,0x0004003d,0x00000007,0x0000005c,0x0000004f,
-       0x00050085,0x00000007,0x0000005d,0x0000005b,0x0000005c,0x00050081,0x00000007,0x0000005e,
-       0x00000058,0x0000005d,0x00050051,0x00000006,0x00000060,0x0000005e,0x00000000,0x00050051,
-       0x00000006,0x00000061,0x0000005e,0x00000001,0x00070050,0x0000000a,0x00000062,0x00000060,
-       0x00000061,0x0000005f,0x0000003e,0x0003003e,0x00000057,0x00000062,0x0004003d,0x00000007,
-       0x00000063,0x00000034,0x00050085,0x00000007,0x00000065,0x00000063,0x00000064,0x0004003d,
-       0x0000000a,0x00000066,0x00000057,0x0007004f,0x00000007,0x00000067,0x00000066,0x00000066,
-       0x00000000,0x00000001,0x00050083,0x00000007,0x00000068,0x00000067,0x00000065,0x0004003d,
-       0x0000000a,0x00000069,0x00000057,0x0009004f,0x0000000a,0x0000006a,0x00000069,0x00000068,
-       0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x00000057,0x0000006a,0x0004003d,
-       0x0000000a,0x0000006b,0x00000057,0x0007004f,0x00000007,0x0000006c,0x0000006b,0x0000006b,
-       0x00000000,0x00000001,0x00050041,0x0000001a,0x0000006e,0x00000012,0x0000006d,0x0004003d,
-       0x00000007,0x0000006f,0x0000006e,0x0004003d,0x00000007,0x00000070,0x00000034,0x00050085,
-       0x00000007,0x00000071,0x0000006f,0x00000070,0x00050081,0x00000007,0x00000072,0x0000006c,
-       0x00000071,0x0004003d,0x00000007,0x00000073,0x00000026,0x00050041,0x0000001a,0x00000075,
-       0x00000012,0x00000074,0x0004003d,0x00000007,0x00000076,0x00000075,0x00050081,0x00000007,
-       0x00000077,0x00000073,0x00000076,0x00050041,0x00000015,0x00000078,0x00000012,0x00000014,
-       0x0004003d,0x0000000c,0x00000079,0x00000078,0x0007004f,0x00000007,0x0000007a,0x00000079,
-       0x00000079,0x00000000,0x00000001,0x00050085,0x00000007,0x0000007b,0x00000077,0x0000007a,
-       0x00050081,0x00000007,0x0000007c,0x00000072,0x0000007b,0x0004003d,0x0000000a,0x0000007d,
-       0x00000057,0x0009004f,0x0000000a,0x0000007e,0x0000007d,0x0000007c,0x00000004,0x00000005,
-       0x00000002,0x00000003,0x0003003e,0x00000057,0x0000007e,0x00050041,0x00000080,0x00000081,
-       0x00000012,0x0000007f,0x0004003d,0x0000000b,0x00000082,0x00000081,0x0004003d,0x0000000a,
-       0x00000083,0x00000057,0x00050091,0x0000000a,0x00000084,0x00000082,0x00000083,0x0003003e,
-       0x00000057,0x00000084,0x0004003d,0x00000007,0x00000087,0x00000036,0x0004003d,0x00000007,
-       0x00000088,0x0000004f,0x00050041,0x0000001a,0x0000008a,0x00000012,0x00000089,0x0004003d,
-       0x00000007,0x0000008b,0x0000008a,0x00050085,0x00000007,0x0000008c,0x00000088,0x0000008b,
-       0x00050081,0x00000007,0x0000008d,0x00000087,0x0000008c,0x0004003d,0x00000007,0x0000008e,
-       0x00000053,0x00050041,0x0000001a,0x0000008f,0x00000012,0x00000089,0x0004003d,0x00000007,
-       0x00000090,0x0000008f,0x00050081,0x00000007,0x00000091,0x0000008e,0x00000090,0x00050088,
-       0x00000007,0x00000092,0x0000008d,0x00000091,0x0003003e,0x00000086,0x00000092,0x0004003d,
-       0x0000000a,0x00000098,0x00000057,0x00050041,0x00000099,0x0000009a,0x00000096,0x00000097,
-       0x0003003e,0x0000009a,0x00000098,0x000100fd,0x00010038
+       0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000039,0x00000088,0x00000095,
+       0x0000009d,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
+       0x00050005,0x00000009,0x75736976,0x69536c61,0x0000657a,0x00050005,0x00000010,0x74726556,
+       0x61746144,0x00000000,0x00070006,0x00000010,0x00000000,0x646f4d75,0x614d6c65,0x78697274,
+       0x00000000,0x00060006,0x00000010,0x00000001,0x70764d75,0x7274614d,0x00007869,0x00050006,
+       0x00000010,0x00000002,0x7a695375,0x00000065,0x00050006,0x00000010,0x00000003,0x78694675,
+       0x00006465,0x00070006,0x00000010,0x00000004,0x72745375,0x68637465,0x61746f54,0x0000006c,
+       0x00050006,0x00000010,0x00000005,0x7366666f,0x00007465,0x00050006,0x00000010,0x00000006,
+       0x657a6973,0x00000000,0x00070006,0x00000010,0x00000007,0x7366666f,0x69537465,0x6f4d657a,
+       0x00006564,0x00050006,0x00000010,0x00000008,0x6769726f,0x00006e69,0x00060006,0x00000010,
+       0x00000009,0x68636e61,0x6f50726f,0x00746e69,0x00030005,0x00000012,0x00000000,0x00060005,
+       0x00000026,0x75736976,0x664f6c61,0x74657366,0x00000000,0x00040005,0x00000034,0x657a6973,
+       0x00000000,0x00050005,0x00000036,0x65786966,0x63614664,0x00726f74,0x00050005,0x00000039,
+       0x736f5061,0x6f697469,0x0000006e,0x00040005,0x0000004f,0x65727473,0x00686374,0x00050005,
+       0x00000053,0x65786966,0x746f5464,0x00006c61,0x00060005,0x00000057,0x64697267,0x69736f50,
+       0x6e6f6974,0x00000000,0x00060005,0x00000063,0x74726576,0x6f507865,0x69746973,0x00006e6f,
+       0x00050005,0x00000088,0x78655476,0x726f6f43,0x00000064,0x00060005,0x00000095,0x73614d76,
+       0x7865546b,0x726f6f43,0x00000064,0x00060005,0x0000009b,0x505f6c67,0x65567265,0x78657472,
+       0x00000000,0x00060006,0x0000009b,0x00000000,0x505f6c67,0x7469736f,0x006e6f69,0x00070006,
+       0x0000009b,0x00000001,0x505f6c67,0x746e696f,0x657a6953,0x00000000,0x00070006,0x0000009b,
+       0x00000002,0x435f6c67,0x4470696c,0x61747369,0x0065636e,0x00030005,0x0000009d,0x00000000,
+       0x00040047,0x0000000f,0x00000006,0x00000010,0x00040048,0x00000010,0x00000000,0x00000005,
+       0x00050048,0x00000010,0x00000000,0x00000023,0x00000000,0x00050048,0x00000010,0x00000000,
+       0x00000007,0x00000010,0x00040048,0x00000010,0x00000001,0x00000005,0x00050048,0x00000010,
+       0x00000001,0x00000023,0x00000040,0x00050048,0x00000010,0x00000001,0x00000007,0x00000010,
+       0x00050048,0x00000010,0x00000002,0x00000023,0x00000080,0x00050048,0x00000010,0x00000003,
+       0x00000023,0x00000090,0x00050048,0x00000010,0x00000004,0x00000023,0x000000c0,0x00050048,
+       0x00000010,0x00000005,0x00000023,0x000000c8,0x00050048,0x00000010,0x00000006,0x00000023,
+       0x000000d0,0x00050048,0x00000010,0x00000007,0x00000023,0x000000e0,0x00050048,0x00000010,
+       0x00000008,0x00000023,0x000000f0,0x00050048,0x00000010,0x00000009,0x00000023,0x000000f8,
+       0x00030047,0x00000010,0x00000002,0x00040047,0x00000012,0x00000022,0x00000000,0x00040047,
+       0x00000012,0x00000021,0x00000000,0x00040047,0x00000039,0x0000001e,0x00000000,0x00040047,
+       0x00000088,0x0000001e,0x00000000,0x00040047,0x00000095,0x0000001e,0x00000001,0x00050048,
+       0x0000009b,0x00000000,0x0000000b,0x00000000,0x00050048,0x0000009b,0x00000001,0x0000000b,
+       0x00000001,0x00050048,0x0000009b,0x00000002,0x0000000b,0x00000003,0x00030047,0x0000009b,
+       0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
+       0x00000020,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,0x00000007,
+       0x00000007,0x00040017,0x0000000a,0x00000006,0x00000004,0x00040018,0x0000000b,0x0000000a,
+       0x00000004,0x00040017,0x0000000c,0x00000006,0x00000003,0x00040015,0x0000000d,0x00000020,
+       0x00000000,0x0004002b,0x0000000d,0x0000000e,0x00000003,0x0004001c,0x0000000f,0x00000007,
+       0x0000000e,0x000c001e,0x00000010,0x0000000b,0x0000000b,0x0000000c,0x0000000f,0x00000007,
+       0x00000007,0x00000007,0x0000000a,0x00000007,0x00000007,0x00040020,0x00000011,0x00000002,
+       0x00000010,0x0004003b,0x00000011,0x00000012,0x00000002,0x00040015,0x00000013,0x00000020,
+       0x00000001,0x0004002b,0x00000013,0x00000014,0x00000002,0x00040020,0x00000015,0x00000002,
+       0x0000000c,0x0004002b,0x00000013,0x00000019,0x00000006,0x00040020,0x0000001a,0x00000002,
+       0x00000007,0x0004002b,0x00000013,0x00000020,0x00000007,0x00040020,0x00000021,0x00000002,
+       0x0000000a,0x0004002b,0x00000013,0x00000027,0x00000005,0x0004002b,0x00000013,0x00000037,
+       0x00000003,0x00040020,0x00000038,0x00000001,0x00000007,0x0004003b,0x00000038,0x00000039,
+       0x00000001,0x0004002b,0x0000000d,0x0000003a,0x00000000,0x00040020,0x0000003b,0x00000001,
+       0x00000006,0x0004002b,0x00000006,0x0000003e,0x3f800000,0x0004002b,0x00000006,0x00000040,
+       0x3f000000,0x00040020,0x00000043,0x00000002,0x00000006,0x0004002b,0x0000000d,0x00000046,
+       0x00000001,0x00040020,0x00000056,0x00000007,0x0000000a,0x0004002b,0x00000006,0x0000005f,
+       0x00000000,0x0005002c,0x00000007,0x00000066,0x00000040,0x00000040,0x0004002b,0x00000013,
+       0x0000006d,0x00000009,0x0004002b,0x00000013,0x00000073,0x00000008,0x0004002b,0x00000013,
+       0x00000081,0x00000001,0x00040020,0x00000082,0x00000002,0x0000000b,0x00040020,0x00000087,
+       0x00000003,0x00000007,0x0004003b,0x00000087,0x00000088,0x00000003,0x0004002b,0x00000013,
+       0x0000008b,0x00000004,0x0004003b,0x00000087,0x00000095,0x00000003,0x0004001c,0x0000009a,
+       0x00000006,0x00000046,0x0005001e,0x0000009b,0x0000000a,0x00000006,0x0000009a,0x00040020,
+       0x0000009c,0x00000003,0x0000009b,0x0004003b,0x0000009c,0x0000009d,0x00000003,0x0004002b,
+       0x00000013,0x0000009e,0x00000000,0x00040020,0x000000a0,0x00000003,0x0000000a,0x00050036,
+       0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,
+       0x00000009,0x00000007,0x0004003b,0x00000008,0x00000026,0x00000007,0x0004003b,0x00000008,
+       0x00000034,0x00000007,0x0004003b,0x00000008,0x00000036,0x00000007,0x0004003b,0x00000008,
+       0x0000004f,0x00000007,0x0004003b,0x00000008,0x00000053,0x00000007,0x0004003b,0x00000056,
+       0x00000057,0x00000007,0x0004003b,0x00000056,0x00000063,0x00000007,0x00050041,0x00000015,
+       0x00000016,0x00000012,0x00000014,0x0004003d,0x0000000c,0x00000017,0x00000016,0x0007004f,
+       0x00000007,0x00000018,0x00000017,0x00000017,0x00000000,0x00000001,0x00050041,0x0000001a,
+       0x0000001b,0x00000012,0x00000019,0x0004003d,0x00000007,0x0000001c,0x0000001b,0x00050085,
+       0x00000007,0x0000001d,0x00000018,0x0000001c,0x00050041,0x0000001a,0x0000001e,0x00000012,
+       0x00000019,0x0004003d,0x00000007,0x0000001f,0x0000001e,0x00050041,0x00000021,0x00000022,
+       0x00000012,0x00000020,0x0004003d,0x0000000a,0x00000023,0x00000022,0x0007004f,0x00000007,
+       0x00000024,0x00000023,0x00000023,0x00000002,0x00000003,0x0008000c,0x00000007,0x00000025,
+       0x00000001,0x0000002e,0x0000001d,0x0000001f,0x00000024,0x0003003e,0x00000009,0x00000025,
+       0x00050041,0x0000001a,0x00000028,0x00000012,0x00000027,0x0004003d,0x00000007,0x00000029,
+       0x00000028,0x00050041,0x0000001a,0x0000002a,0x00000012,0x00000027,0x0004003d,0x00000007,
+       0x0000002b,0x0000002a,0x00050041,0x00000015,0x0000002c,0x00000012,0x00000014,0x0004003d,
+       0x0000000c,0x0000002d,0x0000002c,0x0007004f,0x00000007,0x0000002e,0x0000002d,0x0000002d,
+       0x00000000,0x00000001,0x00050088,0x00000007,0x0000002f,0x0000002b,0x0000002e,0x00050041,
+       0x00000021,0x00000030,0x00000012,0x00000020,0x0004003d,0x0000000a,0x00000031,0x00000030,
+       0x0007004f,0x00000007,0x00000032,0x00000031,0x00000031,0x00000000,0x00000001,0x0008000c,
+       0x00000007,0x00000033,0x00000001,0x0000002e,0x00000029,0x0000002f,0x00000032,0x0003003e,
+       0x00000026,0x00000033,0x0004003d,0x00000007,0x00000035,0x00000009,0x0003003e,0x00000034,
+       0x00000035,0x00050041,0x0000003b,0x0000003c,0x00000039,0x0000003a,0x0004003d,0x00000006,
+       0x0000003d,0x0000003c,0x00050081,0x00000006,0x0000003f,0x0000003d,0x0000003e,0x00050085,
+       0x00000006,0x00000041,0x0000003f,0x00000040,0x0004006e,0x00000013,0x00000042,0x00000041,
+       0x00070041,0x00000043,0x00000044,0x00000012,0x00000037,0x00000042,0x0000003a,0x0004003d,
+       0x00000006,0x00000045,0x00000044,0x00050041,0x0000003b,0x00000047,0x00000039,0x00000046,
+       0x0004003d,0x00000006,0x00000048,0x00000047,0x00050081,0x00000006,0x00000049,0x00000048,
+       0x0000003e,0x00050085,0x00000006,0x0000004a,0x00000049,0x00000040,0x0004006e,0x00000013,
+       0x0000004b,0x0000004a,0x00070041,0x00000043,0x0000004c,0x00000012,0x00000037,0x0000004b,
+       0x00000046,0x0004003d,0x00000006,0x0000004d,0x0000004c,0x00050050,0x00000007,0x0000004e,
+       0x00000045,0x0000004d,0x0003003e,0x00000036,0x0000004e,0x0004003d,0x00000007,0x00000050,
+       0x00000039,0x0005008e,0x00000007,0x00000051,0x00000050,0x00000040,0x0006000c,0x00000007,
+       0x00000052,0x00000001,0x00000008,0x00000051,0x0003003e,0x0000004f,0x00000052,0x00060041,
+       0x0000001a,0x00000054,0x00000012,0x00000037,0x00000014,0x0004003d,0x00000007,0x00000055,
+       0x00000054,0x0003003e,0x00000053,0x00000055,0x0004003d,0x00000007,0x00000058,0x00000036,
+       0x0004003d,0x00000007,0x00000059,0x00000034,0x0004003d,0x00000007,0x0000005a,0x00000053,
+       0x00050083,0x00000007,0x0000005b,0x00000059,0x0000005a,0x0004003d,0x00000007,0x0000005c,
+       0x0000004f,0x00050085,0x00000007,0x0000005d,0x0000005b,0x0000005c,0x00050081,0x00000007,
+       0x0000005e,0x00000058,0x0000005d,0x00050051,0x00000006,0x00000060,0x0000005e,0x00000000,
+       0x00050051,0x00000006,0x00000061,0x0000005e,0x00000001,0x00070050,0x0000000a,0x00000062,
+       0x00000060,0x00000061,0x0000005f,0x0000003e,0x0003003e,0x00000057,0x00000062,0x0004003d,
+       0x0000000a,0x00000064,0x00000057,0x0003003e,0x00000063,0x00000064,0x0004003d,0x00000007,
+       0x00000065,0x00000034,0x00050085,0x00000007,0x00000067,0x00000065,0x00000066,0x0004003d,
+       0x0000000a,0x00000068,0x00000063,0x0007004f,0x00000007,0x00000069,0x00000068,0x00000068,
+       0x00000000,0x00000001,0x00050083,0x00000007,0x0000006a,0x00000069,0x00000067,0x0004003d,
+       0x0000000a,0x0000006b,0x00000063,0x0009004f,0x0000000a,0x0000006c,0x0000006b,0x0000006a,
+       0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x00000063,0x0000006c,0x00050041,
+       0x0000001a,0x0000006e,0x00000012,0x0000006d,0x0004003d,0x00000007,0x0000006f,0x0000006e,
+       0x0004003d,0x00000007,0x00000070,0x00000034,0x00050085,0x00000007,0x00000071,0x0000006f,
+       0x00000070,0x0004003d,0x00000007,0x00000072,0x00000026,0x00050041,0x0000001a,0x00000074,
+       0x00000012,0x00000073,0x0004003d,0x00000007,0x00000075,0x00000074,0x00050081,0x00000007,
+       0x00000076,0x00000072,0x00000075,0x00050041,0x00000015,0x00000077,0x00000012,0x00000014,
+       0x0004003d,0x0000000c,0x00000078,0x00000077,0x0007004f,0x00000007,0x00000079,0x00000078,
+       0x00000078,0x00000000,0x00000001,0x00050085,0x00000007,0x0000007a,0x00000076,0x00000079,
+       0x00050081,0x00000007,0x0000007b,0x00000071,0x0000007a,0x0004003d,0x0000000a,0x0000007c,
+       0x00000063,0x0007004f,0x00000007,0x0000007d,0x0000007c,0x0000007c,0x00000000,0x00000001,
+       0x00050081,0x00000007,0x0000007e,0x0000007d,0x0000007b,0x0004003d,0x0000000a,0x0000007f,
+       0x00000063,0x0009004f,0x0000000a,0x00000080,0x0000007f,0x0000007e,0x00000004,0x00000005,
+       0x00000002,0x00000003,0x0003003e,0x00000063,0x00000080,0x00050041,0x00000082,0x00000083,
+       0x00000012,0x00000081,0x0004003d,0x0000000b,0x00000084,0x00000083,0x0004003d,0x0000000a,
+       0x00000085,0x00000063,0x00050091,0x0000000a,0x00000086,0x00000084,0x00000085,0x0003003e,
+       0x00000063,0x00000086,0x0004003d,0x00000007,0x00000089,0x00000036,0x0004003d,0x00000007,
+       0x0000008a,0x0000004f,0x00050041,0x0000001a,0x0000008c,0x00000012,0x0000008b,0x0004003d,
+       0x00000007,0x0000008d,0x0000008c,0x00050085,0x00000007,0x0000008e,0x0000008a,0x0000008d,
+       0x00050081,0x00000007,0x0000008f,0x00000089,0x0000008e,0x0004003d,0x00000007,0x00000090,
+       0x00000053,0x00050041,0x0000001a,0x00000091,0x00000012,0x0000008b,0x0004003d,0x00000007,
+       0x00000092,0x00000091,0x00050081,0x00000007,0x00000093,0x00000090,0x00000092,0x00050088,
+       0x00000007,0x00000094,0x0000008f,0x00000093,0x0003003e,0x00000088,0x00000094,0x0004003d,
+       0x0000000a,0x00000096,0x00000057,0x0007004f,0x00000007,0x00000097,0x00000096,0x00000096,
+       0x00000000,0x00000001,0x0004003d,0x00000007,0x00000098,0x00000034,0x00050088,0x00000007,
+       0x00000099,0x00000097,0x00000098,0x0003003e,0x00000095,0x00000099,0x0004003d,0x0000000a,
+       0x0000009f,0x00000063,0x00050041,0x000000a0,0x000000a1,0x0000009d,0x0000009e,0x0003003e,
+       0x000000a1,0x0000009f,0x000100fd,0x00010038
 };
diff --git a/dali/graphics/vulkan/generated/npatch-visual-mask-shader-frag.h b/dali/graphics/vulkan/generated/npatch-visual-mask-shader-frag.h
new file mode 100644 (file)
index 0000000..43971c2
--- /dev/null
@@ -0,0 +1,70 @@
+std::vector<uint32_t> SHADER_NPATCH_VISUAL_MASK_SHADER_FRAG = {
+       0x07230203,0x00010000,0x00080003,0x0000004f,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
+       0x0008000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x00000017,0x0000003b,
+       0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,
+       0x6e69616d,0x00000000,0x00040005,0x00000009,0x6f6c6f63,0x00000072,0x00050005,0x0000000d,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,0x00000064,
+       0x00040005,0x00000014,0x6b73616d,0x00000000,0x00040005,0x00000015,0x73614d73,0x0000006b,
+       0x00060005,0x00000017,0x73614d76,0x7865546b,0x726f6f43,0x00000064,0x00050005,0x0000001c,
+       0x6578696d,0x6c6f4364,0x0000726f,0x00050005,0x00000026,0x67617246,0x61746144,0x00000000,
+       0x00050006,0x00000026,0x00000000,0x6c6f4375,0x0000726f,0x00060006,0x00000026,0x00000001,
+       0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x00000026,0x00000002,0x6361706f,0x00797469,
+       0x00080006,0x00000026,0x00000003,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,
+       0x00080006,0x00000026,0x00000004,0x69787561,0x7261696c,0x616d4979,0x6c416567,0x00616870,
+       0x00030005,0x00000028,0x00000000,0x00050005,0x0000003b,0x67617266,0x6f6c6f43,0x00000072,
+       0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,0x0000000d,0x00000021,0x00000002,
+       0x00040047,0x00000011,0x0000001e,0x00000000,0x00040047,0x00000015,0x00000022,0x00000000,
+       0x00040047,0x00000015,0x00000021,0x00000003,0x00040047,0x00000017,0x0000001e,0x00000001,
+       0x00050048,0x00000026,0x00000000,0x00000023,0x00000000,0x00050048,0x00000026,0x00000001,
+       0x00000023,0x00000010,0x00050048,0x00000026,0x00000002,0x00000023,0x0000001c,0x00050048,
+       0x00000026,0x00000003,0x00000023,0x00000020,0x00050048,0x00000026,0x00000004,0x00000023,
+       0x00000024,0x00030047,0x00000026,0x00000002,0x00040047,0x00000028,0x00000022,0x00000000,
+       0x00040047,0x00000028,0x00000021,0x00000001,0x00040047,0x0000003b,0x0000001e,0x00000000,
+       0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
+       0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000007,0x00000007,
+       0x00090019,0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,
+       0x00000000,0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,0x00000000,0x0000000b,
+       0x0004003b,0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,0x00000006,0x00000002,
+       0x00040020,0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,0x00000011,0x00000001,
+       0x0004003b,0x0000000c,0x00000015,0x00000000,0x0004003b,0x00000010,0x00000017,0x00000001,
+       0x00040017,0x0000001a,0x00000006,0x00000003,0x00040020,0x0000001b,0x00000007,0x0000001a,
+       0x0004002b,0x00000006,0x0000001f,0x3f800000,0x00040015,0x00000020,0x00000020,0x00000000,
+       0x0004002b,0x00000020,0x00000021,0x00000003,0x00040020,0x00000022,0x00000007,0x00000006,
+       0x0007001e,0x00000026,0x00000007,0x0000001a,0x00000006,0x00000006,0x00000006,0x00040020,
+       0x00000027,0x00000002,0x00000026,0x0004003b,0x00000027,0x00000028,0x00000002,0x00040015,
+       0x00000029,0x00000020,0x00000001,0x0004002b,0x00000029,0x0000002a,0x00000004,0x00040020,
+       0x0000002b,0x00000002,0x00000006,0x00040020,0x0000003a,0x00000003,0x00000007,0x0004003b,
+       0x0000003a,0x0000003b,0x00000003,0x0004002b,0x00000029,0x00000041,0x00000000,0x00040020,
+       0x00000042,0x00000002,0x00000007,0x0004002b,0x00000029,0x00000046,0x00000001,0x00040020,
+       0x00000047,0x00000002,0x0000001a,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
+       0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,
+       0x00000014,0x00000007,0x0004003b,0x0000001b,0x0000001c,0x00000007,0x0004003d,0x0000000b,
+       0x0000000e,0x0000000d,0x0004003d,0x0000000f,0x00000012,0x00000011,0x00050057,0x00000007,
+       0x00000013,0x0000000e,0x00000012,0x0003003e,0x00000009,0x00000013,0x0004003d,0x0000000b,
+       0x00000016,0x00000015,0x0004003d,0x0000000f,0x00000018,0x00000017,0x00050057,0x00000007,
+       0x00000019,0x00000016,0x00000018,0x0003003e,0x00000014,0x00000019,0x0004003d,0x00000007,
+       0x0000001d,0x00000009,0x0008004f,0x0000001a,0x0000001e,0x0000001d,0x0000001d,0x00000000,
+       0x00000001,0x00000002,0x00050041,0x00000022,0x00000023,0x00000014,0x00000021,0x0004003d,
+       0x00000006,0x00000024,0x00000023,0x00050083,0x00000006,0x00000025,0x0000001f,0x00000024,
+       0x00050041,0x0000002b,0x0000002c,0x00000028,0x0000002a,0x0004003d,0x00000006,0x0000002d,
+       0x0000002c,0x00050083,0x00000006,0x0000002e,0x0000001f,0x0000002d,0x0008000c,0x00000006,
+       0x0000002f,0x00000001,0x0000002e,0x00000025,0x0000001f,0x0000002e,0x0005008e,0x0000001a,
+       0x00000030,0x0000001e,0x0000002f,0x0004003d,0x00000007,0x00000031,0x00000014,0x0008004f,
+       0x0000001a,0x00000032,0x00000031,0x00000031,0x00000000,0x00000001,0x00000002,0x00050041,
+       0x00000022,0x00000033,0x00000014,0x00000021,0x0004003d,0x00000006,0x00000034,0x00000033,
+       0x0005008e,0x0000001a,0x00000035,0x00000032,0x00000034,0x00050041,0x0000002b,0x00000036,
+       0x00000028,0x0000002a,0x0004003d,0x00000006,0x00000037,0x00000036,0x0005008e,0x0000001a,
+       0x00000038,0x00000035,0x00000037,0x00050081,0x0000001a,0x00000039,0x00000030,0x00000038,
+       0x0003003e,0x0000001c,0x00000039,0x0004003d,0x0000001a,0x0000003c,0x0000001c,0x00050051,
+       0x00000006,0x0000003d,0x0000003c,0x00000000,0x00050051,0x00000006,0x0000003e,0x0000003c,
+       0x00000001,0x00050051,0x00000006,0x0000003f,0x0000003c,0x00000002,0x00070050,0x00000007,
+       0x00000040,0x0000003d,0x0000003e,0x0000003f,0x0000001f,0x00050041,0x00000042,0x00000043,
+       0x00000028,0x00000041,0x0004003d,0x00000007,0x00000044,0x00000043,0x00050085,0x00000007,
+       0x00000045,0x00000040,0x00000044,0x00050041,0x00000047,0x00000048,0x00000028,0x00000046,
+       0x0004003d,0x0000001a,0x00000049,0x00000048,0x00050051,0x00000006,0x0000004a,0x00000049,
+       0x00000000,0x00050051,0x00000006,0x0000004b,0x00000049,0x00000001,0x00050051,0x00000006,
+       0x0000004c,0x00000049,0x00000002,0x00070050,0x00000007,0x0000004d,0x0000004a,0x0000004b,
+       0x0000004c,0x0000001f,0x00050085,0x00000007,0x0000004e,0x00000045,0x0000004d,0x0003003e,
+       0x0000003b,0x0000004e,0x000100fd,0x00010038
+};
index 1b21771..0dea415 100644 (file)
@@ -1,49 +1,39 @@
 std::vector<uint32_t> SHADER_NPATCH_VISUAL_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000039,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000028,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000027,0x0000002f,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000011,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00050006,0x0000000c,0x00000000,0x6c6f4375,
-       0x0000726f,0x00060006,0x0000000c,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00050006,
-       0x0000000c,0x00000002,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000003,0x4d657270,
-       0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,
-       0x00000027,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000002b,0x78655473,0x65727574,
-       0x00000000,0x00050005,0x0000002f,0x78655476,0x726f6f43,0x00000064,0x00050048,0x0000000c,
-       0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,0x00000010,
-       0x00050048,0x0000000c,0x00000002,0x00000023,0x0000001c,0x00050048,0x0000000c,0x00000003,
-       0x00000023,0x00000020,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,
-       0x00000000,0x00040047,0x0000000e,0x00000021,0x00000001,0x00040047,0x00000027,0x0000001e,
-       0x00000000,0x00040047,0x0000002b,0x00000022,0x00000000,0x00040047,0x0000002b,0x00000021,
-       0x00000002,0x00040047,0x0000002f,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,
-       0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,
-       0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,
-       0x0006001e,0x0000000c,0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,
-       0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,
-       0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000001,0x00040020,0x00000011,
-       0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,0x0000000f,
-       0x00000015,0x00000002,0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,0x0000000f,
-       0x00000019,0x00000003,0x00040020,0x00000026,0x00000003,0x00000007,0x0004003b,0x00000026,
-       0x00000027,0x00000003,0x00090019,0x00000028,0x00000006,0x00000001,0x00000000,0x00000000,
-       0x00000000,0x00000001,0x00000000,0x0003001b,0x00000029,0x00000028,0x00040020,0x0000002a,
-       0x00000000,0x00000029,0x0004003b,0x0000002a,0x0000002b,0x00000000,0x00040017,0x0000002d,
-       0x00000006,0x00000002,0x00040020,0x0000002e,0x00000001,0x0000002d,0x0004003b,0x0000002e,
-       0x0000002f,0x00000001,0x0004002b,0x0000000f,0x00000032,0x00000000,0x00040020,0x00000033,
-       0x00000002,0x00000007,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
-       0x00000005,0x0004003d,0x00000029,0x0000002c,0x0000002b,0x0004003d,0x0000002d,0x00000030,
-       0x0000002f,0x00050057,0x00000007,0x00000031,0x0000002c,0x00000030,0x00050041,0x00000033,
-       0x00000034,0x0000000e,0x00000032,0x0004003d,0x00000007,0x00000035,0x00000034,0x00050085,
-       0x00000007,0x00000036,0x00000031,0x00000035,0x00040039,0x00000007,0x00000037,0x00000009,
-       0x00050085,0x00000007,0x00000038,0x00000036,0x00000037,0x0003003e,0x00000027,0x00000038,
-       0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,0x00000000,0x00000008,0x000200f8,
-       0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000b,
-       0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,0x0000000e,0x00000015,0x0004003d,
-       0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,0x0000001a,0x0000000e,0x00000019,
-       0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,0x00000006,0x0000001c,0x00000001,
-       0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,0x0000000b,0x0000001d,0x00000013,
-       0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,0x00000015,0x0004003d,0x00000006,
-       0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,0x0000001d,0x00000000,0x00050051,
-       0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,0x00000006,0x00000022,0x0000001d,
-       0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,0x00000021,0x00000022,0x0000001f,
-       0x000200fe,0x00000023,0x00010038
+       0x00000000,0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000000d,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,0x00000064,
+       0x00050005,0x00000015,0x67617246,0x61746144,0x00000000,0x00050006,0x00000015,0x00000000,
+       0x6c6f4375,0x0000726f,0x00060006,0x00000015,0x00000001,0x4378696d,0x726f6c6f,0x00000000,
+       0x00050006,0x00000015,0x00000002,0x6361706f,0x00797469,0x00080006,0x00000015,0x00000003,
+       0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x00000017,0x00000000,
+       0x00040047,0x00000009,0x0000001e,0x00000000,0x00040047,0x0000000d,0x00000022,0x00000000,
+       0x00040047,0x0000000d,0x00000021,0x00000002,0x00040047,0x00000011,0x0000001e,0x00000000,
+       0x00050048,0x00000015,0x00000000,0x00000023,0x00000000,0x00050048,0x00000015,0x00000001,
+       0x00000023,0x00000010,0x00050048,0x00000015,0x00000002,0x00000023,0x0000001c,0x00050048,
+       0x00000015,0x00000003,0x00000023,0x00000020,0x00030047,0x00000015,0x00000002,0x00040047,
+       0x00000017,0x00000022,0x00000000,0x00040047,0x00000017,0x00000021,0x00000001,0x00020013,
+       0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,
+       0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,
+       0x00000008,0x00000009,0x00000003,0x00090019,0x0000000a,0x00000006,0x00000001,0x00000000,
+       0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000b,0x0000000a,0x00040020,
+       0x0000000c,0x00000000,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000000,0x00040017,
+       0x0000000f,0x00000006,0x00000002,0x00040020,0x00000010,0x00000001,0x0000000f,0x0004003b,
+       0x00000010,0x00000011,0x00000001,0x00040017,0x00000014,0x00000006,0x00000003,0x0006001e,
+       0x00000015,0x00000007,0x00000014,0x00000006,0x00000006,0x00040020,0x00000016,0x00000002,
+       0x00000015,0x0004003b,0x00000016,0x00000017,0x00000002,0x00040015,0x00000018,0x00000020,
+       0x00000001,0x0004002b,0x00000018,0x00000019,0x00000000,0x00040020,0x0000001a,0x00000002,
+       0x00000007,0x0004002b,0x00000018,0x0000001e,0x00000001,0x00040020,0x0000001f,0x00000002,
+       0x00000014,0x0004002b,0x00000006,0x00000022,0x3f800000,0x00050036,0x00000002,0x00000004,
+       0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003d,0x0000000b,0x0000000e,0x0000000d,
+       0x0004003d,0x0000000f,0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,
+       0x00000012,0x00050041,0x0000001a,0x0000001b,0x00000017,0x00000019,0x0004003d,0x00000007,
+       0x0000001c,0x0000001b,0x00050085,0x00000007,0x0000001d,0x00000013,0x0000001c,0x00050041,
+       0x0000001f,0x00000020,0x00000017,0x0000001e,0x0004003d,0x00000014,0x00000021,0x00000020,
+       0x00050051,0x00000006,0x00000023,0x00000021,0x00000000,0x00050051,0x00000006,0x00000024,
+       0x00000021,0x00000001,0x00050051,0x00000006,0x00000025,0x00000021,0x00000002,0x00070050,
+       0x00000007,0x00000026,0x00000023,0x00000024,0x00000025,0x00000022,0x00050085,0x00000007,
+       0x00000027,0x0000001d,0x00000026,0x0003003e,0x00000009,0x00000027,0x000100fd,0x00010038
 };
index 6b64622..bc0cc8a 100644 (file)
 std::vector<uint32_t> SHADER_NPATCH_VISUAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x000000ab,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x000000b6,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000017,0x0000009c,0x000000a7,
-       0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00050005,
-       0x00000009,0x65786966,0x63614664,0x00726f74,0x00060005,0x0000000e,0x54434146,0x535f524f,
-       0x5f455a49,0x00000058,0x00060005,0x00000010,0x54434146,0x535f524f,0x5f455a49,0x00000059,
-       0x00050005,0x00000012,0x74726556,0x61746144,0x00000000,0x00060006,0x00000012,0x00000000,
-       0x70764d75,0x7274614d,0x00007869,0x00050006,0x00000012,0x00000001,0x7a695375,0x00000065,
-       0x00080006,0x00000012,0x00000002,0x6e694e75,0x74615065,0x61466863,0x726f7463,0x00005873,
-       0x00080006,0x00000012,0x00000003,0x6e694e75,0x74615065,0x61466863,0x726f7463,0x00005973,
-       0x00050006,0x00000012,0x00000004,0x7366666f,0x00007465,0x00050006,0x00000012,0x00000005,
-       0x657a6973,0x00000000,0x00070006,0x00000012,0x00000006,0x7366666f,0x69537465,0x6f4d657a,
-       0x00006564,0x00050006,0x00000012,0x00000007,0x6769726f,0x00006e69,0x00060006,0x00000012,
-       0x00000008,0x68636e61,0x6f50726f,0x00746e69,0x00030005,0x00000014,0x00000000,0x00050005,
-       0x00000017,0x736f5061,0x6f697469,0x0000006e,0x00040005,0x0000002f,0x65727473,0x00686374,
-       0x00050005,0x0000003d,0x65786966,0x746f5464,0x00006c61,0x00060005,0x00000046,0x65727473,
-       0x54686374,0x6c61746f,0x00000000,0x00050005,0x0000004e,0x75736976,0x69536c61,0x0000657a,
-       0x00060005,0x00000060,0x75736976,0x664f6c61,0x74657366,0x00000000,0x00060005,0x0000006f,
-       0x74726576,0x6f507865,0x69746973,0x00006e6f,0x00050005,0x0000009c,0x78655476,0x726f6f43,
-       0x00000064,0x00060005,0x000000a5,0x505f6c67,0x65567265,0x78657472,0x00000000,0x00060006,
-       0x000000a5,0x00000000,0x505f6c67,0x7469736f,0x006e6f69,0x00070006,0x000000a5,0x00000001,
-       0x505f6c67,0x746e696f,0x657a6953,0x00000000,0x00070006,0x000000a5,0x00000002,0x435f6c67,
-       0x4470696c,0x61747369,0x0065636e,0x00030005,0x000000a7,0x00000000,0x00040047,0x0000000e,
-       0x00000001,0x00000000,0x00040047,0x0000000f,0x00000006,0x00000010,0x00040047,0x00000010,
-       0x00000001,0x00000001,0x00040047,0x00000011,0x00000006,0x00000010,0x00040048,0x00000012,
-       0x00000000,0x00000005,0x00050048,0x00000012,0x00000000,0x00000023,0x00000000,0x00050048,
-       0x00000012,0x00000000,0x00000007,0x00000010,0x00050048,0x00000012,0x00000001,0x00000023,
-       0x00000040,0x00050048,0x00000012,0x00000002,0x00000023,0x00000050,0x00050048,0x00000012,
-       0x00000003,0x00000023,0x00000090,0x00050048,0x00000012,0x00000004,0x00000023,0x000000d0,
-       0x00050048,0x00000012,0x00000005,0x00000023,0x000000d8,0x00050048,0x00000012,0x00000006,
-       0x00000023,0x000000e0,0x00050048,0x00000012,0x00000007,0x00000023,0x000000f0,0x00050048,
-       0x00000012,0x00000008,0x00000023,0x000000f8,0x00030047,0x00000012,0x00000002,0x00040047,
-       0x00000014,0x00000022,0x00000000,0x00040047,0x00000014,0x00000021,0x00000000,0x00040047,
-       0x00000017,0x0000001e,0x00000000,0x00040047,0x0000009c,0x0000001e,0x00000000,0x00050048,
-       0x000000a5,0x00000000,0x0000000b,0x00000000,0x00050048,0x000000a5,0x00000001,0x0000000b,
-       0x00000001,0x00050048,0x000000a5,0x00000002,0x0000000b,0x00000003,0x00030047,0x000000a5,
-       0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
-       0x00000020,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,0x00000007,
-       0x00000007,0x00040017,0x0000000a,0x00000006,0x00000004,0x00040018,0x0000000b,0x0000000a,
-       0x00000004,0x00040017,0x0000000c,0x00000006,0x00000003,0x00040015,0x0000000d,0x00000020,
-       0x00000001,0x00040032,0x0000000d,0x0000000e,0x00000004,0x0004001c,0x0000000f,0x00000007,
-       0x0000000e,0x00040032,0x0000000d,0x00000010,0x00000004,0x0004001c,0x00000011,0x00000007,
-       0x00000010,0x000b001e,0x00000012,0x0000000b,0x0000000c,0x0000000f,0x00000011,0x00000007,
-       0x00000007,0x0000000a,0x00000007,0x00000007,0x00040020,0x00000013,0x00000002,0x00000012,
-       0x0004003b,0x00000013,0x00000014,0x00000002,0x0004002b,0x0000000d,0x00000015,0x00000002,
-       0x00040020,0x00000016,0x00000001,0x00000007,0x0004003b,0x00000016,0x00000017,0x00000001,
-       0x00040015,0x00000018,0x00000020,0x00000000,0x0004002b,0x00000018,0x00000019,0x00000000,
-       0x00040020,0x0000001a,0x00000001,0x00000006,0x0004002b,0x00000006,0x0000001d,0x3f800000,
-       0x0004002b,0x00000006,0x0000001f,0x3f000000,0x00040020,0x00000022,0x00000002,0x00000006,
-       0x0004002b,0x0000000d,0x00000025,0x00000003,0x0004002b,0x00000018,0x00000026,0x00000001,
-       0x0004002b,0x0000000d,0x0000003e,0x00000001,0x00060034,0x0000000d,0x0000003f,0x00000082,
-       0x0000000e,0x0000003e,0x00060034,0x0000000d,0x00000042,0x00000082,0x00000010,0x0000003e,
-       0x00060034,0x0000000d,0x00000047,0x00000082,0x0000000e,0x0000003e,0x00060034,0x0000000d,
-       0x0000004a,0x00000082,0x00000010,0x0000003e,0x00040020,0x0000004f,0x00000002,0x0000000c,
-       0x0004002b,0x0000000d,0x00000053,0x00000005,0x00040020,0x00000054,0x00000002,0x00000007,
-       0x0004002b,0x0000000d,0x0000005a,0x00000006,0x00040020,0x0000005b,0x00000002,0x0000000a,
-       0x0004002b,0x0000000d,0x00000061,0x00000004,0x00040020,0x0000006e,0x00000007,0x0000000a,
-       0x0004002b,0x0000000d,0x00000079,0x00000008,0x0004002b,0x0000000d,0x00000080,0x00000007,
-       0x0004002b,0x00000006,0x00000089,0x00000000,0x0005002c,0x00000007,0x0000008e,0x0000001f,
-       0x0000001f,0x0004002b,0x0000000d,0x00000095,0x00000000,0x00040020,0x00000096,0x00000002,
-       0x0000000b,0x00040020,0x0000009b,0x00000003,0x00000007,0x0004003b,0x0000009b,0x0000009c,
-       0x00000003,0x0004001c,0x000000a4,0x00000006,0x00000026,0x0005001e,0x000000a5,0x0000000a,
-       0x00000006,0x000000a4,0x00040020,0x000000a6,0x00000003,0x000000a5,0x0004003b,0x000000a6,
-       0x000000a7,0x00000003,0x00040020,0x000000a9,0x00000003,0x0000000a,0x00050036,0x00000002,
-       0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,
-       0x00000007,0x0004003b,0x00000008,0x0000002f,0x00000007,0x0004003b,0x00000008,0x0000003d,
-       0x00000007,0x0004003b,0x00000008,0x00000046,0x00000007,0x0004003b,0x00000008,0x0000004e,
-       0x00000007,0x0004003b,0x00000008,0x00000060,0x00000007,0x0004003b,0x0000006e,0x0000006f,
-       0x00000007,0x00050041,0x0000001a,0x0000001b,0x00000017,0x00000019,0x0004003d,0x00000006,
-       0x0000001c,0x0000001b,0x00050081,0x00000006,0x0000001e,0x0000001c,0x0000001d,0x00050085,
-       0x00000006,0x00000020,0x0000001e,0x0000001f,0x0004006e,0x0000000d,0x00000021,0x00000020,
-       0x00070041,0x00000022,0x00000023,0x00000014,0x00000015,0x00000021,0x00000019,0x0004003d,
-       0x00000006,0x00000024,0x00000023,0x00050041,0x0000001a,0x00000027,0x00000017,0x00000026,
-       0x0004003d,0x00000006,0x00000028,0x00000027,0x00050081,0x00000006,0x00000029,0x00000028,
-       0x0000001d,0x00050085,0x00000006,0x0000002a,0x00000029,0x0000001f,0x0004006e,0x0000000d,
-       0x0000002b,0x0000002a,0x00070041,0x00000022,0x0000002c,0x00000014,0x00000025,0x0000002b,
-       0x00000019,0x0004003d,0x00000006,0x0000002d,0x0000002c,0x00050050,0x00000007,0x0000002e,
-       0x00000024,0x0000002d,0x0003003e,0x00000009,0x0000002e,0x00050041,0x0000001a,0x00000030,
-       0x00000017,0x00000019,0x0004003d,0x00000006,0x00000031,0x00000030,0x00050085,0x00000006,
-       0x00000032,0x00000031,0x0000001f,0x0004006e,0x0000000d,0x00000033,0x00000032,0x00070041,
-       0x00000022,0x00000034,0x00000014,0x00000015,0x00000033,0x00000026,0x0004003d,0x00000006,
-       0x00000035,0x00000034,0x00050041,0x0000001a,0x00000036,0x00000017,0x00000026,0x0004003d,
-       0x00000006,0x00000037,0x00000036,0x00050085,0x00000006,0x00000038,0x00000037,0x0000001f,
-       0x0004006e,0x0000000d,0x00000039,0x00000038,0x00070041,0x00000022,0x0000003a,0x00000014,
-       0x00000025,0x00000039,0x00000026,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x00050050,
-       0x00000007,0x0000003c,0x00000035,0x0000003b,0x0003003e,0x0000002f,0x0000003c,0x00070041,
-       0x00000022,0x00000040,0x00000014,0x00000015,0x0000003f,0x00000019,0x0004003d,0x00000006,
-       0x00000041,0x00000040,0x00070041,0x00000022,0x00000043,0x00000014,0x00000025,0x00000042,
-       0x00000019,0x0004003d,0x00000006,0x00000044,0x00000043,0x00050050,0x00000007,0x00000045,
-       0x00000041,0x00000044,0x0003003e,0x0000003d,0x00000045,0x00070041,0x00000022,0x00000048,
-       0x00000014,0x00000015,0x00000047,0x00000026,0x0004003d,0x00000006,0x00000049,0x00000048,
-       0x00070041,0x00000022,0x0000004b,0x00000014,0x00000025,0x0000004a,0x00000026,0x0004003d,
-       0x00000006,0x0000004c,0x0000004b,0x00050050,0x00000007,0x0000004d,0x00000049,0x0000004c,
-       0x0003003e,0x00000046,0x0000004d,0x00050041,0x0000004f,0x00000050,0x00000014,0x0000003e,
-       0x0004003d,0x0000000c,0x00000051,0x00000050,0x0007004f,0x00000007,0x00000052,0x00000051,
-       0x00000051,0x00000000,0x00000001,0x00050041,0x00000054,0x00000055,0x00000014,0x00000053,
-       0x0004003d,0x00000007,0x00000056,0x00000055,0x00050085,0x00000007,0x00000057,0x00000052,
-       0x00000056,0x00050041,0x00000054,0x00000058,0x00000014,0x00000053,0x0004003d,0x00000007,
-       0x00000059,0x00000058,0x00050041,0x0000005b,0x0000005c,0x00000014,0x0000005a,0x0004003d,
-       0x0000000a,0x0000005d,0x0000005c,0x0007004f,0x00000007,0x0000005e,0x0000005d,0x0000005d,
-       0x00000002,0x00000003,0x0008000c,0x00000007,0x0000005f,0x00000001,0x0000002e,0x00000057,
-       0x00000059,0x0000005e,0x0003003e,0x0000004e,0x0000005f,0x00050041,0x00000054,0x00000062,
-       0x00000014,0x00000061,0x0004003d,0x00000007,0x00000063,0x00000062,0x00050041,0x00000054,
-       0x00000064,0x00000014,0x00000061,0x0004003d,0x00000007,0x00000065,0x00000064,0x00050041,
-       0x0000004f,0x00000066,0x00000014,0x0000003e,0x0004003d,0x0000000c,0x00000067,0x00000066,
-       0x0007004f,0x00000007,0x00000068,0x00000067,0x00000067,0x00000000,0x00000001,0x00050088,
-       0x00000007,0x00000069,0x00000065,0x00000068,0x00050041,0x0000005b,0x0000006a,0x00000014,
-       0x0000005a,0x0004003d,0x0000000a,0x0000006b,0x0000006a,0x0007004f,0x00000007,0x0000006c,
-       0x0000006b,0x0000006b,0x00000000,0x00000001,0x0008000c,0x00000007,0x0000006d,0x00000001,
-       0x0000002e,0x00000063,0x00000069,0x0000006c,0x0003003e,0x00000060,0x0000006d,0x0004003d,
-       0x00000007,0x00000070,0x00000009,0x0004003d,0x00000007,0x00000071,0x0000004e,0x0004003d,
-       0x00000007,0x00000072,0x0000003d,0x00050083,0x00000007,0x00000073,0x00000071,0x00000072,
-       0x0004003d,0x00000007,0x00000074,0x0000002f,0x00050085,0x00000007,0x00000075,0x00000073,
-       0x00000074,0x0004003d,0x00000007,0x00000076,0x00000046,0x00050088,0x00000007,0x00000077,
-       0x00000075,0x00000076,0x00050081,0x00000007,0x00000078,0x00000070,0x00000077,0x00050041,
-       0x00000054,0x0000007a,0x00000014,0x00000079,0x0004003d,0x00000007,0x0000007b,0x0000007a,
-       0x0004003d,0x00000007,0x0000007c,0x0000004e,0x00050085,0x00000007,0x0000007d,0x0000007b,
-       0x0000007c,0x00050081,0x00000007,0x0000007e,0x00000078,0x0000007d,0x0004003d,0x00000007,
-       0x0000007f,0x00000060,0x00050041,0x00000054,0x00000081,0x00000014,0x00000080,0x0004003d,
-       0x00000007,0x00000082,0x00000081,0x00050081,0x00000007,0x00000083,0x0000007f,0x00000082,
-       0x00050041,0x0000004f,0x00000084,0x00000014,0x0000003e,0x0004003d,0x0000000c,0x00000085,
-       0x00000084,0x0007004f,0x00000007,0x00000086,0x00000085,0x00000085,0x00000000,0x00000001,
-       0x00050085,0x00000007,0x00000087,0x00000083,0x00000086,0x00050081,0x00000007,0x00000088,
-       0x0000007e,0x00000087,0x00050051,0x00000006,0x0000008a,0x00000088,0x00000000,0x00050051,
-       0x00000006,0x0000008b,0x00000088,0x00000001,0x00070050,0x0000000a,0x0000008c,0x0000008a,
-       0x0000008b,0x00000089,0x0000001d,0x0003003e,0x0000006f,0x0000008c,0x0004003d,0x00000007,
-       0x0000008d,0x0000004e,0x00050085,0x00000007,0x0000008f,0x0000008d,0x0000008e,0x0004003d,
-       0x0000000a,0x00000090,0x0000006f,0x0007004f,0x00000007,0x00000091,0x00000090,0x00000090,
-       0x00000000,0x00000001,0x00050083,0x00000007,0x00000092,0x00000091,0x0000008f,0x0004003d,
-       0x0000000a,0x00000093,0x0000006f,0x0009004f,0x0000000a,0x00000094,0x00000093,0x00000092,
-       0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,0x0000006f,0x00000094,0x00050041,
-       0x00000096,0x00000097,0x00000014,0x00000095,0x0004003d,0x0000000b,0x00000098,0x00000097,
-       0x0004003d,0x0000000a,0x00000099,0x0000006f,0x00050091,0x0000000a,0x0000009a,0x00000098,
-       0x00000099,0x0003003e,0x0000006f,0x0000009a,0x0004003d,0x00000007,0x0000009d,0x00000009,
-       0x0004003d,0x00000007,0x0000009e,0x0000002f,0x00050081,0x00000007,0x0000009f,0x0000009d,
-       0x0000009e,0x0004003d,0x00000007,0x000000a0,0x0000003d,0x0004003d,0x00000007,0x000000a1,
-       0x00000046,0x00050081,0x00000007,0x000000a2,0x000000a0,0x000000a1,0x00050088,0x00000007,
-       0x000000a3,0x0000009f,0x000000a2,0x0003003e,0x0000009c,0x000000a3,0x0004003d,0x0000000a,
-       0x000000a8,0x0000006f,0x00050041,0x000000a9,0x000000aa,0x000000a7,0x00000095,0x0003003e,
-       0x000000aa,0x000000a8,0x000100fd,0x00010038
+       0x0009000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000017,0x000000a2,0x000000aa,
+       0x000000b2,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
+       0x00050005,0x00000009,0x65786966,0x63614664,0x00726f74,0x00060005,0x0000000e,0x54434146,
+       0x535f524f,0x5f455a49,0x00000058,0x00060005,0x00000010,0x54434146,0x535f524f,0x5f455a49,
+       0x00000059,0x00050005,0x00000012,0x74726556,0x61746144,0x00000000,0x00060006,0x00000012,
+       0x00000000,0x70764d75,0x7274614d,0x00007869,0x00050006,0x00000012,0x00000001,0x7a695375,
+       0x00000065,0x00080006,0x00000012,0x00000002,0x6e694e75,0x74615065,0x61466863,0x726f7463,
+       0x00005873,0x00080006,0x00000012,0x00000003,0x6e694e75,0x74615065,0x61466863,0x726f7463,
+       0x00005973,0x00050006,0x00000012,0x00000004,0x7366666f,0x00007465,0x00050006,0x00000012,
+       0x00000005,0x657a6973,0x00000000,0x00070006,0x00000012,0x00000006,0x7366666f,0x69537465,
+       0x6f4d657a,0x00006564,0x00050006,0x00000012,0x00000007,0x6769726f,0x00006e69,0x00060006,
+       0x00000012,0x00000008,0x68636e61,0x6f50726f,0x00746e69,0x00030005,0x00000014,0x00000000,
+       0x00050005,0x00000017,0x736f5061,0x6f697469,0x0000006e,0x00040005,0x0000002f,0x65727473,
+       0x00686374,0x00050005,0x0000003d,0x65786966,0x746f5464,0x00006c61,0x00060005,0x00000046,
+       0x65727473,0x54686374,0x6c61746f,0x00000000,0x00050005,0x0000004e,0x75736976,0x69536c61,
+       0x0000657a,0x00060005,0x00000060,0x75736976,0x664f6c61,0x74657366,0x00000000,0x00060005,
+       0x0000006f,0x64697267,0x69736f50,0x6e6f6974,0x00000000,0x00060005,0x0000007d,0x74726576,
+       0x6f507865,0x69746973,0x00006e6f,0x00050005,0x000000a2,0x78655476,0x726f6f43,0x00000064,
+       0x00060005,0x000000aa,0x73614d76,0x7865546b,0x726f6f43,0x00000064,0x00060005,0x000000b0,
+       0x505f6c67,0x65567265,0x78657472,0x00000000,0x00060006,0x000000b0,0x00000000,0x505f6c67,
+       0x7469736f,0x006e6f69,0x00070006,0x000000b0,0x00000001,0x505f6c67,0x746e696f,0x657a6953,
+       0x00000000,0x00070006,0x000000b0,0x00000002,0x435f6c67,0x4470696c,0x61747369,0x0065636e,
+       0x00030005,0x000000b2,0x00000000,0x00040047,0x0000000e,0x00000001,0x00000000,0x00040047,
+       0x0000000f,0x00000006,0x00000010,0x00040047,0x00000010,0x00000001,0x00000001,0x00040047,
+       0x00000011,0x00000006,0x00000010,0x00040048,0x00000012,0x00000000,0x00000005,0x00050048,
+       0x00000012,0x00000000,0x00000023,0x00000000,0x00050048,0x00000012,0x00000000,0x00000007,
+       0x00000010,0x00050048,0x00000012,0x00000001,0x00000023,0x00000040,0x00050048,0x00000012,
+       0x00000002,0x00000023,0x00000050,0x00050048,0x00000012,0x00000003,0x00000023,0x00000090,
+       0x00050048,0x00000012,0x00000004,0x00000023,0x000000d0,0x00050048,0x00000012,0x00000005,
+       0x00000023,0x000000d8,0x00050048,0x00000012,0x00000006,0x00000023,0x000000e0,0x00050048,
+       0x00000012,0x00000007,0x00000023,0x000000f0,0x00050048,0x00000012,0x00000008,0x00000023,
+       0x000000f8,0x00030047,0x00000012,0x00000002,0x00040047,0x00000014,0x00000022,0x00000000,
+       0x00040047,0x00000014,0x00000021,0x00000000,0x00040047,0x00000017,0x0000001e,0x00000000,
+       0x00040047,0x000000a2,0x0000001e,0x00000000,0x00040047,0x000000aa,0x0000001e,0x00000001,
+       0x00050048,0x000000b0,0x00000000,0x0000000b,0x00000000,0x00050048,0x000000b0,0x00000001,
+       0x0000000b,0x00000001,0x00050048,0x000000b0,0x00000002,0x0000000b,0x00000003,0x00030047,
+       0x000000b0,0x00000002,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,
+       0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000002,0x00040020,0x00000008,
+       0x00000007,0x00000007,0x00040017,0x0000000a,0x00000006,0x00000004,0x00040018,0x0000000b,
+       0x0000000a,0x00000004,0x00040017,0x0000000c,0x00000006,0x00000003,0x00040015,0x0000000d,
+       0x00000020,0x00000001,0x00040032,0x0000000d,0x0000000e,0x00000004,0x0004001c,0x0000000f,
+       0x00000007,0x0000000e,0x00040032,0x0000000d,0x00000010,0x00000004,0x0004001c,0x00000011,
+       0x00000007,0x00000010,0x000b001e,0x00000012,0x0000000b,0x0000000c,0x0000000f,0x00000011,
+       0x00000007,0x00000007,0x0000000a,0x00000007,0x00000007,0x00040020,0x00000013,0x00000002,
+       0x00000012,0x0004003b,0x00000013,0x00000014,0x00000002,0x0004002b,0x0000000d,0x00000015,
+       0x00000002,0x00040020,0x00000016,0x00000001,0x00000007,0x0004003b,0x00000016,0x00000017,
+       0x00000001,0x00040015,0x00000018,0x00000020,0x00000000,0x0004002b,0x00000018,0x00000019,
+       0x00000000,0x00040020,0x0000001a,0x00000001,0x00000006,0x0004002b,0x00000006,0x0000001d,
+       0x3f800000,0x0004002b,0x00000006,0x0000001f,0x3f000000,0x00040020,0x00000022,0x00000002,
+       0x00000006,0x0004002b,0x0000000d,0x00000025,0x00000003,0x0004002b,0x00000018,0x00000026,
+       0x00000001,0x0004002b,0x0000000d,0x0000003e,0x00000001,0x00060034,0x0000000d,0x0000003f,
+       0x00000082,0x0000000e,0x0000003e,0x00060034,0x0000000d,0x00000042,0x00000082,0x00000010,
+       0x0000003e,0x00060034,0x0000000d,0x00000047,0x00000082,0x0000000e,0x0000003e,0x00060034,
+       0x0000000d,0x0000004a,0x00000082,0x00000010,0x0000003e,0x00040020,0x0000004f,0x00000002,
+       0x0000000c,0x0004002b,0x0000000d,0x00000053,0x00000005,0x00040020,0x00000054,0x00000002,
+       0x00000007,0x0004002b,0x0000000d,0x0000005a,0x00000006,0x00040020,0x0000005b,0x00000002,
+       0x0000000a,0x0004002b,0x0000000d,0x00000061,0x00000004,0x00040020,0x0000006e,0x00000007,
+       0x0000000a,0x0004002b,0x00000006,0x00000079,0x00000000,0x0005002c,0x00000007,0x00000080,
+       0x0000001f,0x0000001f,0x0004002b,0x0000000d,0x00000087,0x00000008,0x0004002b,0x0000000d,
+       0x0000008d,0x00000007,0x0004002b,0x0000000d,0x0000009b,0x00000000,0x00040020,0x0000009c,
+       0x00000002,0x0000000b,0x00040020,0x000000a1,0x00000003,0x00000007,0x0004003b,0x000000a1,
+       0x000000a2,0x00000003,0x0004003b,0x000000a1,0x000000aa,0x00000003,0x0004001c,0x000000af,
+       0x00000006,0x00000026,0x0005001e,0x000000b0,0x0000000a,0x00000006,0x000000af,0x00040020,
+       0x000000b1,0x00000003,0x000000b0,0x0004003b,0x000000b1,0x000000b2,0x00000003,0x00040020,
+       0x000000b4,0x00000003,0x0000000a,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
+       0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,0x00000008,
+       0x0000002f,0x00000007,0x0004003b,0x00000008,0x0000003d,0x00000007,0x0004003b,0x00000008,
+       0x00000046,0x00000007,0x0004003b,0x00000008,0x0000004e,0x00000007,0x0004003b,0x00000008,
+       0x00000060,0x00000007,0x0004003b,0x0000006e,0x0000006f,0x00000007,0x0004003b,0x0000006e,
+       0x0000007d,0x00000007,0x00050041,0x0000001a,0x0000001b,0x00000017,0x00000019,0x0004003d,
+       0x00000006,0x0000001c,0x0000001b,0x00050081,0x00000006,0x0000001e,0x0000001c,0x0000001d,
+       0x00050085,0x00000006,0x00000020,0x0000001e,0x0000001f,0x0004006e,0x0000000d,0x00000021,
+       0x00000020,0x00070041,0x00000022,0x00000023,0x00000014,0x00000015,0x00000021,0x00000019,
+       0x0004003d,0x00000006,0x00000024,0x00000023,0x00050041,0x0000001a,0x00000027,0x00000017,
+       0x00000026,0x0004003d,0x00000006,0x00000028,0x00000027,0x00050081,0x00000006,0x00000029,
+       0x00000028,0x0000001d,0x00050085,0x00000006,0x0000002a,0x00000029,0x0000001f,0x0004006e,
+       0x0000000d,0x0000002b,0x0000002a,0x00070041,0x00000022,0x0000002c,0x00000014,0x00000025,
+       0x0000002b,0x00000019,0x0004003d,0x00000006,0x0000002d,0x0000002c,0x00050050,0x00000007,
+       0x0000002e,0x00000024,0x0000002d,0x0003003e,0x00000009,0x0000002e,0x00050041,0x0000001a,
+       0x00000030,0x00000017,0x00000019,0x0004003d,0x00000006,0x00000031,0x00000030,0x00050085,
+       0x00000006,0x00000032,0x00000031,0x0000001f,0x0004006e,0x0000000d,0x00000033,0x00000032,
+       0x00070041,0x00000022,0x00000034,0x00000014,0x00000015,0x00000033,0x00000026,0x0004003d,
+       0x00000006,0x00000035,0x00000034,0x00050041,0x0000001a,0x00000036,0x00000017,0x00000026,
+       0x0004003d,0x00000006,0x00000037,0x00000036,0x00050085,0x00000006,0x00000038,0x00000037,
+       0x0000001f,0x0004006e,0x0000000d,0x00000039,0x00000038,0x00070041,0x00000022,0x0000003a,
+       0x00000014,0x00000025,0x00000039,0x00000026,0x0004003d,0x00000006,0x0000003b,0x0000003a,
+       0x00050050,0x00000007,0x0000003c,0x00000035,0x0000003b,0x0003003e,0x0000002f,0x0000003c,
+       0x00070041,0x00000022,0x00000040,0x00000014,0x00000015,0x0000003f,0x00000019,0x0004003d,
+       0x00000006,0x00000041,0x00000040,0x00070041,0x00000022,0x00000043,0x00000014,0x00000025,
+       0x00000042,0x00000019,0x0004003d,0x00000006,0x00000044,0x00000043,0x00050050,0x00000007,
+       0x00000045,0x00000041,0x00000044,0x0003003e,0x0000003d,0x00000045,0x00070041,0x00000022,
+       0x00000048,0x00000014,0x00000015,0x00000047,0x00000026,0x0004003d,0x00000006,0x00000049,
+       0x00000048,0x00070041,0x00000022,0x0000004b,0x00000014,0x00000025,0x0000004a,0x00000026,
+       0x0004003d,0x00000006,0x0000004c,0x0000004b,0x00050050,0x00000007,0x0000004d,0x00000049,
+       0x0000004c,0x0003003e,0x00000046,0x0000004d,0x00050041,0x0000004f,0x00000050,0x00000014,
+       0x0000003e,0x0004003d,0x0000000c,0x00000051,0x00000050,0x0007004f,0x00000007,0x00000052,
+       0x00000051,0x00000051,0x00000000,0x00000001,0x00050041,0x00000054,0x00000055,0x00000014,
+       0x00000053,0x0004003d,0x00000007,0x00000056,0x00000055,0x00050085,0x00000007,0x00000057,
+       0x00000052,0x00000056,0x00050041,0x00000054,0x00000058,0x00000014,0x00000053,0x0004003d,
+       0x00000007,0x00000059,0x00000058,0x00050041,0x0000005b,0x0000005c,0x00000014,0x0000005a,
+       0x0004003d,0x0000000a,0x0000005d,0x0000005c,0x0007004f,0x00000007,0x0000005e,0x0000005d,
+       0x0000005d,0x00000002,0x00000003,0x0008000c,0x00000007,0x0000005f,0x00000001,0x0000002e,
+       0x00000057,0x00000059,0x0000005e,0x0003003e,0x0000004e,0x0000005f,0x00050041,0x00000054,
+       0x00000062,0x00000014,0x00000061,0x0004003d,0x00000007,0x00000063,0x00000062,0x00050041,
+       0x00000054,0x00000064,0x00000014,0x00000061,0x0004003d,0x00000007,0x00000065,0x00000064,
+       0x00050041,0x0000004f,0x00000066,0x00000014,0x0000003e,0x0004003d,0x0000000c,0x00000067,
+       0x00000066,0x0007004f,0x00000007,0x00000068,0x00000067,0x00000067,0x00000000,0x00000001,
+       0x00050088,0x00000007,0x00000069,0x00000065,0x00000068,0x00050041,0x0000005b,0x0000006a,
+       0x00000014,0x0000005a,0x0004003d,0x0000000a,0x0000006b,0x0000006a,0x0007004f,0x00000007,
+       0x0000006c,0x0000006b,0x0000006b,0x00000000,0x00000001,0x0008000c,0x00000007,0x0000006d,
+       0x00000001,0x0000002e,0x00000063,0x00000069,0x0000006c,0x0003003e,0x00000060,0x0000006d,
+       0x0004003d,0x00000007,0x00000070,0x00000009,0x0004003d,0x00000007,0x00000071,0x0000004e,
+       0x0004003d,0x00000007,0x00000072,0x0000003d,0x00050083,0x00000007,0x00000073,0x00000071,
+       0x00000072,0x0004003d,0x00000007,0x00000074,0x0000002f,0x00050085,0x00000007,0x00000075,
+       0x00000073,0x00000074,0x0004003d,0x00000007,0x00000076,0x00000046,0x00050088,0x00000007,
+       0x00000077,0x00000075,0x00000076,0x00050081,0x00000007,0x00000078,0x00000070,0x00000077,
+       0x00050051,0x00000006,0x0000007a,0x00000078,0x00000000,0x00050051,0x00000006,0x0000007b,
+       0x00000078,0x00000001,0x00070050,0x0000000a,0x0000007c,0x0000007a,0x0000007b,0x00000079,
+       0x0000001d,0x0003003e,0x0000006f,0x0000007c,0x0004003d,0x0000000a,0x0000007e,0x0000006f,
+       0x0003003e,0x0000007d,0x0000007e,0x0004003d,0x00000007,0x0000007f,0x0000004e,0x00050085,
+       0x00000007,0x00000081,0x0000007f,0x00000080,0x0004003d,0x0000000a,0x00000082,0x0000007d,
+       0x0007004f,0x00000007,0x00000083,0x00000082,0x00000082,0x00000000,0x00000001,0x00050083,
+       0x00000007,0x00000084,0x00000083,0x00000081,0x0004003d,0x0000000a,0x00000085,0x0000007d,
+       0x0009004f,0x0000000a,0x00000086,0x00000085,0x00000084,0x00000004,0x00000005,0x00000002,
+       0x00000003,0x0003003e,0x0000007d,0x00000086,0x00050041,0x00000054,0x00000088,0x00000014,
+       0x00000087,0x0004003d,0x00000007,0x00000089,0x00000088,0x0004003d,0x00000007,0x0000008a,
+       0x0000004e,0x00050085,0x00000007,0x0000008b,0x00000089,0x0000008a,0x0004003d,0x00000007,
+       0x0000008c,0x00000060,0x00050041,0x00000054,0x0000008e,0x00000014,0x0000008d,0x0004003d,
+       0x00000007,0x0000008f,0x0000008e,0x00050081,0x00000007,0x00000090,0x0000008c,0x0000008f,
+       0x00050041,0x0000004f,0x00000091,0x00000014,0x0000003e,0x0004003d,0x0000000c,0x00000092,
+       0x00000091,0x0007004f,0x00000007,0x00000093,0x00000092,0x00000092,0x00000000,0x00000001,
+       0x00050085,0x00000007,0x00000094,0x00000090,0x00000093,0x00050081,0x00000007,0x00000095,
+       0x0000008b,0x00000094,0x0004003d,0x0000000a,0x00000096,0x0000007d,0x0007004f,0x00000007,
+       0x00000097,0x00000096,0x00000096,0x00000000,0x00000001,0x00050081,0x00000007,0x00000098,
+       0x00000097,0x00000095,0x0004003d,0x0000000a,0x00000099,0x0000007d,0x0009004f,0x0000000a,
+       0x0000009a,0x00000099,0x00000098,0x00000004,0x00000005,0x00000002,0x00000003,0x0003003e,
+       0x0000007d,0x0000009a,0x00050041,0x0000009c,0x0000009d,0x00000014,0x0000009b,0x0004003d,
+       0x0000000b,0x0000009e,0x0000009d,0x0004003d,0x0000000a,0x0000009f,0x0000007d,0x00050091,
+       0x0000000a,0x000000a0,0x0000009e,0x0000009f,0x0003003e,0x0000007d,0x000000a0,0x0004003d,
+       0x00000007,0x000000a3,0x00000009,0x0004003d,0x00000007,0x000000a4,0x0000002f,0x00050081,
+       0x00000007,0x000000a5,0x000000a3,0x000000a4,0x0004003d,0x00000007,0x000000a6,0x0000003d,
+       0x0004003d,0x00000007,0x000000a7,0x00000046,0x00050081,0x00000007,0x000000a8,0x000000a6,
+       0x000000a7,0x00050088,0x00000007,0x000000a9,0x000000a5,0x000000a8,0x0003003e,0x000000a2,
+       0x000000a9,0x0004003d,0x0000000a,0x000000ab,0x0000006f,0x0007004f,0x00000007,0x000000ac,
+       0x000000ab,0x000000ab,0x00000000,0x00000001,0x0004003d,0x00000007,0x000000ad,0x0000004e,
+       0x00050088,0x00000007,0x000000ae,0x000000ac,0x000000ad,0x0003003e,0x000000aa,0x000000ae,
+       0x0004003d,0x0000000a,0x000000b3,0x0000007d,0x00050041,0x000000b4,0x000000b5,0x000000b2,
+       0x0000009b,0x0003003e,0x000000b5,0x000000b3,0x000100fd,0x00010038
 };
index 6ab2e50..d6f02ab 100644 (file)
@@ -1,75 +1,50 @@
 std::vector<uint32_t> SHADER_TEXT_VISUAL_MULTI_COLOR_TEXT_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x0000005b,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000003a,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000032,0x00000053,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x0000002a,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00060006,0x0000000c,0x00000000,0x6c744175,
-       0x65527361,0x00007463,0x00050006,0x0000000c,0x00000001,0x6c6f4375,0x0000726f,0x00060006,
-       0x0000000c,0x00000002,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000c,0x00000003,
-       0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000004,0x4d657270,0x69746c75,0x65696c70,
-       0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,0x00000028,0x43786574,
-       0x64726f6f,0x00000000,0x00050005,0x00000032,0x78655476,0x726f6f43,0x00000064,0x00050005,
-       0x0000003d,0x74786574,0x74786554,0x00657275,0x00050005,0x00000041,0x78655473,0x65727574,
-       0x00000000,0x00050005,0x00000053,0x67617266,0x6f6c6f43,0x00000072,0x00050048,0x0000000c,
-       0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,0x00000010,
-       0x00050048,0x0000000c,0x00000002,0x00000023,0x00000020,0x00050048,0x0000000c,0x00000003,
-       0x00000023,0x0000002c,0x00050048,0x0000000c,0x00000004,0x00000023,0x00000030,0x00030047,
-       0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,0x00000000,0x00040047,0x0000000e,
-       0x00000021,0x00000001,0x00040047,0x00000032,0x0000001e,0x00000000,0x00040047,0x00000041,
-       0x00000022,0x00000000,0x00040047,0x00000041,0x00000021,0x00000002,0x00040047,0x00000053,
+       0x00000000,0x00050005,0x00000009,0x74786574,0x74786554,0x00657275,0x00050005,0x0000000d,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,0x00000064,
+       0x00050005,0x0000001b,0x67617246,0x61746144,0x00000000,0x00050006,0x0000001b,0x00000000,
+       0x6c6f4375,0x0000726f,0x00060006,0x0000001b,0x00000001,0x4378696d,0x726f6c6f,0x00000000,
+       0x00080006,0x0000001b,0x00000002,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,
+       0x00030005,0x0000001d,0x00000000,0x00050005,0x0000002a,0x67617266,0x6f6c6f43,0x00000072,
+       0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,0x0000000d,0x00000021,0x00000002,
+       0x00040047,0x00000011,0x0000001e,0x00000000,0x00050048,0x0000001b,0x00000000,0x00000023,
+       0x00000000,0x00050048,0x0000001b,0x00000001,0x00000023,0x00000010,0x00050048,0x0000001b,
+       0x00000002,0x00000023,0x0000001c,0x00030047,0x0000001b,0x00000002,0x00040047,0x0000001d,
+       0x00000022,0x00000000,0x00040047,0x0000001d,0x00000021,0x00000001,0x00040047,0x0000002a,
        0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,
-       0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00030021,0x00000008,
-       0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,0x0007001e,0x0000000c,0x00000007,
-       0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,0x00000002,0x0000000c,
-       0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,0x00000020,0x00000001,
-       0x0004002b,0x0000000f,0x00000010,0x00000002,0x00040020,0x00000011,0x00000002,0x0000000b,
-       0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,0x0000000f,0x00000015,0x00000003,
-       0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,0x0000000f,0x00000019,0x00000004,
-       0x00040017,0x00000026,0x00000006,0x00000002,0x00040020,0x00000027,0x00000007,0x00000026,
-       0x0004002b,0x0000000f,0x00000029,0x00000000,0x00040020,0x0000002a,0x00000002,0x00000007,
-       0x00040020,0x00000031,0x00000001,0x00000026,0x0004003b,0x00000031,0x00000032,0x00000001,
-       0x00040020,0x0000003c,0x00000007,0x00000007,0x00090019,0x0000003e,0x00000006,0x00000001,
-       0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000003f,0x0000003e,
-       0x00040020,0x00000040,0x00000000,0x0000003f,0x0004003b,0x00000040,0x00000041,0x00000000,
-       0x00040015,0x00000045,0x00000020,0x00000000,0x0004002b,0x00000045,0x00000046,0x00000003,
-       0x00040020,0x00000047,0x00000007,0x00000006,0x00040020,0x00000052,0x00000003,0x00000007,
-       0x0004003b,0x00000052,0x00000053,0x00000003,0x0004002b,0x0000000f,0x00000055,0x00000001,
-       0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
-       0x00000027,0x00000028,0x00000007,0x0004003b,0x0000003c,0x0000003d,0x00000007,0x00050041,
-       0x0000002a,0x0000002b,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002c,0x0000002b,
-       0x0007004f,0x00000026,0x0000002d,0x0000002c,0x0000002c,0x00000000,0x00000001,0x00050041,
-       0x0000002a,0x0000002e,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002f,0x0000002e,
-       0x0007004f,0x00000026,0x00000030,0x0000002f,0x0000002f,0x00000002,0x00000003,0x0004003d,
-       0x00000026,0x00000033,0x00000032,0x0008000c,0x00000026,0x00000034,0x00000001,0x0000002e,
-       0x0000002d,0x00000030,0x00000033,0x00050041,0x0000002a,0x00000035,0x0000000e,0x00000029,
-       0x0004003d,0x00000007,0x00000036,0x00000035,0x0007004f,0x00000026,0x00000037,0x00000036,
-       0x00000036,0x00000000,0x00000001,0x00050041,0x0000002a,0x00000038,0x0000000e,0x00000029,
-       0x0004003d,0x00000007,0x00000039,0x00000038,0x0007004f,0x00000026,0x0000003a,0x00000039,
-       0x00000039,0x00000002,0x00000003,0x0008000c,0x00000026,0x0000003b,0x00000001,0x0000002b,
-       0x00000034,0x00000037,0x0000003a,0x0003003e,0x00000028,0x0000003b,0x0004003d,0x0000003f,
-       0x00000042,0x00000041,0x0004003d,0x00000026,0x00000043,0x00000028,0x00050057,0x00000007,
-       0x00000044,0x00000042,0x00000043,0x0003003e,0x0000003d,0x00000044,0x00050041,0x00000047,
-       0x00000048,0x0000003d,0x00000046,0x0004003d,0x00000006,0x00000049,0x00000048,0x00050041,
-       0x00000016,0x0000004a,0x0000000e,0x00000019,0x0004003d,0x00000006,0x0000004b,0x0000004a,
-       0x0008000c,0x00000006,0x0000004c,0x00000001,0x0000002e,0x00000014,0x00000049,0x0000004b,
-       0x0004003d,0x00000007,0x0000004d,0x0000003d,0x0008004f,0x0000000b,0x0000004e,0x0000004d,
-       0x0000004d,0x00000000,0x00000001,0x00000002,0x0005008e,0x0000000b,0x0000004f,0x0000004e,
-       0x0000004c,0x0004003d,0x00000007,0x00000050,0x0000003d,0x0009004f,0x00000007,0x00000051,
-       0x00000050,0x0000004f,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000003d,
-       0x00000051,0x0004003d,0x00000007,0x00000054,0x0000003d,0x00050041,0x0000002a,0x00000056,
-       0x0000000e,0x00000055,0x0004003d,0x00000007,0x00000057,0x00000056,0x00050085,0x00000007,
-       0x00000058,0x00000054,0x00000057,0x00040039,0x00000007,0x00000059,0x00000009,0x00050085,
-       0x00000007,0x0000005a,0x00000058,0x00000059,0x0003003e,0x00000053,0x0000005a,0x000100fd,
-       0x00010038,0x00050036,0x00000007,0x00000009,0x00000000,0x00000008,0x000200f8,0x0000000a,
-       0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000b,0x00000013,
-       0x00000012,0x00050041,0x00000016,0x00000017,0x0000000e,0x00000015,0x0004003d,0x00000006,
-       0x00000018,0x00000017,0x00050041,0x00000016,0x0000001a,0x0000000e,0x00000019,0x0004003d,
-       0x00000006,0x0000001b,0x0000001a,0x0008000c,0x00000006,0x0000001c,0x00000001,0x0000002e,
-       0x00000014,0x00000018,0x0000001b,0x0005008e,0x0000000b,0x0000001d,0x00000013,0x0000001c,
-       0x00050041,0x00000016,0x0000001e,0x0000000e,0x00000015,0x0004003d,0x00000006,0x0000001f,
-       0x0000001e,0x00050051,0x00000006,0x00000020,0x0000001d,0x00000000,0x00050051,0x00000006,
-       0x00000021,0x0000001d,0x00000001,0x00050051,0x00000006,0x00000022,0x0000001d,0x00000002,
-       0x00070050,0x00000007,0x00000023,0x00000020,0x00000021,0x00000022,0x0000001f,0x000200fe,
-       0x00000023,0x00010038
+       0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,
+       0x00000007,0x00000007,0x00090019,0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,
+       0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,
+       0x00000000,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,
+       0x00000006,0x00000002,0x00040020,0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,
+       0x00000011,0x00000001,0x0004002b,0x00000006,0x00000014,0x3f800000,0x00040015,0x00000015,
+       0x00000020,0x00000000,0x0004002b,0x00000015,0x00000016,0x00000003,0x00040020,0x00000017,
+       0x00000007,0x00000006,0x00040017,0x0000001a,0x00000006,0x00000003,0x0005001e,0x0000001b,
+       0x00000007,0x0000001a,0x00000006,0x00040020,0x0000001c,0x00000002,0x0000001b,0x0004003b,
+       0x0000001c,0x0000001d,0x00000002,0x00040015,0x0000001e,0x00000020,0x00000001,0x0004002b,
+       0x0000001e,0x0000001f,0x00000002,0x00040020,0x00000020,0x00000002,0x00000006,0x00040020,
+       0x00000029,0x00000003,0x00000007,0x0004003b,0x00000029,0x0000002a,0x00000003,0x0004002b,
+       0x0000001e,0x0000002c,0x00000000,0x00040020,0x0000002d,0x00000002,0x00000007,0x0004002b,
+       0x0000001e,0x00000031,0x00000001,0x00040020,0x00000032,0x00000002,0x0000001a,0x00050036,
+       0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,
+       0x00000009,0x00000007,0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d,0x0000000f,
+       0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,0x00000012,0x0003003e,
+       0x00000009,0x00000013,0x00050041,0x00000017,0x00000018,0x00000009,0x00000016,0x0004003d,
+       0x00000006,0x00000019,0x00000018,0x00050041,0x00000020,0x00000021,0x0000001d,0x0000001f,
+       0x0004003d,0x00000006,0x00000022,0x00000021,0x0008000c,0x00000006,0x00000023,0x00000001,
+       0x0000002e,0x00000014,0x00000019,0x00000022,0x0004003d,0x00000007,0x00000024,0x00000009,
+       0x0008004f,0x0000001a,0x00000025,0x00000024,0x00000024,0x00000000,0x00000001,0x00000002,
+       0x0005008e,0x0000001a,0x00000026,0x00000025,0x00000023,0x0004003d,0x00000007,0x00000027,
+       0x00000009,0x0009004f,0x00000007,0x00000028,0x00000027,0x00000026,0x00000004,0x00000005,
+       0x00000006,0x00000003,0x0003003e,0x00000009,0x00000028,0x0004003d,0x00000007,0x0000002b,
+       0x00000009,0x00050041,0x0000002d,0x0000002e,0x0000001d,0x0000002c,0x0004003d,0x00000007,
+       0x0000002f,0x0000002e,0x00050085,0x00000007,0x00000030,0x0000002b,0x0000002f,0x00050041,
+       0x00000032,0x00000033,0x0000001d,0x00000031,0x0004003d,0x0000001a,0x00000034,0x00000033,
+       0x00050051,0x00000006,0x00000035,0x00000034,0x00000000,0x00050051,0x00000006,0x00000036,
+       0x00000034,0x00000001,0x00050051,0x00000006,0x00000037,0x00000034,0x00000002,0x00070050,
+       0x00000007,0x00000038,0x00000035,0x00000036,0x00000037,0x00000014,0x00050085,0x00000007,
+       0x00000039,0x00000030,0x00000038,0x0003003e,0x0000002a,0x00000039,0x000100fd,0x00010038
 };
index d398ba6..c0ee28b 100644 (file)
@@ -1,83 +1,59 @@
 std::vector<uint32_t> SHADER_TEXT_VISUAL_MULTI_COLOR_TEXT_WITH_STYLE_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000066,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000045,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000032,0x00000058,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x0000002f,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00060006,0x0000000c,0x00000000,0x6c744175,
-       0x65527361,0x00007463,0x00050006,0x0000000c,0x00000001,0x6c6f4375,0x0000726f,0x00060006,
-       0x0000000c,0x00000002,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000c,0x00000003,
-       0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000004,0x4d657270,0x69746c75,0x65696c70,
-       0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,0x00000028,0x43786574,
-       0x64726f6f,0x00000000,0x00050005,0x00000032,0x78655476,0x726f6f43,0x00000064,0x00050005,
-       0x0000003d,0x74786574,0x74786554,0x00657275,0x00050005,0x00000041,0x78655473,0x65727574,
-       0x00000000,0x00060005,0x00000045,0x6c797473,0x78655465,0x65727574,0x00000000,0x00040005,
-       0x00000046,0x79745373,0x0000656c,0x00050005,0x00000058,0x67617266,0x6f6c6f43,0x00000072,
-       0x00050048,0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,
-       0x00000023,0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,0x00000020,0x00050048,
-       0x0000000c,0x00000003,0x00000023,0x0000002c,0x00050048,0x0000000c,0x00000004,0x00000023,
-       0x00000030,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,0x00000001,
-       0x00040047,0x0000000e,0x00000021,0x00000000,0x00040047,0x00000032,0x0000001e,0x00000000,
-       0x00040047,0x00000041,0x00000022,0x00000001,0x00040047,0x00000041,0x00000021,0x00000001,
-       0x00040047,0x00000046,0x00000022,0x00000001,0x00040047,0x00000046,0x00000021,0x00000002,
-       0x00040047,0x00000058,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,
+       0x00000000,0x00050005,0x00000009,0x74786574,0x74786554,0x00657275,0x00050005,0x0000000d,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,0x00000064,
+       0x00060005,0x00000014,0x6c797473,0x78655465,0x65727574,0x00000000,0x00040005,0x00000015,
+       0x79745373,0x0000656c,0x00050005,0x00000020,0x67617246,0x61746144,0x00000000,0x00050006,
+       0x00000020,0x00000000,0x6c6f4375,0x0000726f,0x00060006,0x00000020,0x00000001,0x4378696d,
+       0x726f6c6f,0x00000000,0x00080006,0x00000020,0x00000002,0x4d657270,0x69746c75,0x65696c70,
+       0x706c4164,0x00006168,0x00030005,0x00000022,0x00000000,0x00050005,0x0000002f,0x67617266,
+       0x6f6c6f43,0x00000072,0x00040047,0x0000000d,0x00000022,0x00000001,0x00040047,0x0000000d,
+       0x00000021,0x00000001,0x00040047,0x00000011,0x0000001e,0x00000000,0x00040047,0x00000015,
+       0x00000022,0x00000001,0x00040047,0x00000015,0x00000021,0x00000002,0x00050048,0x00000020,
+       0x00000000,0x00000023,0x00000000,0x00050048,0x00000020,0x00000001,0x00000023,0x00000010,
+       0x00050048,0x00000020,0x00000002,0x00000023,0x0000001c,0x00030047,0x00000020,0x00000002,
+       0x00040047,0x00000022,0x00000022,0x00000001,0x00040047,0x00000022,0x00000021,0x00000000,
+       0x00040047,0x0000002f,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,
        0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,
-       0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,0x0007001e,
-       0x0000000c,0x00000007,0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,
-       0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,
-       0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000002,0x00040020,0x00000011,
-       0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,0x0000000f,
-       0x00000015,0x00000003,0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,0x0000000f,
-       0x00000019,0x00000004,0x00040017,0x00000026,0x00000006,0x00000002,0x00040020,0x00000027,
-       0x00000007,0x00000026,0x0004002b,0x0000000f,0x00000029,0x00000000,0x00040020,0x0000002a,
-       0x00000002,0x00000007,0x00040020,0x00000031,0x00000001,0x00000026,0x0004003b,0x00000031,
-       0x00000032,0x00000001,0x00040020,0x0000003c,0x00000007,0x00000007,0x00090019,0x0000003e,
-       0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,
-       0x0000003f,0x0000003e,0x00040020,0x00000040,0x00000000,0x0000003f,0x0004003b,0x00000040,
-       0x00000041,0x00000000,0x0004003b,0x00000040,0x00000046,0x00000000,0x00040015,0x0000004a,
-       0x00000020,0x00000000,0x0004002b,0x0000004a,0x0000004b,0x00000003,0x00040020,0x0000004c,
-       0x00000007,0x00000006,0x00040020,0x00000057,0x00000003,0x00000007,0x0004003b,0x00000057,
-       0x00000058,0x00000003,0x0004002b,0x0000000f,0x00000060,0x00000001,0x00050036,0x00000002,
-       0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000027,0x00000028,
-       0x00000007,0x0004003b,0x0000003c,0x0000003d,0x00000007,0x0004003b,0x0000003c,0x00000045,
-       0x00000007,0x00050041,0x0000002a,0x0000002b,0x0000000e,0x00000029,0x0004003d,0x00000007,
-       0x0000002c,0x0000002b,0x0007004f,0x00000026,0x0000002d,0x0000002c,0x0000002c,0x00000000,
-       0x00000001,0x00050041,0x0000002a,0x0000002e,0x0000000e,0x00000029,0x0004003d,0x00000007,
-       0x0000002f,0x0000002e,0x0007004f,0x00000026,0x00000030,0x0000002f,0x0000002f,0x00000002,
-       0x00000003,0x0004003d,0x00000026,0x00000033,0x00000032,0x0008000c,0x00000026,0x00000034,
-       0x00000001,0x0000002e,0x0000002d,0x00000030,0x00000033,0x00050041,0x0000002a,0x00000035,
-       0x0000000e,0x00000029,0x0004003d,0x00000007,0x00000036,0x00000035,0x0007004f,0x00000026,
-       0x00000037,0x00000036,0x00000036,0x00000000,0x00000001,0x00050041,0x0000002a,0x00000038,
-       0x0000000e,0x00000029,0x0004003d,0x00000007,0x00000039,0x00000038,0x0007004f,0x00000026,
-       0x0000003a,0x00000039,0x00000039,0x00000002,0x00000003,0x0008000c,0x00000026,0x0000003b,
-       0x00000001,0x0000002b,0x00000034,0x00000037,0x0000003a,0x0003003e,0x00000028,0x0000003b,
-       0x0004003d,0x0000003f,0x00000042,0x00000041,0x0004003d,0x00000026,0x00000043,0x00000028,
-       0x00050057,0x00000007,0x00000044,0x00000042,0x00000043,0x0003003e,0x0000003d,0x00000044,
-       0x0004003d,0x0000003f,0x00000047,0x00000046,0x0004003d,0x00000026,0x00000048,0x00000028,
-       0x00050057,0x00000007,0x00000049,0x00000047,0x00000048,0x0003003e,0x00000045,0x00000049,
-       0x00050041,0x0000004c,0x0000004d,0x0000003d,0x0000004b,0x0004003d,0x00000006,0x0000004e,
-       0x0000004d,0x00050041,0x00000016,0x0000004f,0x0000000e,0x00000019,0x0004003d,0x00000006,
-       0x00000050,0x0000004f,0x0008000c,0x00000006,0x00000051,0x00000001,0x0000002e,0x00000014,
-       0x0000004e,0x00000050,0x0004003d,0x00000007,0x00000052,0x0000003d,0x0008004f,0x0000000b,
-       0x00000053,0x00000052,0x00000052,0x00000000,0x00000001,0x00000002,0x0005008e,0x0000000b,
-       0x00000054,0x00000053,0x00000051,0x0004003d,0x00000007,0x00000055,0x0000003d,0x0009004f,
-       0x00000007,0x00000056,0x00000055,0x00000054,0x00000004,0x00000005,0x00000006,0x00000003,
-       0x0003003e,0x0000003d,0x00000056,0x0004003d,0x00000007,0x00000059,0x0000003d,0x0004003d,
-       0x00000007,0x0000005a,0x00000045,0x00050041,0x0000004c,0x0000005b,0x0000003d,0x0000004b,
-       0x0004003d,0x00000006,0x0000005c,0x0000005b,0x00050083,0x00000006,0x0000005d,0x00000014,
-       0x0000005c,0x0005008e,0x00000007,0x0000005e,0x0000005a,0x0000005d,0x00050081,0x00000007,
-       0x0000005f,0x00000059,0x0000005e,0x00050041,0x0000002a,0x00000061,0x0000000e,0x00000060,
-       0x0004003d,0x00000007,0x00000062,0x00000061,0x00050085,0x00000007,0x00000063,0x0000005f,
-       0x00000062,0x00040039,0x00000007,0x00000064,0x00000009,0x00050085,0x00000007,0x00000065,
-       0x00000063,0x00000064,0x0003003e,0x00000058,0x00000065,0x000100fd,0x00010038,0x00050036,
-       0x00000007,0x00000009,0x00000000,0x00000008,0x000200f8,0x0000000a,0x00050041,0x00000011,
-       0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000b,0x00000013,0x00000012,0x00050041,
-       0x00000016,0x00000017,0x0000000e,0x00000015,0x0004003d,0x00000006,0x00000018,0x00000017,
-       0x00050041,0x00000016,0x0000001a,0x0000000e,0x00000019,0x0004003d,0x00000006,0x0000001b,
-       0x0000001a,0x0008000c,0x00000006,0x0000001c,0x00000001,0x0000002e,0x00000014,0x00000018,
-       0x0000001b,0x0005008e,0x0000000b,0x0000001d,0x00000013,0x0000001c,0x00050041,0x00000016,
-       0x0000001e,0x0000000e,0x00000015,0x0004003d,0x00000006,0x0000001f,0x0000001e,0x00050051,
-       0x00000006,0x00000020,0x0000001d,0x00000000,0x00050051,0x00000006,0x00000021,0x0000001d,
-       0x00000001,0x00050051,0x00000006,0x00000022,0x0000001d,0x00000002,0x00070050,0x00000007,
-       0x00000023,0x00000020,0x00000021,0x00000022,0x0000001f,0x000200fe,0x00000023,0x00010038
+       0x00040020,0x00000008,0x00000007,0x00000007,0x00090019,0x0000000a,0x00000006,0x00000001,
+       0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000b,0x0000000a,
+       0x00040020,0x0000000c,0x00000000,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000000,
+       0x00040017,0x0000000f,0x00000006,0x00000002,0x00040020,0x00000010,0x00000001,0x0000000f,
+       0x0004003b,0x00000010,0x00000011,0x00000001,0x0004003b,0x0000000c,0x00000015,0x00000000,
+       0x0004002b,0x00000006,0x00000019,0x3f800000,0x00040015,0x0000001a,0x00000020,0x00000000,
+       0x0004002b,0x0000001a,0x0000001b,0x00000003,0x00040020,0x0000001c,0x00000007,0x00000006,
+       0x00040017,0x0000001f,0x00000006,0x00000003,0x0005001e,0x00000020,0x00000007,0x0000001f,
+       0x00000006,0x00040020,0x00000021,0x00000002,0x00000020,0x0004003b,0x00000021,0x00000022,
+       0x00000002,0x00040015,0x00000023,0x00000020,0x00000001,0x0004002b,0x00000023,0x00000024,
+       0x00000002,0x00040020,0x00000025,0x00000002,0x00000006,0x00040020,0x0000002e,0x00000003,
+       0x00000007,0x0004003b,0x0000002e,0x0000002f,0x00000003,0x0004002b,0x00000023,0x00000037,
+       0x00000000,0x00040020,0x00000038,0x00000002,0x00000007,0x0004002b,0x00000023,0x0000003c,
+       0x00000001,0x00040020,0x0000003d,0x00000002,0x0000001f,0x00050036,0x00000002,0x00000004,
+       0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,
+       0x0004003b,0x00000008,0x00000014,0x00000007,0x0004003d,0x0000000b,0x0000000e,0x0000000d,
+       0x0004003d,0x0000000f,0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,
+       0x00000012,0x0003003e,0x00000009,0x00000013,0x0004003d,0x0000000b,0x00000016,0x00000015,
+       0x0004003d,0x0000000f,0x00000017,0x00000011,0x00050057,0x00000007,0x00000018,0x00000016,
+       0x00000017,0x0003003e,0x00000014,0x00000018,0x00050041,0x0000001c,0x0000001d,0x00000009,
+       0x0000001b,0x0004003d,0x00000006,0x0000001e,0x0000001d,0x00050041,0x00000025,0x00000026,
+       0x00000022,0x00000024,0x0004003d,0x00000006,0x00000027,0x00000026,0x0008000c,0x00000006,
+       0x00000028,0x00000001,0x0000002e,0x00000019,0x0000001e,0x00000027,0x0004003d,0x00000007,
+       0x00000029,0x00000009,0x0008004f,0x0000001f,0x0000002a,0x00000029,0x00000029,0x00000000,
+       0x00000001,0x00000002,0x0005008e,0x0000001f,0x0000002b,0x0000002a,0x00000028,0x0004003d,
+       0x00000007,0x0000002c,0x00000009,0x0009004f,0x00000007,0x0000002d,0x0000002c,0x0000002b,
+       0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x00000009,0x0000002d,0x0004003d,
+       0x00000007,0x00000030,0x00000009,0x0004003d,0x00000007,0x00000031,0x00000014,0x00050041,
+       0x0000001c,0x00000032,0x00000009,0x0000001b,0x0004003d,0x00000006,0x00000033,0x00000032,
+       0x00050083,0x00000006,0x00000034,0x00000019,0x00000033,0x0005008e,0x00000007,0x00000035,
+       0x00000031,0x00000034,0x00050081,0x00000007,0x00000036,0x00000030,0x00000035,0x00050041,
+       0x00000038,0x00000039,0x00000022,0x00000037,0x0004003d,0x00000007,0x0000003a,0x00000039,
+       0x00050085,0x00000007,0x0000003b,0x00000036,0x0000003a,0x00050041,0x0000003d,0x0000003e,
+       0x00000022,0x0000003c,0x0004003d,0x0000001f,0x0000003f,0x0000003e,0x00050051,0x00000006,
+       0x00000040,0x0000003f,0x00000000,0x00050051,0x00000006,0x00000041,0x0000003f,0x00000001,
+       0x00050051,0x00000006,0x00000042,0x0000003f,0x00000002,0x00070050,0x00000007,0x00000043,
+       0x00000040,0x00000041,0x00000042,0x00000019,0x00050085,0x00000007,0x00000044,0x0000003b,
+       0x00000043,0x0003003e,0x0000002f,0x00000044,0x000100fd,0x00010038
 };
index 443eb03..e599ea8 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_TEXT_VISUAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x00000081,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000081,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000035,0x00000069,0x0000007c,
        0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,
index c24033d..f2cb982 100644 (file)
@@ -1,72 +1,46 @@
 std::vector<uint32_t> SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000055,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000032,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000032,0x00000049,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000010,0x00000018,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00090006,0x0000000c,0x00000000,0x78655475,
-       0x6c6f4374,0x6e41726f,0x74616d69,0x656c6261,0x00000000,0x00060006,0x0000000c,0x00000001,
-       0x6c744175,0x65527361,0x00007463,0x00050006,0x0000000c,0x00000002,0x6c6f4375,0x0000726f,
-       0x00060006,0x0000000c,0x00000003,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000c,
-       0x00000004,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000005,0x4d657270,0x69746c75,
-       0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,0x00000028,
-       0x43786574,0x64726f6f,0x00000000,0x00050005,0x00000032,0x78655476,0x726f6f43,0x00000064,
-       0x00050005,0x0000003d,0x74786574,0x74786554,0x00657275,0x00050005,0x00000041,0x78655473,
-       0x65727574,0x00000000,0x00050005,0x00000049,0x67617266,0x6f6c6f43,0x00000072,0x00050048,
-       0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,
-       0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,0x00000020,0x00050048,0x0000000c,
-       0x00000003,0x00000023,0x00000030,0x00050048,0x0000000c,0x00000004,0x00000023,0x0000003c,
-       0x00050048,0x0000000c,0x00000005,0x00000023,0x00000040,0x00030047,0x0000000c,0x00000002,
-       0x00040047,0x0000000e,0x00000022,0x00000000,0x00040047,0x0000000e,0x00000021,0x00000001,
-       0x00040047,0x00000032,0x0000001e,0x00000000,0x00040047,0x00000041,0x00000022,0x00000000,
-       0x00040047,0x00000041,0x00000021,0x00000002,0x00040047,0x00000049,0x0000001e,0x00000000,
+       0x00000000,0x00050005,0x00000008,0x74786574,0x74786554,0x00657275,0x00050005,0x0000000c,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000010,0x78655476,0x726f6f43,0x00000064,
+       0x00050005,0x00000018,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000001a,0x67617246,
+       0x61746144,0x00000000,0x00090006,0x0000001a,0x00000000,0x78655475,0x6c6f4374,0x6e41726f,
+       0x74616d69,0x656c6261,0x00000000,0x00050006,0x0000001a,0x00000001,0x6c6f4375,0x0000726f,
+       0x00060006,0x0000001a,0x00000002,0x4378696d,0x726f6c6f,0x00000000,0x00080006,0x0000001a,
+       0x00000003,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000001c,
+       0x00000000,0x00040047,0x0000000c,0x00000022,0x00000000,0x00040047,0x0000000c,0x00000021,
+       0x00000002,0x00040047,0x00000010,0x0000001e,0x00000000,0x00040047,0x00000018,0x0000001e,
+       0x00000000,0x00050048,0x0000001a,0x00000000,0x00000023,0x00000000,0x00050048,0x0000001a,
+       0x00000001,0x00000023,0x00000010,0x00050048,0x0000001a,0x00000002,0x00000023,0x00000020,
+       0x00050048,0x0000001a,0x00000003,0x00000023,0x0000002c,0x00030047,0x0000001a,0x00000002,
+       0x00040047,0x0000001c,0x00000022,0x00000000,0x00040047,0x0000001c,0x00000021,0x00000001,
        0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,
-       0x00040017,0x00000007,0x00000006,0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,
-       0x0000000b,0x00000006,0x00000003,0x0008001e,0x0000000c,0x00000007,0x00000007,0x00000007,
-       0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,0x00000002,0x0000000c,0x0004003b,
-       0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,0x00000020,0x00000001,0x0004002b,
-       0x0000000f,0x00000010,0x00000003,0x00040020,0x00000011,0x00000002,0x0000000b,0x0004002b,
-       0x00000006,0x00000014,0x3f800000,0x0004002b,0x0000000f,0x00000015,0x00000004,0x00040020,
-       0x00000016,0x00000002,0x00000006,0x0004002b,0x0000000f,0x00000019,0x00000005,0x00040017,
-       0x00000026,0x00000006,0x00000002,0x00040020,0x00000027,0x00000007,0x00000026,0x0004002b,
-       0x0000000f,0x00000029,0x00000001,0x00040020,0x0000002a,0x00000002,0x00000007,0x00040020,
-       0x00000031,0x00000001,0x00000026,0x0004003b,0x00000031,0x00000032,0x00000001,0x00040020,
-       0x0000003c,0x00000007,0x00000006,0x00090019,0x0000003e,0x00000006,0x00000001,0x00000000,
-       0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000003f,0x0000003e,0x00040020,
-       0x00000040,0x00000000,0x0000003f,0x0004003b,0x00000040,0x00000041,0x00000000,0x00040015,
-       0x00000045,0x00000020,0x00000000,0x0004002b,0x00000045,0x00000046,0x00000000,0x00040020,
-       0x00000048,0x00000003,0x00000007,0x0004003b,0x00000048,0x00000049,0x00000003,0x0004002b,
-       0x0000000f,0x0000004a,0x00000000,0x0004002b,0x0000000f,0x0000004f,0x00000002,0x00050036,
-       0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000027,
-       0x00000028,0x00000007,0x0004003b,0x0000003c,0x0000003d,0x00000007,0x00050041,0x0000002a,
-       0x0000002b,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002c,0x0000002b,0x0007004f,
-       0x00000026,0x0000002d,0x0000002c,0x0000002c,0x00000000,0x00000001,0x00050041,0x0000002a,
-       0x0000002e,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002f,0x0000002e,0x0007004f,
-       0x00000026,0x00000030,0x0000002f,0x0000002f,0x00000002,0x00000003,0x0004003d,0x00000026,
-       0x00000033,0x00000032,0x0008000c,0x00000026,0x00000034,0x00000001,0x0000002e,0x0000002d,
-       0x00000030,0x00000033,0x00050041,0x0000002a,0x00000035,0x0000000e,0x00000029,0x0004003d,
-       0x00000007,0x00000036,0x00000035,0x0007004f,0x00000026,0x00000037,0x00000036,0x00000036,
-       0x00000000,0x00000001,0x00050041,0x0000002a,0x00000038,0x0000000e,0x00000029,0x0004003d,
-       0x00000007,0x00000039,0x00000038,0x0007004f,0x00000026,0x0000003a,0x00000039,0x00000039,
-       0x00000002,0x00000003,0x0008000c,0x00000026,0x0000003b,0x00000001,0x0000002b,0x00000034,
-       0x00000037,0x0000003a,0x0003003e,0x00000028,0x0000003b,0x0004003d,0x0000003f,0x00000042,
-       0x00000041,0x0004003d,0x00000026,0x00000043,0x00000028,0x00050057,0x00000007,0x00000044,
-       0x00000042,0x00000043,0x00050051,0x00000006,0x00000047,0x00000044,0x00000000,0x0003003e,
-       0x0000003d,0x00000047,0x00050041,0x0000002a,0x0000004b,0x0000000e,0x0000004a,0x0004003d,
-       0x00000007,0x0000004c,0x0000004b,0x0004003d,0x00000006,0x0000004d,0x0000003d,0x0005008e,
-       0x00000007,0x0000004e,0x0000004c,0x0000004d,0x00050041,0x0000002a,0x00000050,0x0000000e,
-       0x0000004f,0x0004003d,0x00000007,0x00000051,0x00000050,0x00050085,0x00000007,0x00000052,
-       0x0000004e,0x00000051,0x00040039,0x00000007,0x00000053,0x00000009,0x00050085,0x00000007,
-       0x00000054,0x00000052,0x00000053,0x0003003e,0x00000049,0x00000054,0x000100fd,0x00010038,
-       0x00050036,0x00000007,0x00000009,0x00000000,0x00000008,0x000200f8,0x0000000a,0x00050041,
-       0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000b,0x00000013,0x00000012,
-       0x00050041,0x00000016,0x00000017,0x0000000e,0x00000015,0x0004003d,0x00000006,0x00000018,
-       0x00000017,0x00050041,0x00000016,0x0000001a,0x0000000e,0x00000019,0x0004003d,0x00000006,
-       0x0000001b,0x0000001a,0x0008000c,0x00000006,0x0000001c,0x00000001,0x0000002e,0x00000014,
-       0x00000018,0x0000001b,0x0005008e,0x0000000b,0x0000001d,0x00000013,0x0000001c,0x00050041,
-       0x00000016,0x0000001e,0x0000000e,0x00000015,0x0004003d,0x00000006,0x0000001f,0x0000001e,
-       0x00050051,0x00000006,0x00000020,0x0000001d,0x00000000,0x00050051,0x00000006,0x00000021,
-       0x0000001d,0x00000001,0x00050051,0x00000006,0x00000022,0x0000001d,0x00000002,0x00070050,
-       0x00000007,0x00000023,0x00000020,0x00000021,0x00000022,0x0000001f,0x000200fe,0x00000023,
-       0x00010038
+       0x00040020,0x00000007,0x00000007,0x00000006,0x00090019,0x00000009,0x00000006,0x00000001,
+       0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000a,0x00000009,
+       0x00040020,0x0000000b,0x00000000,0x0000000a,0x0004003b,0x0000000b,0x0000000c,0x00000000,
+       0x00040017,0x0000000e,0x00000006,0x00000002,0x00040020,0x0000000f,0x00000001,0x0000000e,
+       0x0004003b,0x0000000f,0x00000010,0x00000001,0x00040017,0x00000012,0x00000006,0x00000004,
+       0x00040015,0x00000014,0x00000020,0x00000000,0x0004002b,0x00000014,0x00000015,0x00000000,
+       0x00040020,0x00000017,0x00000003,0x00000012,0x0004003b,0x00000017,0x00000018,0x00000003,
+       0x00040017,0x00000019,0x00000006,0x00000003,0x0006001e,0x0000001a,0x00000012,0x00000012,
+       0x00000019,0x00000006,0x00040020,0x0000001b,0x00000002,0x0000001a,0x0004003b,0x0000001b,
+       0x0000001c,0x00000002,0x00040015,0x0000001d,0x00000020,0x00000001,0x0004002b,0x0000001d,
+       0x0000001e,0x00000000,0x00040020,0x0000001f,0x00000002,0x00000012,0x0004002b,0x0000001d,
+       0x00000024,0x00000001,0x0004002b,0x0000001d,0x00000028,0x00000002,0x00040020,0x00000029,
+       0x00000002,0x00000019,0x0004002b,0x00000006,0x0000002c,0x3f800000,0x00050036,0x00000002,
+       0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000007,0x00000008,
+       0x00000007,0x0004003d,0x0000000a,0x0000000d,0x0000000c,0x0004003d,0x0000000e,0x00000011,
+       0x00000010,0x00050057,0x00000012,0x00000013,0x0000000d,0x00000011,0x00050051,0x00000006,
+       0x00000016,0x00000013,0x00000000,0x0003003e,0x00000008,0x00000016,0x00050041,0x0000001f,
+       0x00000020,0x0000001c,0x0000001e,0x0004003d,0x00000012,0x00000021,0x00000020,0x0004003d,
+       0x00000006,0x00000022,0x00000008,0x0005008e,0x00000012,0x00000023,0x00000021,0x00000022,
+       0x00050041,0x0000001f,0x00000025,0x0000001c,0x00000024,0x0004003d,0x00000012,0x00000026,
+       0x00000025,0x00050085,0x00000012,0x00000027,0x00000023,0x00000026,0x00050041,0x00000029,
+       0x0000002a,0x0000001c,0x00000028,0x0004003d,0x00000019,0x0000002b,0x0000002a,0x00050051,
+       0x00000006,0x0000002d,0x0000002b,0x00000000,0x00050051,0x00000006,0x0000002e,0x0000002b,
+       0x00000001,0x00050051,0x00000006,0x0000002f,0x0000002b,0x00000002,0x00070050,0x00000012,
+       0x00000030,0x0000002d,0x0000002e,0x0000002f,0x0000002c,0x00050085,0x00000012,0x00000031,
+       0x00000027,0x00000030,0x0003003e,0x00000018,0x00000031,0x000100fd,0x00010038
 };
index 9f63029..70d5947 100644 (file)
@@ -1,93 +1,69 @@
 std::vector<uint32_t> SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_WITH_EMOJI_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000070,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000004f,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000032,0x00000068,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x00000040,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00090006,0x0000000c,0x00000000,0x78655475,
-       0x6c6f4374,0x6e41726f,0x74616d69,0x656c6261,0x00000000,0x00060006,0x0000000c,0x00000001,
-       0x6c744175,0x65527361,0x00007463,0x00050006,0x0000000c,0x00000002,0x6c6f4375,0x0000726f,
-       0x00060006,0x0000000c,0x00000003,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000c,
-       0x00000004,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000005,0x4d657270,0x69746c75,
-       0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,0x00000028,
-       0x43786574,0x64726f6f,0x00000000,0x00050005,0x00000032,0x78655476,0x726f6f43,0x00000064,
-       0x00050005,0x0000003d,0x74786574,0x74786554,0x00657275,0x00050005,0x00000041,0x78655473,
-       0x65727574,0x00000000,0x00050005,0x00000046,0x6b73616d,0x74786554,0x00657275,0x00040005,
-       0x00000047,0x73614d73,0x0000006b,0x00040005,0x0000004e,0x65747376,0x00000070,0x00050005,
-       0x00000068,0x67617266,0x6f6c6f43,0x00000072,0x00050048,0x0000000c,0x00000000,0x00000023,
-       0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,0x00000010,0x00050048,0x0000000c,
-       0x00000002,0x00000023,0x00000020,0x00050048,0x0000000c,0x00000003,0x00000023,0x00000030,
-       0x00050048,0x0000000c,0x00000004,0x00000023,0x0000003c,0x00050048,0x0000000c,0x00000005,
-       0x00000023,0x00000040,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,
-       0x00000000,0x00040047,0x0000000e,0x00000021,0x00000001,0x00040047,0x00000032,0x0000001e,
-       0x00000000,0x00040047,0x00000041,0x00000022,0x00000000,0x00040047,0x00000041,0x00000021,
-       0x00000002,0x00040047,0x00000047,0x00000022,0x00000000,0x00040047,0x00000047,0x00000021,
-       0x00000003,0x00040047,0x00000068,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,
-       0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,
-       0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,
-       0x0008001e,0x0000000c,0x00000007,0x00000007,0x00000007,0x0000000b,0x00000006,0x00000006,
-       0x00040020,0x0000000d,0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,
-       0x00040015,0x0000000f,0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000003,
-       0x00040020,0x00000011,0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,
-       0x0004002b,0x0000000f,0x00000015,0x00000004,0x00040020,0x00000016,0x00000002,0x00000006,
-       0x0004002b,0x0000000f,0x00000019,0x00000005,0x00040017,0x00000026,0x00000006,0x00000002,
-       0x00040020,0x00000027,0x00000007,0x00000026,0x0004002b,0x0000000f,0x00000029,0x00000001,
-       0x00040020,0x0000002a,0x00000002,0x00000007,0x00040020,0x00000031,0x00000001,0x00000026,
-       0x0004003b,0x00000031,0x00000032,0x00000001,0x00040020,0x0000003c,0x00000007,0x00000007,
-       0x00090019,0x0000003e,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,
-       0x00000000,0x0003001b,0x0000003f,0x0000003e,0x00040020,0x00000040,0x00000000,0x0000003f,
-       0x0004003b,0x00000040,0x00000041,0x00000000,0x00040020,0x00000045,0x00000007,0x00000006,
-       0x0004003b,0x00000040,0x00000047,0x00000000,0x00040015,0x0000004b,0x00000020,0x00000000,
-       0x0004002b,0x0000004b,0x0000004c,0x00000000,0x0004002b,0x00000006,0x0000004f,0x38d1b717,
-       0x0004002b,0x0000004b,0x00000050,0x00000003,0x0004002b,0x0000000f,0x00000056,0x00000000,
-       0x00040020,0x00000067,0x00000003,0x00000007,0x0004003b,0x00000067,0x00000068,0x00000003,
-       0x0004002b,0x0000000f,0x0000006a,0x00000002,0x00050036,0x00000002,0x00000004,0x00000000,
-       0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000027,0x00000028,0x00000007,0x0004003b,
-       0x0000003c,0x0000003d,0x00000007,0x0004003b,0x00000045,0x00000046,0x00000007,0x0004003b,
-       0x00000045,0x0000004e,0x00000007,0x00050041,0x0000002a,0x0000002b,0x0000000e,0x00000029,
-       0x0004003d,0x00000007,0x0000002c,0x0000002b,0x0007004f,0x00000026,0x0000002d,0x0000002c,
-       0x0000002c,0x00000000,0x00000001,0x00050041,0x0000002a,0x0000002e,0x0000000e,0x00000029,
-       0x0004003d,0x00000007,0x0000002f,0x0000002e,0x0007004f,0x00000026,0x00000030,0x0000002f,
-       0x0000002f,0x00000002,0x00000003,0x0004003d,0x00000026,0x00000033,0x00000032,0x0008000c,
-       0x00000026,0x00000034,0x00000001,0x0000002e,0x0000002d,0x00000030,0x00000033,0x00050041,
-       0x0000002a,0x00000035,0x0000000e,0x00000029,0x0004003d,0x00000007,0x00000036,0x00000035,
-       0x0007004f,0x00000026,0x00000037,0x00000036,0x00000036,0x00000000,0x00000001,0x00050041,
-       0x0000002a,0x00000038,0x0000000e,0x00000029,0x0004003d,0x00000007,0x00000039,0x00000038,
-       0x0007004f,0x00000026,0x0000003a,0x00000039,0x00000039,0x00000002,0x00000003,0x0008000c,
-       0x00000026,0x0000003b,0x00000001,0x0000002b,0x00000034,0x00000037,0x0000003a,0x0003003e,
-       0x00000028,0x0000003b,0x0004003d,0x0000003f,0x00000042,0x00000041,0x0004003d,0x00000026,
-       0x00000043,0x00000028,0x00050057,0x00000007,0x00000044,0x00000042,0x00000043,0x0003003e,
-       0x0000003d,0x00000044,0x0004003d,0x0000003f,0x00000048,0x00000047,0x0004003d,0x00000026,
-       0x00000049,0x00000028,0x00050057,0x00000007,0x0000004a,0x00000048,0x00000049,0x00050051,
-       0x00000006,0x0000004d,0x0000004a,0x00000000,0x0003003e,0x00000046,0x0000004d,0x00050041,
-       0x00000045,0x00000051,0x0000003d,0x00000050,0x0004003d,0x00000006,0x00000052,0x00000051,
-       0x0007000c,0x00000006,0x00000053,0x00000001,0x00000030,0x0000004f,0x00000052,0x0003003e,
-       0x0000004e,0x00000053,0x0004003d,0x00000007,0x00000054,0x0000003d,0x0008004f,0x0000000b,
-       0x00000055,0x00000054,0x00000054,0x00000000,0x00000001,0x00000002,0x00050041,0x0000002a,
-       0x00000057,0x0000000e,0x00000056,0x0004003d,0x00000007,0x00000058,0x00000057,0x0008004f,
-       0x0000000b,0x00000059,0x00000058,0x00000058,0x00000000,0x00000001,0x00000002,0x0004003d,
-       0x00000006,0x0000005a,0x0000004e,0x0004003d,0x00000006,0x0000005b,0x00000046,0x00050085,
-       0x00000006,0x0000005c,0x0000005a,0x0000005b,0x00060050,0x0000000b,0x0000005d,0x0000005c,
-       0x0000005c,0x0000005c,0x0008000c,0x0000000b,0x0000005e,0x00000001,0x0000002e,0x00000055,
-       0x00000059,0x0000005d,0x00050041,0x00000045,0x0000005f,0x0000003d,0x00000050,0x0004003d,
-       0x00000006,0x00000060,0x0000005f,0x00050041,0x00000016,0x00000061,0x0000000e,0x00000019,
-       0x0004003d,0x00000006,0x00000062,0x00000061,0x0008000c,0x00000006,0x00000063,0x00000001,
-       0x0000002e,0x00000014,0x00000060,0x00000062,0x0005008e,0x0000000b,0x00000064,0x0000005e,
-       0x00000063,0x0004003d,0x00000007,0x00000065,0x0000003d,0x0009004f,0x00000007,0x00000066,
-       0x00000065,0x00000064,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000003d,
-       0x00000066,0x0004003d,0x00000007,0x00000069,0x0000003d,0x00050041,0x0000002a,0x0000006b,
-       0x0000000e,0x0000006a,0x0004003d,0x00000007,0x0000006c,0x0000006b,0x00050085,0x00000007,
-       0x0000006d,0x00000069,0x0000006c,0x00040039,0x00000007,0x0000006e,0x00000009,0x00050085,
-       0x00000007,0x0000006f,0x0000006d,0x0000006e,0x0003003e,0x00000068,0x0000006f,0x000100fd,
-       0x00010038,0x00050036,0x00000007,0x00000009,0x00000000,0x00000008,0x000200f8,0x0000000a,
-       0x00050041,0x00000011,0x00000012,0x0000000e,0x00000010,0x0004003d,0x0000000b,0x00000013,
-       0x00000012,0x00050041,0x00000016,0x00000017,0x0000000e,0x00000015,0x0004003d,0x00000006,
-       0x00000018,0x00000017,0x00050041,0x00000016,0x0000001a,0x0000000e,0x00000019,0x0004003d,
-       0x00000006,0x0000001b,0x0000001a,0x0008000c,0x00000006,0x0000001c,0x00000001,0x0000002e,
-       0x00000014,0x00000018,0x0000001b,0x0005008e,0x0000000b,0x0000001d,0x00000013,0x0000001c,
-       0x00050041,0x00000016,0x0000001e,0x0000000e,0x00000015,0x0004003d,0x00000006,0x0000001f,
-       0x0000001e,0x00050051,0x00000006,0x00000020,0x0000001d,0x00000000,0x00050051,0x00000006,
-       0x00000021,0x0000001d,0x00000001,0x00050051,0x00000006,0x00000022,0x0000001d,0x00000002,
-       0x00070050,0x00000007,0x00000023,0x00000020,0x00000021,0x00000022,0x0000001f,0x000200fe,
-       0x00000023,0x00010038
+       0x00000000,0x00060005,0x00000009,0x54656874,0x54747865,0x75747865,0x00006572,0x00050005,
+       0x0000000d,0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,
+       0x00000064,0x00060005,0x00000015,0x4d656874,0x546b7361,0x75747865,0x00006572,0x00040005,
+       0x00000016,0x73614d73,0x0000006b,0x00040005,0x0000001d,0x65747376,0x00000070,0x00050005,
+       0x00000026,0x67617246,0x61746144,0x00000000,0x00090006,0x00000026,0x00000000,0x78655475,
+       0x6c6f4374,0x6e41726f,0x74616d69,0x656c6261,0x00000000,0x00050006,0x00000026,0x00000001,
+       0x6c6f4375,0x0000726f,0x00060006,0x00000026,0x00000002,0x4378696d,0x726f6c6f,0x00000000,
+       0x00080006,0x00000026,0x00000003,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,
+       0x00030005,0x00000028,0x00000000,0x00050005,0x00000040,0x67617266,0x6f6c6f43,0x00000072,
+       0x00040047,0x0000000d,0x00000022,0x00000000,0x00040047,0x0000000d,0x00000021,0x00000002,
+       0x00040047,0x00000011,0x0000001e,0x00000000,0x00040047,0x00000016,0x00000022,0x00000000,
+       0x00040047,0x00000016,0x00000021,0x00000003,0x00050048,0x00000026,0x00000000,0x00000023,
+       0x00000000,0x00050048,0x00000026,0x00000001,0x00000023,0x00000010,0x00050048,0x00000026,
+       0x00000002,0x00000023,0x00000020,0x00050048,0x00000026,0x00000003,0x00000023,0x0000002c,
+       0x00030047,0x00000026,0x00000002,0x00040047,0x00000028,0x00000022,0x00000000,0x00040047,
+       0x00000028,0x00000021,0x00000001,0x00040047,0x00000040,0x0000001e,0x00000000,0x00020013,
+       0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,
+       0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000007,0x00000007,0x00090019,
+       0x0000000a,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,
+       0x0003001b,0x0000000b,0x0000000a,0x00040020,0x0000000c,0x00000000,0x0000000b,0x0004003b,
+       0x0000000c,0x0000000d,0x00000000,0x00040017,0x0000000f,0x00000006,0x00000002,0x00040020,
+       0x00000010,0x00000001,0x0000000f,0x0004003b,0x00000010,0x00000011,0x00000001,0x00040020,
+       0x00000014,0x00000007,0x00000006,0x0004003b,0x0000000c,0x00000016,0x00000000,0x00040015,
+       0x0000001a,0x00000020,0x00000000,0x0004002b,0x0000001a,0x0000001b,0x00000000,0x0004002b,
+       0x00000006,0x0000001e,0x38d1b717,0x0004002b,0x0000001a,0x0000001f,0x00000003,0x00040017,
+       0x00000023,0x00000006,0x00000003,0x0006001e,0x00000026,0x00000007,0x00000007,0x00000023,
+       0x00000006,0x00040020,0x00000027,0x00000002,0x00000026,0x0004003b,0x00000027,0x00000028,
+       0x00000002,0x00040015,0x00000029,0x00000020,0x00000001,0x0004002b,0x00000029,0x0000002a,
+       0x00000000,0x00040020,0x0000002b,0x00000002,0x00000007,0x0004002b,0x00000006,0x00000034,
+       0x3f800000,0x0004002b,0x00000029,0x00000037,0x00000003,0x00040020,0x00000038,0x00000002,
+       0x00000006,0x00040020,0x0000003f,0x00000003,0x00000007,0x0004003b,0x0000003f,0x00000040,
+       0x00000003,0x0004002b,0x00000029,0x00000042,0x00000001,0x0004002b,0x00000029,0x00000046,
+       0x00000002,0x00040020,0x00000047,0x00000002,0x00000023,0x00050036,0x00000002,0x00000004,
+       0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,
+       0x0004003b,0x00000014,0x00000015,0x00000007,0x0004003b,0x00000014,0x0000001d,0x00000007,
+       0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d,0x0000000f,0x00000012,0x00000011,
+       0x00050057,0x00000007,0x00000013,0x0000000e,0x00000012,0x0003003e,0x00000009,0x00000013,
+       0x0004003d,0x0000000b,0x00000017,0x00000016,0x0004003d,0x0000000f,0x00000018,0x00000011,
+       0x00050057,0x00000007,0x00000019,0x00000017,0x00000018,0x00050051,0x00000006,0x0000001c,
+       0x00000019,0x00000000,0x0003003e,0x00000015,0x0000001c,0x00050041,0x00000014,0x00000020,
+       0x00000009,0x0000001f,0x0004003d,0x00000006,0x00000021,0x00000020,0x0007000c,0x00000006,
+       0x00000022,0x00000001,0x00000030,0x0000001e,0x00000021,0x0003003e,0x0000001d,0x00000022,
+       0x0004003d,0x00000007,0x00000024,0x00000009,0x0008004f,0x00000023,0x00000025,0x00000024,
+       0x00000024,0x00000000,0x00000001,0x00000002,0x00050041,0x0000002b,0x0000002c,0x00000028,
+       0x0000002a,0x0004003d,0x00000007,0x0000002d,0x0000002c,0x0008004f,0x00000023,0x0000002e,
+       0x0000002d,0x0000002d,0x00000000,0x00000001,0x00000002,0x0004003d,0x00000006,0x0000002f,
+       0x0000001d,0x0004003d,0x00000006,0x00000030,0x00000015,0x00050085,0x00000006,0x00000031,
+       0x0000002f,0x00000030,0x00060050,0x00000023,0x00000032,0x00000031,0x00000031,0x00000031,
+       0x0008000c,0x00000023,0x00000033,0x00000001,0x0000002e,0x00000025,0x0000002e,0x00000032,
+       0x00050041,0x00000014,0x00000035,0x00000009,0x0000001f,0x0004003d,0x00000006,0x00000036,
+       0x00000035,0x00050041,0x00000038,0x00000039,0x00000028,0x00000037,0x0004003d,0x00000006,
+       0x0000003a,0x00000039,0x0008000c,0x00000006,0x0000003b,0x00000001,0x0000002e,0x00000034,
+       0x00000036,0x0000003a,0x0005008e,0x00000023,0x0000003c,0x00000033,0x0000003b,0x0004003d,
+       0x00000007,0x0000003d,0x00000009,0x0009004f,0x00000007,0x0000003e,0x0000003d,0x0000003c,
+       0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x00000009,0x0000003e,0x0004003d,
+       0x00000007,0x00000041,0x00000009,0x00050041,0x0000002b,0x00000043,0x00000028,0x00000042,
+       0x0004003d,0x00000007,0x00000044,0x00000043,0x00050085,0x00000007,0x00000045,0x00000041,
+       0x00000044,0x00050041,0x00000047,0x00000048,0x00000028,0x00000046,0x0004003d,0x00000023,
+       0x00000049,0x00000048,0x00050051,0x00000006,0x0000004a,0x00000049,0x00000000,0x00050051,
+       0x00000006,0x0000004b,0x00000049,0x00000001,0x00050051,0x00000006,0x0000004c,0x00000049,
+       0x00000002,0x00070050,0x00000007,0x0000004d,0x0000004a,0x0000004b,0x0000004c,0x00000034,
+       0x00050085,0x00000007,0x0000004e,0x00000045,0x0000004d,0x0003003e,0x00000040,0x0000004e,
+       0x000100fd,0x00010038
 };
index 5c165eb..93c6cb7 100644 (file)
 std::vector<uint32_t> SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_WITH_STYLE_AND_EMOJI_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000080,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000005f,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000032,0x00000072,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000011,0x0000004a,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00090006,0x0000000c,0x00000000,0x73614875,
-       0x746c754d,0x656c7069,0x74786554,0x6f6c6f43,0x00007372,0x00090006,0x0000000c,0x00000001,
-       0x78655475,0x6c6f4374,0x6e41726f,0x74616d69,0x656c6261,0x00000000,0x00060006,0x0000000c,
-       0x00000002,0x6c744175,0x65527361,0x00007463,0x00050006,0x0000000c,0x00000003,0x6c6f4375,
-       0x0000726f,0x00060006,0x0000000c,0x00000004,0x4378696d,0x726f6c6f,0x00000000,0x00050006,
-       0x0000000c,0x00000005,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000006,0x4d657270,
-       0x69746c75,0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,
-       0x00000028,0x43786574,0x64726f6f,0x00000000,0x00050005,0x00000032,0x78655476,0x726f6f43,
-       0x00000064,0x00050005,0x0000003d,0x74786574,0x74786554,0x00657275,0x00050005,0x00000041,
-       0x78655473,0x65727574,0x00000000,0x00060005,0x00000045,0x6c797473,0x78655465,0x65727574,
-       0x00000000,0x00040005,0x00000046,0x79745373,0x0000656c,0x00050005,0x0000004b,0x6b73616d,
-       0x74786554,0x00657275,0x00040005,0x0000004c,0x73614d73,0x0000006b,0x00040005,0x00000053,
-       0x65747376,0x00000070,0x00050005,0x00000072,0x67617266,0x6f6c6f43,0x00000072,0x00050048,
-       0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,0x00000001,0x00000023,
-       0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,0x00000020,0x00050048,0x0000000c,
-       0x00000003,0x00000023,0x00000030,0x00050048,0x0000000c,0x00000004,0x00000023,0x00000040,
-       0x00050048,0x0000000c,0x00000005,0x00000023,0x0000004c,0x00050048,0x0000000c,0x00000006,
-       0x00000023,0x00000050,0x00030047,0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,
-       0x00000001,0x00040047,0x0000000e,0x00000021,0x00000000,0x00040047,0x00000032,0x0000001e,
-       0x00000000,0x00040047,0x00000041,0x00000022,0x00000001,0x00040047,0x00000041,0x00000021,
-       0x00000001,0x00040047,0x00000046,0x00000022,0x00000001,0x00040047,0x00000046,0x00000021,
-       0x00000002,0x00040047,0x0000004c,0x00000022,0x00000001,0x00040047,0x0000004c,0x00000021,
-       0x00000003,0x00040047,0x00000072,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,
+       0x00000000,0x00050005,0x00000009,0x74786574,0x74786554,0x00657275,0x00050005,0x0000000d,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000011,0x78655476,0x726f6f43,0x00000064,
+       0x00060005,0x00000014,0x6c797473,0x78655465,0x65727574,0x00000000,0x00040005,0x00000015,
+       0x79745373,0x0000656c,0x00050005,0x0000001a,0x6b73616d,0x74786554,0x00657275,0x00040005,
+       0x0000001b,0x73614d73,0x0000006b,0x00040005,0x00000022,0x65747376,0x00000070,0x00050005,
+       0x0000002b,0x67617246,0x61746144,0x00000000,0x00090006,0x0000002b,0x00000000,0x73614875,
+       0x746c754d,0x656c7069,0x74786554,0x6f6c6f43,0x00007372,0x00090006,0x0000002b,0x00000001,
+       0x78655475,0x6c6f4374,0x6e41726f,0x74616d69,0x656c6261,0x00000000,0x00050006,0x0000002b,
+       0x00000002,0x6c6f4375,0x0000726f,0x00060006,0x0000002b,0x00000003,0x4378696d,0x726f6c6f,
+       0x00000000,0x00080006,0x0000002b,0x00000004,0x4d657270,0x69746c75,0x65696c70,0x706c4164,
+       0x00006168,0x00030005,0x0000002d,0x00000000,0x00050005,0x0000004a,0x67617266,0x6f6c6f43,
+       0x00000072,0x00040047,0x0000000d,0x00000022,0x00000001,0x00040047,0x0000000d,0x00000021,
+       0x00000001,0x00040047,0x00000011,0x0000001e,0x00000000,0x00040047,0x00000015,0x00000022,
+       0x00000001,0x00040047,0x00000015,0x00000021,0x00000002,0x00040047,0x0000001b,0x00000022,
+       0x00000001,0x00040047,0x0000001b,0x00000021,0x00000003,0x00050048,0x0000002b,0x00000000,
+       0x00000023,0x00000000,0x00050048,0x0000002b,0x00000001,0x00000023,0x00000010,0x00050048,
+       0x0000002b,0x00000002,0x00000023,0x00000020,0x00050048,0x0000002b,0x00000003,0x00000023,
+       0x00000030,0x00050048,0x0000002b,0x00000004,0x00000023,0x0000003c,0x00030047,0x0000002b,
+       0x00000002,0x00040047,0x0000002d,0x00000022,0x00000001,0x00040047,0x0000002d,0x00000021,
+       0x00000000,0x00040047,0x0000004a,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,
        0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,
-       0x00000004,0x00030021,0x00000008,0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,
-       0x0009001e,0x0000000c,0x00000006,0x00000007,0x00000007,0x00000007,0x0000000b,0x00000006,
-       0x00000006,0x00040020,0x0000000d,0x00000002,0x0000000c,0x0004003b,0x0000000d,0x0000000e,
-       0x00000002,0x00040015,0x0000000f,0x00000020,0x00000001,0x0004002b,0x0000000f,0x00000010,
-       0x00000004,0x00040020,0x00000011,0x00000002,0x0000000b,0x0004002b,0x00000006,0x00000014,
-       0x3f800000,0x0004002b,0x0000000f,0x00000015,0x00000005,0x00040020,0x00000016,0x00000002,
-       0x00000006,0x0004002b,0x0000000f,0x00000019,0x00000006,0x00040017,0x00000026,0x00000006,
-       0x00000002,0x00040020,0x00000027,0x00000007,0x00000026,0x0004002b,0x0000000f,0x00000029,
-       0x00000002,0x00040020,0x0000002a,0x00000002,0x00000007,0x00040020,0x00000031,0x00000001,
-       0x00000026,0x0004003b,0x00000031,0x00000032,0x00000001,0x00040020,0x0000003c,0x00000007,
-       0x00000007,0x00090019,0x0000003e,0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,
-       0x00000001,0x00000000,0x0003001b,0x0000003f,0x0000003e,0x00040020,0x00000040,0x00000000,
-       0x0000003f,0x0004003b,0x00000040,0x00000041,0x00000000,0x0004003b,0x00000040,0x00000046,
-       0x00000000,0x00040020,0x0000004a,0x00000007,0x00000006,0x0004003b,0x00000040,0x0000004c,
-       0x00000000,0x00040015,0x00000050,0x00000020,0x00000000,0x0004002b,0x00000050,0x00000051,
-       0x00000000,0x0004002b,0x00000006,0x00000054,0x38d1b717,0x0004002b,0x00000050,0x00000055,
-       0x00000003,0x0004002b,0x0000000f,0x0000005b,0x00000001,0x0004002b,0x0000000f,0x00000062,
-       0x00000000,0x00040020,0x00000071,0x00000003,0x00000007,0x0004003b,0x00000071,0x00000072,
-       0x00000003,0x0004002b,0x0000000f,0x0000007a,0x00000003,0x00050036,0x00000002,0x00000004,
-       0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000027,0x00000028,0x00000007,
-       0x0004003b,0x0000003c,0x0000003d,0x00000007,0x0004003b,0x0000003c,0x00000045,0x00000007,
-       0x0004003b,0x0000004a,0x0000004b,0x00000007,0x0004003b,0x0000004a,0x00000053,0x00000007,
-       0x00050041,0x0000002a,0x0000002b,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002c,
-       0x0000002b,0x0007004f,0x00000026,0x0000002d,0x0000002c,0x0000002c,0x00000000,0x00000001,
-       0x00050041,0x0000002a,0x0000002e,0x0000000e,0x00000029,0x0004003d,0x00000007,0x0000002f,
-       0x0000002e,0x0007004f,0x00000026,0x00000030,0x0000002f,0x0000002f,0x00000002,0x00000003,
-       0x0004003d,0x00000026,0x00000033,0x00000032,0x0008000c,0x00000026,0x00000034,0x00000001,
-       0x0000002e,0x0000002d,0x00000030,0x00000033,0x00050041,0x0000002a,0x00000035,0x0000000e,
-       0x00000029,0x0004003d,0x00000007,0x00000036,0x00000035,0x0007004f,0x00000026,0x00000037,
-       0x00000036,0x00000036,0x00000000,0x00000001,0x00050041,0x0000002a,0x00000038,0x0000000e,
-       0x00000029,0x0004003d,0x00000007,0x00000039,0x00000038,0x0007004f,0x00000026,0x0000003a,
-       0x00000039,0x00000039,0x00000002,0x00000003,0x0008000c,0x00000026,0x0000003b,0x00000001,
-       0x0000002b,0x00000034,0x00000037,0x0000003a,0x0003003e,0x00000028,0x0000003b,0x0004003d,
-       0x0000003f,0x00000042,0x00000041,0x0004003d,0x00000026,0x00000043,0x00000028,0x00050057,
-       0x00000007,0x00000044,0x00000042,0x00000043,0x0003003e,0x0000003d,0x00000044,0x0004003d,
-       0x0000003f,0x00000047,0x00000046,0x0004003d,0x00000026,0x00000048,0x00000028,0x00050057,
-       0x00000007,0x00000049,0x00000047,0x00000048,0x0003003e,0x00000045,0x00000049,0x0004003d,
-       0x0000003f,0x0000004d,0x0000004c,0x0004003d,0x00000026,0x0000004e,0x00000028,0x00050057,
-       0x00000007,0x0000004f,0x0000004d,0x0000004e,0x00050051,0x00000006,0x00000052,0x0000004f,
-       0x00000000,0x0003003e,0x0000004b,0x00000052,0x00050041,0x0000004a,0x00000056,0x0000003d,
-       0x00000055,0x0004003d,0x00000006,0x00000057,0x00000056,0x0007000c,0x00000006,0x00000058,
-       0x00000001,0x00000030,0x00000054,0x00000057,0x0003003e,0x00000053,0x00000058,0x0004003d,
-       0x00000007,0x00000059,0x0000003d,0x0008004f,0x0000000b,0x0000005a,0x00000059,0x00000059,
-       0x00000000,0x00000001,0x00000002,0x00050041,0x0000002a,0x0000005c,0x0000000e,0x0000005b,
-       0x0004003d,0x00000007,0x0000005d,0x0000005c,0x0008004f,0x0000000b,0x0000005e,0x0000005d,
-       0x0000005d,0x00000000,0x00000001,0x00000002,0x0004003d,0x00000006,0x0000005f,0x00000053,
-       0x0004003d,0x00000006,0x00000060,0x0000004b,0x00050085,0x00000006,0x00000061,0x0000005f,
-       0x00000060,0x00050041,0x00000016,0x00000063,0x0000000e,0x00000062,0x0004003d,0x00000006,
-       0x00000064,0x00000063,0x00050083,0x00000006,0x00000065,0x00000014,0x00000064,0x00050085,
-       0x00000006,0x00000066,0x00000061,0x00000065,0x00060050,0x0000000b,0x00000067,0x00000066,
-       0x00000066,0x00000066,0x0008000c,0x0000000b,0x00000068,0x00000001,0x0000002e,0x0000005a,
-       0x0000005e,0x00000067,0x00050041,0x0000004a,0x00000069,0x0000003d,0x00000055,0x0004003d,
-       0x00000006,0x0000006a,0x00000069,0x00050041,0x00000016,0x0000006b,0x0000000e,0x00000019,
-       0x0004003d,0x00000006,0x0000006c,0x0000006b,0x0008000c,0x00000006,0x0000006d,0x00000001,
-       0x0000002e,0x00000014,0x0000006a,0x0000006c,0x0005008e,0x0000000b,0x0000006e,0x00000068,
-       0x0000006d,0x0004003d,0x00000007,0x0000006f,0x0000003d,0x0009004f,0x00000007,0x00000070,
-       0x0000006f,0x0000006e,0x00000004,0x00000005,0x00000006,0x00000003,0x0003003e,0x0000003d,
-       0x00000070,0x0004003d,0x00000007,0x00000073,0x0000003d,0x0004003d,0x00000007,0x00000074,
-       0x00000045,0x00050041,0x0000004a,0x00000075,0x0000003d,0x00000055,0x0004003d,0x00000006,
-       0x00000076,0x00000075,0x00050083,0x00000006,0x00000077,0x00000014,0x00000076,0x0005008e,
-       0x00000007,0x00000078,0x00000074,0x00000077,0x00050081,0x00000007,0x00000079,0x00000073,
-       0x00000078,0x00050041,0x0000002a,0x0000007b,0x0000000e,0x0000007a,0x0004003d,0x00000007,
-       0x0000007c,0x0000007b,0x00050085,0x00000007,0x0000007d,0x00000079,0x0000007c,0x00040039,
-       0x00000007,0x0000007e,0x00000009,0x00050085,0x00000007,0x0000007f,0x0000007d,0x0000007e,
-       0x0003003e,0x00000072,0x0000007f,0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,
-       0x00000000,0x00000008,0x000200f8,0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,
-       0x00000010,0x0004003d,0x0000000b,0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,
-       0x0000000e,0x00000015,0x0004003d,0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,
-       0x0000001a,0x0000000e,0x00000019,0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,
-       0x00000006,0x0000001c,0x00000001,0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,
-       0x0000000b,0x0000001d,0x00000013,0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,
-       0x00000015,0x0004003d,0x00000006,0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,
-       0x0000001d,0x00000000,0x00050051,0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,
-       0x00000006,0x00000022,0x0000001d,0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,
-       0x00000021,0x00000022,0x0000001f,0x000200fe,0x00000023,0x00010038
+       0x00000004,0x00040020,0x00000008,0x00000007,0x00000007,0x00090019,0x0000000a,0x00000006,
+       0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000b,
+       0x0000000a,0x00040020,0x0000000c,0x00000000,0x0000000b,0x0004003b,0x0000000c,0x0000000d,
+       0x00000000,0x00040017,0x0000000f,0x00000006,0x00000002,0x00040020,0x00000010,0x00000001,
+       0x0000000f,0x0004003b,0x00000010,0x00000011,0x00000001,0x0004003b,0x0000000c,0x00000015,
+       0x00000000,0x00040020,0x00000019,0x00000007,0x00000006,0x0004003b,0x0000000c,0x0000001b,
+       0x00000000,0x00040015,0x0000001f,0x00000020,0x00000000,0x0004002b,0x0000001f,0x00000020,
+       0x00000000,0x0004002b,0x00000006,0x00000023,0x38d1b717,0x0004002b,0x0000001f,0x00000024,
+       0x00000003,0x00040017,0x00000028,0x00000006,0x00000003,0x0007001e,0x0000002b,0x00000006,
+       0x00000007,0x00000007,0x00000028,0x00000006,0x00040020,0x0000002c,0x00000002,0x0000002b,
+       0x0004003b,0x0000002c,0x0000002d,0x00000002,0x00040015,0x0000002e,0x00000020,0x00000001,
+       0x0004002b,0x0000002e,0x0000002f,0x00000001,0x00040020,0x00000030,0x00000002,0x00000007,
+       0x0004002b,0x00000006,0x00000037,0x3f800000,0x0004002b,0x0000002e,0x00000038,0x00000000,
+       0x00040020,0x00000039,0x00000002,0x00000006,0x0004002b,0x0000002e,0x00000042,0x00000004,
+       0x00040020,0x00000049,0x00000003,0x00000007,0x0004003b,0x00000049,0x0000004a,0x00000003,
+       0x0004002b,0x0000002e,0x00000052,0x00000002,0x0004002b,0x0000002e,0x00000056,0x00000003,
+       0x00040020,0x00000057,0x00000002,0x00000028,0x00050036,0x00000002,0x00000004,0x00000000,
+       0x00000003,0x000200f8,0x00000005,0x0004003b,0x00000008,0x00000009,0x00000007,0x0004003b,
+       0x00000008,0x00000014,0x00000007,0x0004003b,0x00000019,0x0000001a,0x00000007,0x0004003b,
+       0x00000019,0x00000022,0x00000007,0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d,
+       0x0000000f,0x00000012,0x00000011,0x00050057,0x00000007,0x00000013,0x0000000e,0x00000012,
+       0x0003003e,0x00000009,0x00000013,0x0004003d,0x0000000b,0x00000016,0x00000015,0x0004003d,
+       0x0000000f,0x00000017,0x00000011,0x00050057,0x00000007,0x00000018,0x00000016,0x00000017,
+       0x0003003e,0x00000014,0x00000018,0x0004003d,0x0000000b,0x0000001c,0x0000001b,0x0004003d,
+       0x0000000f,0x0000001d,0x00000011,0x00050057,0x00000007,0x0000001e,0x0000001c,0x0000001d,
+       0x00050051,0x00000006,0x00000021,0x0000001e,0x00000000,0x0003003e,0x0000001a,0x00000021,
+       0x00050041,0x00000019,0x00000025,0x00000009,0x00000024,0x0004003d,0x00000006,0x00000026,
+       0x00000025,0x0007000c,0x00000006,0x00000027,0x00000001,0x00000030,0x00000023,0x00000026,
+       0x0003003e,0x00000022,0x00000027,0x0004003d,0x00000007,0x00000029,0x00000009,0x0008004f,
+       0x00000028,0x0000002a,0x00000029,0x00000029,0x00000000,0x00000001,0x00000002,0x00050041,
+       0x00000030,0x00000031,0x0000002d,0x0000002f,0x0004003d,0x00000007,0x00000032,0x00000031,
+       0x0008004f,0x00000028,0x00000033,0x00000032,0x00000032,0x00000000,0x00000001,0x00000002,
+       0x0004003d,0x00000006,0x00000034,0x00000022,0x0004003d,0x00000006,0x00000035,0x0000001a,
+       0x00050085,0x00000006,0x00000036,0x00000034,0x00000035,0x00050041,0x00000039,0x0000003a,
+       0x0000002d,0x00000038,0x0004003d,0x00000006,0x0000003b,0x0000003a,0x00050083,0x00000006,
+       0x0000003c,0x00000037,0x0000003b,0x00050085,0x00000006,0x0000003d,0x00000036,0x0000003c,
+       0x00060050,0x00000028,0x0000003e,0x0000003d,0x0000003d,0x0000003d,0x0008000c,0x00000028,
+       0x0000003f,0x00000001,0x0000002e,0x0000002a,0x00000033,0x0000003e,0x00050041,0x00000019,
+       0x00000040,0x00000009,0x00000024,0x0004003d,0x00000006,0x00000041,0x00000040,0x00050041,
+       0x00000039,0x00000043,0x0000002d,0x00000042,0x0004003d,0x00000006,0x00000044,0x00000043,
+       0x0008000c,0x00000006,0x00000045,0x00000001,0x0000002e,0x00000037,0x00000041,0x00000044,
+       0x0005008e,0x00000028,0x00000046,0x0000003f,0x00000045,0x0004003d,0x00000007,0x00000047,
+       0x00000009,0x0009004f,0x00000007,0x00000048,0x00000047,0x00000046,0x00000004,0x00000005,
+       0x00000006,0x00000003,0x0003003e,0x00000009,0x00000048,0x0004003d,0x00000007,0x0000004b,
+       0x00000009,0x0004003d,0x00000007,0x0000004c,0x00000014,0x00050041,0x00000019,0x0000004d,
+       0x00000009,0x00000024,0x0004003d,0x00000006,0x0000004e,0x0000004d,0x00050083,0x00000006,
+       0x0000004f,0x00000037,0x0000004e,0x0005008e,0x00000007,0x00000050,0x0000004c,0x0000004f,
+       0x00050081,0x00000007,0x00000051,0x0000004b,0x00000050,0x00050041,0x00000030,0x00000053,
+       0x0000002d,0x00000052,0x0004003d,0x00000007,0x00000054,0x00000053,0x00050085,0x00000007,
+       0x00000055,0x00000051,0x00000054,0x00050041,0x00000057,0x00000058,0x0000002d,0x00000056,
+       0x0004003d,0x00000028,0x00000059,0x00000058,0x00050051,0x00000006,0x0000005a,0x00000059,
+       0x00000000,0x00050051,0x00000006,0x0000005b,0x00000059,0x00000001,0x00050051,0x00000006,
+       0x0000005c,0x00000059,0x00000002,0x00070050,0x00000007,0x0000005d,0x0000005a,0x0000005b,
+       0x0000005c,0x00000037,0x00050085,0x00000007,0x0000005e,0x00000055,0x0000005d,0x0003003e,
+       0x0000004a,0x0000005e,0x000100fd,0x00010038
 };
index 461b479..e532e4c 100644 (file)
@@ -1,80 +1,58 @@
 std::vector<uint32_t> SHADER_TEXT_VISUAL_SINGLE_COLOR_TEXT_WITH_STYLE_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000060,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x00000042,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
-       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000032,0x0000004f,0x00030010,
+       0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000010,0x0000001e,0x00030010,
        0x00000004,0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,
-       0x00000000,0x00060005,0x00000009,0x75736976,0x694d6c61,0x6c6f4378,0x0028726f,0x00050005,
-       0x0000000c,0x67617246,0x61746144,0x00000000,0x00090006,0x0000000c,0x00000000,0x78655475,
-       0x6c6f4374,0x6e41726f,0x74616d69,0x656c6261,0x00000000,0x00060006,0x0000000c,0x00000001,
-       0x6c744175,0x65527361,0x00007463,0x00050006,0x0000000c,0x00000002,0x6c6f4375,0x0000726f,
-       0x00060006,0x0000000c,0x00000003,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000c,
-       0x00000004,0x6361706f,0x00797469,0x00080006,0x0000000c,0x00000005,0x4d657270,0x69746c75,
-       0x65696c70,0x706c4164,0x00006168,0x00030005,0x0000000e,0x00000000,0x00050005,0x00000028,
-       0x43786574,0x64726f6f,0x00000000,0x00050005,0x00000032,0x78655476,0x726f6f43,0x00000064,
-       0x00050005,0x0000003d,0x74786574,0x74786554,0x00657275,0x00050005,0x00000041,0x78655473,
-       0x65727574,0x00000000,0x00060005,0x00000049,0x6c797473,0x78655465,0x65727574,0x00000000,
-       0x00040005,0x0000004a,0x79745373,0x0000656c,0x00050005,0x0000004f,0x67617266,0x6f6c6f43,
-       0x00000072,0x00050048,0x0000000c,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000c,
-       0x00000001,0x00000023,0x00000010,0x00050048,0x0000000c,0x00000002,0x00000023,0x00000020,
-       0x00050048,0x0000000c,0x00000003,0x00000023,0x00000030,0x00050048,0x0000000c,0x00000004,
-       0x00000023,0x0000003c,0x00050048,0x0000000c,0x00000005,0x00000023,0x00000040,0x00030047,
-       0x0000000c,0x00000002,0x00040047,0x0000000e,0x00000022,0x00000000,0x00040047,0x0000000e,
-       0x00000021,0x00000001,0x00040047,0x00000032,0x0000001e,0x00000000,0x00040047,0x00000041,
-       0x00000022,0x00000000,0x00040047,0x00000041,0x00000021,0x00000002,0x00040047,0x0000004a,
-       0x00000022,0x00000000,0x00040047,0x0000004a,0x00000021,0x00000003,0x00040047,0x0000004f,
-       0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,
-       0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00030021,0x00000008,
-       0x00000007,0x00040017,0x0000000b,0x00000006,0x00000003,0x0008001e,0x0000000c,0x00000007,
-       0x00000007,0x00000007,0x0000000b,0x00000006,0x00000006,0x00040020,0x0000000d,0x00000002,
-       0x0000000c,0x0004003b,0x0000000d,0x0000000e,0x00000002,0x00040015,0x0000000f,0x00000020,
-       0x00000001,0x0004002b,0x0000000f,0x00000010,0x00000003,0x00040020,0x00000011,0x00000002,
-       0x0000000b,0x0004002b,0x00000006,0x00000014,0x3f800000,0x0004002b,0x0000000f,0x00000015,
-       0x00000004,0x00040020,0x00000016,0x00000002,0x00000006,0x0004002b,0x0000000f,0x00000019,
-       0x00000005,0x00040017,0x00000026,0x00000006,0x00000002,0x00040020,0x00000027,0x00000007,
-       0x00000026,0x0004002b,0x0000000f,0x00000029,0x00000001,0x00040020,0x0000002a,0x00000002,
-       0x00000007,0x00040020,0x00000031,0x00000001,0x00000026,0x0004003b,0x00000031,0x00000032,
-       0x00000001,0x00040020,0x0000003c,0x00000007,0x00000006,0x00090019,0x0000003e,0x00000006,
-       0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000003f,
-       0x0000003e,0x00040020,0x00000040,0x00000000,0x0000003f,0x0004003b,0x00000040,0x00000041,
-       0x00000000,0x00040015,0x00000045,0x00000020,0x00000000,0x0004002b,0x00000045,0x00000046,
-       0x00000000,0x00040020,0x00000048,0x00000007,0x00000007,0x0004003b,0x00000040,0x0000004a,
-       0x00000000,0x00040020,0x0000004e,0x00000003,0x00000007,0x0004003b,0x0000004e,0x0000004f,
-       0x00000003,0x0004002b,0x0000000f,0x00000050,0x00000000,0x0004002b,0x0000000f,0x0000005a,
-       0x00000002,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
-       0x0004003b,0x00000027,0x00000028,0x00000007,0x0004003b,0x0000003c,0x0000003d,0x00000007,
-       0x0004003b,0x00000048,0x00000049,0x00000007,0x00050041,0x0000002a,0x0000002b,0x0000000e,
-       0x00000029,0x0004003d,0x00000007,0x0000002c,0x0000002b,0x0007004f,0x00000026,0x0000002d,
-       0x0000002c,0x0000002c,0x00000000,0x00000001,0x00050041,0x0000002a,0x0000002e,0x0000000e,
-       0x00000029,0x0004003d,0x00000007,0x0000002f,0x0000002e,0x0007004f,0x00000026,0x00000030,
-       0x0000002f,0x0000002f,0x00000002,0x00000003,0x0004003d,0x00000026,0x00000033,0x00000032,
-       0x0008000c,0x00000026,0x00000034,0x00000001,0x0000002e,0x0000002d,0x00000030,0x00000033,
-       0x00050041,0x0000002a,0x00000035,0x0000000e,0x00000029,0x0004003d,0x00000007,0x00000036,
-       0x00000035,0x0007004f,0x00000026,0x00000037,0x00000036,0x00000036,0x00000000,0x00000001,
-       0x00050041,0x0000002a,0x00000038,0x0000000e,0x00000029,0x0004003d,0x00000007,0x00000039,
-       0x00000038,0x0007004f,0x00000026,0x0000003a,0x00000039,0x00000039,0x00000002,0x00000003,
-       0x0008000c,0x00000026,0x0000003b,0x00000001,0x0000002b,0x00000034,0x00000037,0x0000003a,
-       0x0003003e,0x00000028,0x0000003b,0x0004003d,0x0000003f,0x00000042,0x00000041,0x0004003d,
-       0x00000026,0x00000043,0x00000028,0x00050057,0x00000007,0x00000044,0x00000042,0x00000043,
-       0x00050051,0x00000006,0x00000047,0x00000044,0x00000000,0x0003003e,0x0000003d,0x00000047,
-       0x0004003d,0x0000003f,0x0000004b,0x0000004a,0x0004003d,0x00000026,0x0000004c,0x00000028,
-       0x00050057,0x00000007,0x0000004d,0x0000004b,0x0000004c,0x0003003e,0x00000049,0x0000004d,
-       0x00050041,0x0000002a,0x00000051,0x0000000e,0x00000050,0x0004003d,0x00000007,0x00000052,
-       0x00000051,0x0004003d,0x00000006,0x00000053,0x0000003d,0x0005008e,0x00000007,0x00000054,
-       0x00000052,0x00000053,0x0004003d,0x00000007,0x00000055,0x00000049,0x0004003d,0x00000006,
-       0x00000056,0x0000003d,0x00050083,0x00000006,0x00000057,0x00000014,0x00000056,0x0005008e,
-       0x00000007,0x00000058,0x00000055,0x00000057,0x00050081,0x00000007,0x00000059,0x00000054,
-       0x00000058,0x00050041,0x0000002a,0x0000005b,0x0000000e,0x0000005a,0x0004003d,0x00000007,
-       0x0000005c,0x0000005b,0x00050085,0x00000007,0x0000005d,0x00000059,0x0000005c,0x00040039,
-       0x00000007,0x0000005e,0x00000009,0x00050085,0x00000007,0x0000005f,0x0000005d,0x0000005e,
-       0x0003003e,0x0000004f,0x0000005f,0x000100fd,0x00010038,0x00050036,0x00000007,0x00000009,
-       0x00000000,0x00000008,0x000200f8,0x0000000a,0x00050041,0x00000011,0x00000012,0x0000000e,
-       0x00000010,0x0004003d,0x0000000b,0x00000013,0x00000012,0x00050041,0x00000016,0x00000017,
-       0x0000000e,0x00000015,0x0004003d,0x00000006,0x00000018,0x00000017,0x00050041,0x00000016,
-       0x0000001a,0x0000000e,0x00000019,0x0004003d,0x00000006,0x0000001b,0x0000001a,0x0008000c,
-       0x00000006,0x0000001c,0x00000001,0x0000002e,0x00000014,0x00000018,0x0000001b,0x0005008e,
-       0x0000000b,0x0000001d,0x00000013,0x0000001c,0x00050041,0x00000016,0x0000001e,0x0000000e,
-       0x00000015,0x0004003d,0x00000006,0x0000001f,0x0000001e,0x00050051,0x00000006,0x00000020,
-       0x0000001d,0x00000000,0x00050051,0x00000006,0x00000021,0x0000001d,0x00000001,0x00050051,
-       0x00000006,0x00000022,0x0000001d,0x00000002,0x00070050,0x00000007,0x00000023,0x00000020,
-       0x00000021,0x00000022,0x0000001f,0x000200fe,0x00000023,0x00010038
+       0x00000000,0x00050005,0x00000008,0x74786574,0x74786554,0x00657275,0x00050005,0x0000000c,
+       0x78655473,0x65727574,0x00000000,0x00050005,0x00000010,0x78655476,0x726f6f43,0x00000064,
+       0x00060005,0x00000018,0x6c797473,0x78655465,0x65727574,0x00000000,0x00040005,0x00000019,
+       0x79745373,0x0000656c,0x00050005,0x0000001e,0x67617266,0x6f6c6f43,0x00000072,0x00050005,
+       0x00000020,0x67617246,0x61746144,0x00000000,0x00090006,0x00000020,0x00000000,0x78655475,
+       0x6c6f4374,0x6e41726f,0x74616d69,0x656c6261,0x00000000,0x00050006,0x00000020,0x00000001,
+       0x6c6f4375,0x0000726f,0x00060006,0x00000020,0x00000002,0x4378696d,0x726f6c6f,0x00000000,
+       0x00080006,0x00000020,0x00000003,0x4d657270,0x69746c75,0x65696c70,0x706c4164,0x00006168,
+       0x00030005,0x00000022,0x00000000,0x00040047,0x0000000c,0x00000022,0x00000000,0x00040047,
+       0x0000000c,0x00000021,0x00000002,0x00040047,0x00000010,0x0000001e,0x00000000,0x00040047,
+       0x00000019,0x00000022,0x00000000,0x00040047,0x00000019,0x00000021,0x00000003,0x00040047,
+       0x0000001e,0x0000001e,0x00000000,0x00050048,0x00000020,0x00000000,0x00000023,0x00000000,
+       0x00050048,0x00000020,0x00000001,0x00000023,0x00000010,0x00050048,0x00000020,0x00000002,
+       0x00000023,0x00000020,0x00050048,0x00000020,0x00000003,0x00000023,0x0000002c,0x00030047,
+       0x00000020,0x00000002,0x00040047,0x00000022,0x00000022,0x00000000,0x00040047,0x00000022,
+       0x00000021,0x00000001,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,
+       0x00000006,0x00000020,0x00040020,0x00000007,0x00000007,0x00000006,0x00090019,0x00000009,
+       0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,
+       0x0000000a,0x00000009,0x00040020,0x0000000b,0x00000000,0x0000000a,0x0004003b,0x0000000b,
+       0x0000000c,0x00000000,0x00040017,0x0000000e,0x00000006,0x00000002,0x00040020,0x0000000f,
+       0x00000001,0x0000000e,0x0004003b,0x0000000f,0x00000010,0x00000001,0x00040017,0x00000012,
+       0x00000006,0x00000004,0x00040015,0x00000014,0x00000020,0x00000000,0x0004002b,0x00000014,
+       0x00000015,0x00000000,0x00040020,0x00000017,0x00000007,0x00000012,0x0004003b,0x0000000b,
+       0x00000019,0x00000000,0x00040020,0x0000001d,0x00000003,0x00000012,0x0004003b,0x0000001d,
+       0x0000001e,0x00000003,0x00040017,0x0000001f,0x00000006,0x00000003,0x0006001e,0x00000020,
+       0x00000012,0x00000012,0x0000001f,0x00000006,0x00040020,0x00000021,0x00000002,0x00000020,
+       0x0004003b,0x00000021,0x00000022,0x00000002,0x00040015,0x00000023,0x00000020,0x00000001,
+       0x0004002b,0x00000023,0x00000024,0x00000000,0x00040020,0x00000025,0x00000002,0x00000012,
+       0x0004002b,0x00000006,0x0000002b,0x3f800000,0x0004002b,0x00000014,0x0000002c,0x00000003,
+       0x00040020,0x0000002d,0x00000002,0x00000006,0x0004002b,0x00000023,0x00000035,0x00000001,
+       0x0004002b,0x00000023,0x00000039,0x00000002,0x00040020,0x0000003a,0x00000002,0x0000001f,
+       0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003b,
+       0x00000007,0x00000008,0x00000007,0x0004003b,0x00000017,0x00000018,0x00000007,0x0004003d,
+       0x0000000a,0x0000000d,0x0000000c,0x0004003d,0x0000000e,0x00000011,0x00000010,0x00050057,
+       0x00000012,0x00000013,0x0000000d,0x00000011,0x00050051,0x00000006,0x00000016,0x00000013,
+       0x00000000,0x0003003e,0x00000008,0x00000016,0x0004003d,0x0000000a,0x0000001a,0x00000019,
+       0x0004003d,0x0000000e,0x0000001b,0x00000010,0x00050057,0x00000012,0x0000001c,0x0000001a,
+       0x0000001b,0x0003003e,0x00000018,0x0000001c,0x00050041,0x00000025,0x00000026,0x00000022,
+       0x00000024,0x0004003d,0x00000012,0x00000027,0x00000026,0x0004003d,0x00000006,0x00000028,
+       0x00000008,0x0005008e,0x00000012,0x00000029,0x00000027,0x00000028,0x0004003d,0x00000012,
+       0x0000002a,0x00000018,0x00060041,0x0000002d,0x0000002e,0x00000022,0x00000024,0x0000002c,
+       0x0004003d,0x00000006,0x0000002f,0x0000002e,0x0004003d,0x00000006,0x00000030,0x00000008,
+       0x00050085,0x00000006,0x00000031,0x0000002f,0x00000030,0x00050083,0x00000006,0x00000032,
+       0x0000002b,0x00000031,0x0005008e,0x00000012,0x00000033,0x0000002a,0x00000032,0x00050081,
+       0x00000012,0x00000034,0x00000029,0x00000033,0x00050041,0x00000025,0x00000036,0x00000022,
+       0x00000035,0x0004003d,0x00000012,0x00000037,0x00000036,0x00050085,0x00000012,0x00000038,
+       0x00000034,0x00000037,0x00050041,0x0000003a,0x0000003b,0x00000022,0x00000039,0x0004003d,
+       0x0000001f,0x0000003c,0x0000003b,0x00050051,0x00000006,0x0000003d,0x0000003c,0x00000000,
+       0x00050051,0x00000006,0x0000003e,0x0000003c,0x00000001,0x00050051,0x00000006,0x0000003f,
+       0x0000003c,0x00000002,0x00070050,0x00000012,0x00000040,0x0000003d,0x0000003e,0x0000003f,
+       0x0000002b,0x00050085,0x00000012,0x00000041,0x00000038,0x00000040,0x0003003e,0x0000001e,
+       0x00000041,0x000100fd,0x00010038
 };
index 4f9614d..fe9453e 100644 (file)
@@ -1,30 +1,27 @@
 std::vector<uint32_t> SHADER_WIREFRAME_VISUAL_SHADER_FRAG = {
-       0x07230203,0x00010000,0x00080001,0x00000020,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000001d,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0006000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00030010,0x00000004,
        0x00000007,0x00030003,0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,
        0x00050005,0x00000009,0x67617266,0x6f6c6f43,0x00000072,0x00050005,0x0000000b,0x67617246,
        0x61746144,0x00000000,0x00050006,0x0000000b,0x00000000,0x6c6f4375,0x0000726f,0x00060006,
-       0x0000000b,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00050006,0x0000000b,0x00000002,
-       0x6361706f,0x00797469,0x00030005,0x0000000d,0x00000000,0x00040047,0x00000009,0x0000001e,
-       0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000b,
-       0x00000001,0x00000023,0x00000010,0x00050048,0x0000000b,0x00000002,0x00000023,0x0000001c,
-       0x00030047,0x0000000b,0x00000002,0x00040047,0x0000000d,0x00000022,0x00000001,0x00040047,
-       0x0000000d,0x00000021,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,
-       0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,
-       0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x00040017,
-       0x0000000a,0x00000006,0x00000003,0x0005001e,0x0000000b,0x00000007,0x0000000a,0x00000006,
-       0x00040020,0x0000000c,0x00000002,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000002,
-       0x00040015,0x0000000e,0x00000020,0x00000001,0x0004002b,0x0000000e,0x0000000f,0x00000000,
-       0x00040020,0x00000010,0x00000002,0x00000007,0x0004002b,0x0000000e,0x00000013,0x00000001,
-       0x00040020,0x00000014,0x00000002,0x0000000a,0x0004002b,0x0000000e,0x00000017,0x00000002,
-       0x00040020,0x00000018,0x00000002,0x00000006,0x00050036,0x00000002,0x00000004,0x00000000,
-       0x00000003,0x000200f8,0x00000005,0x00050041,0x00000010,0x00000011,0x0000000d,0x0000000f,
-       0x0004003d,0x00000007,0x00000012,0x00000011,0x00050041,0x00000014,0x00000015,0x0000000d,
-       0x00000013,0x0004003d,0x0000000a,0x00000016,0x00000015,0x00050041,0x00000018,0x00000019,
-       0x0000000d,0x00000017,0x0004003d,0x00000006,0x0000001a,0x00000019,0x00050051,0x00000006,
-       0x0000001b,0x00000016,0x00000000,0x00050051,0x00000006,0x0000001c,0x00000016,0x00000001,
-       0x00050051,0x00000006,0x0000001d,0x00000016,0x00000002,0x00070050,0x00000007,0x0000001e,
-       0x0000001b,0x0000001c,0x0000001d,0x0000001a,0x00050085,0x00000007,0x0000001f,0x00000012,
-       0x0000001e,0x0003003e,0x00000009,0x0000001f,0x000100fd,0x00010038
+       0x0000000b,0x00000001,0x4378696d,0x726f6c6f,0x00000000,0x00030005,0x0000000d,0x00000000,
+       0x00040047,0x00000009,0x0000001e,0x00000000,0x00050048,0x0000000b,0x00000000,0x00000023,
+       0x00000000,0x00050048,0x0000000b,0x00000001,0x00000023,0x00000010,0x00030047,0x0000000b,
+       0x00000002,0x00040047,0x0000000d,0x00000022,0x00000001,0x00040047,0x0000000d,0x00000021,
+       0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,
+       0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,
+       0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003,0x00040017,0x0000000a,0x00000006,
+       0x00000003,0x0004001e,0x0000000b,0x00000007,0x0000000a,0x00040020,0x0000000c,0x00000002,
+       0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000002,0x00040015,0x0000000e,0x00000020,
+       0x00000001,0x0004002b,0x0000000e,0x0000000f,0x00000000,0x00040020,0x00000010,0x00000002,
+       0x00000007,0x0004002b,0x0000000e,0x00000013,0x00000001,0x00040020,0x00000014,0x00000002,
+       0x0000000a,0x0004002b,0x00000006,0x00000017,0x3f800000,0x00050036,0x00000002,0x00000004,
+       0x00000000,0x00000003,0x000200f8,0x00000005,0x00050041,0x00000010,0x00000011,0x0000000d,
+       0x0000000f,0x0004003d,0x00000007,0x00000012,0x00000011,0x00050041,0x00000014,0x00000015,
+       0x0000000d,0x00000013,0x0004003d,0x0000000a,0x00000016,0x00000015,0x00050051,0x00000006,
+       0x00000018,0x00000016,0x00000000,0x00050051,0x00000006,0x00000019,0x00000016,0x00000001,
+       0x00050051,0x00000006,0x0000001a,0x00000016,0x00000002,0x00070050,0x00000007,0x0000001b,
+       0x00000018,0x00000019,0x0000001a,0x00000017,0x00050085,0x00000007,0x0000001c,0x00000012,
+       0x0000001b,0x0003003e,0x00000009,0x0000001c,0x000100fd,0x00010038
 };
index 6be24d4..bbe3896 100644 (file)
@@ -1,5 +1,5 @@
 std::vector<uint32_t> SHADER_WIREFRAME_VISUAL_SHADER_VERT = {
-       0x07230203,0x00010000,0x00080001,0x0000005c,0x00000000,0x00020011,0x00000001,0x0006000b,
+       0x07230203,0x00010000,0x00080003,0x0000005c,0x00000000,0x00020011,0x00000001,0x0006000b,
        0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
        0x0007000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000035,0x00000053,0x00030003,
        0x00000002,0x000001ae,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00080005,0x00000009,
index f17a85f..1af3ff3 100644 (file)
@@ -7,7 +7,6 @@ layout( set = 1, binding = 0, std140 ) uniform FragData
   vec4 uColor;
   vec4 borderColor;
   vec3 mixColor;
-  float opacity;
   float borderSize;
 };
 
@@ -15,6 +14,6 @@ layout( location = 0 ) out vec4 fragColor;
 
 void main()
 {
-  fragColor = vec4(mixColor, opacity)*borderColor*uColor;
+  fragColor = vec4(mixColor, 1.0)*borderColor*uColor;
   fragColor.a *= smoothstep(0.0, 1.5, vAlpha)*smoothstep( borderSize+1.5, borderSize, vAlpha );
 }
index 57e9314..e8b9ed3 100644 (file)
@@ -5,12 +5,11 @@ layout( set = 1, binding = 0, std140 ) uniform FragData
   vec4 uColor;
   vec4 borderColor;
   vec3 mixColor;
-  float opacity;
 };
 
 layout( location = 0 ) out vec4 fragColor;
 
 void main()
 {
-  fragColor = vec4(mixColor, opacity)*borderColor*uColor;
+  fragColor = vec4(mixColor, 1.0)*borderColor*uColor;
 }
index d69c36f..c1d22d8 100644 (file)
@@ -4,12 +4,11 @@ layout( set = 0, binding = 1, std140) uniform FragData
 {
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
 };
 
 layout( location = 0 ) out vec4 fragColor;
 
 void main()
 {
-  fragColor = vec4(mixColor, opacity)*uColor;
+  fragColor = vec4(mixColor, 1.0)*uColor;
 }
index 8487e0b..6d95867 100644 (file)
@@ -15,13 +15,8 @@ layout( set=1, binding=1 ) uniform sampler2D sTexture;
 
 layout( location=0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
     vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-    fragColor = texture( sTexture, texCoord ) * uColor * visualMixColor();
+    fragColor = texture( sTexture, texCoord ) * uColor * vec4(mixColor, 1.0);
 }
index bd455fc..b6fab82 100644 (file)
@@ -26,14 +26,9 @@ float wrapCoordinate( vec2 range, float coordinate, float wrap )
   return clamp( mix(range.x, range.y, coord), range.x, range.y );
 }
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
     vec2 texCoord = vec2( wrapCoordinate( uAtlasRect.xz, vTexCoord.x, wrapMode.x ),
                                   wrapCoordinate( uAtlasRect.yw, vTexCoord.y, wrapMode.y ) );
-    fragColor = texture( sTexture, texCoord ) * uColor * visualMixColor();
+    fragColor = texture( sTexture, texCoord ) * uColor * vec4(mixColor,1.0);
 }
index 9231872..3a358c7 100644 (file)
@@ -6,7 +6,6 @@ layout( set=0, binding=1, std140 ) uniform FragDataNoAtlas
 {
     vec4 uColor;
     vec3 mixColor;
-    float opacity;
     float preMultipliedAlpha;
 };
 
@@ -14,12 +13,7 @@ layout( set=0, binding=2 ) uniform sampler2D sTexture;
 
 layout( location=0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-    fragColor = texture( sTexture, vTexCoord ) * uColor * visualMixColor();
+    fragColor = texture( sTexture, vTexCoord ) * uColor * vec4(mixColor, 1.0);
 }
index 4fa9564..999d225 100644 (file)
@@ -6,7 +6,6 @@ layout( set = 0, binding = 1, std140 ) uniform FragData
 {
     vec4 uColor;
     vec3 mixColor;
-    float opacity;
     float preMultipliedAlpha;
 };
 
@@ -14,11 +13,7 @@ layout( set = 0, binding = 2 ) uniform sampler2D sTexture;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
 void main()
 {
-    fragColor = texture( sTexture, vTexCoord ) * uColor * visualMixColor();
+    fragColor = texture( sTexture, vTexCoord ) * uColor * vec4(mixColor, 1.0);
 }
index 7ce9f4d..07f6ded 100644 (file)
@@ -18,16 +18,12 @@ layout( set = 0, binding = 4 ) uniform sampler2D sGloss;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
 void main()
 {
     vec4 diffuse = texture( sDiffuse, vTexCoord );
     vec3 normal = normalize( texture( sNormal, vTexCoord ).xyz * 2.0 - 1.0 );
     vec4 glossMap = texture( sGloss, vTexCoord );
-    vec4 visualMixColor = visualMixColor();
+    vec4 visualMixColor = vec4(mixColor,1.0);
 
     float lightDiffuse = max( 0.0, dot( normal, normalize( vLightDirection ) ) );
     lightDiffuse = lightDiffuse * 0.5 + 0.5;
index c9321f2..28293a4 100644 (file)
@@ -8,22 +8,15 @@ layout( set = 0, binding = 1, std140 ) uniform FragData
 {
     vec4 uColor;
     vec3 mixColor;
-    float opacity;
-    float preMultipliedAlpha;
 };
 
 layout( set = 0, binding = 2 ) uniform sampler2D sDiffuse;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
     vec4 texture = texture( sDiffuse, vTexCoord );
-    vec4 visualMixColor = visualMixColor();
+    vec4 visualMixColor = vec4(mixColor,1.0);
     fragColor = vec4( vIllumination.rgb * texture.rgb * uColor.rgb * visualMixColor.rgb + vSpecular * 0.3, texture.a * uColor.a * visualMixColor.a );
 }
index d5365de..5d7aba1 100644 (file)
@@ -6,17 +6,11 @@ layout(set=0, binding=1, std140) uniform FragData
 {
     vec4 uColor;
     vec3 mixColor;
-    float opacity;
-    float preMultipliedAlpha;
 };
 
 layout(location=0) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
 void main()
 {
-    fragColor = vec4( vIllumination.rgb * uColor.rgb, uColor.a ) * visualMixColor();
+    fragColor = vec4( vIllumination.rgb * uColor.rgb, uColor.a ) * vec4(mixColor,1.0);
 }
index 973dc42..5a56e7f 100644 (file)
@@ -2,6 +2,7 @@
 
 layout(location=0) in vec2 aPosition;
 layout(location=0) out vec2 vTexCoord;
+layout(location=1) out vec2 vMaskTexCoord;
 
 layout(set = 0, binding = 0, std140) uniform VertData
 {
@@ -31,13 +32,15 @@ void main()
   vec2 stretch      = floor( aPosition * 0.5 );
   vec2 fixedTotal   = uFixed[ 2 ];
 
-  vec4 vertexPosition = vec4( fixedFactor + ( size - fixedTotal ) * stretch, 0.0, 1.0 );
+  vec4 gridPosition = vec4( fixedFactor + ( size - fixedTotal ) * stretch, 0.0, 1.0 );
+  vec4 vertexPosition = gridPosition;
   vertexPosition.xy -= size * vec2( 0.5, 0.5 );
-  vertexPosition.xy =  vertexPosition.xy + anchorPoint*size + (visualOffset + origin)*uSize.xy;\
+  vertexPosition.xy += anchorPoint*size + (visualOffset + origin)*uSize.xy;
 
   vertexPosition = uMvpMatrix * vertexPosition;
 
   vTexCoord = ( fixedFactor + stretch * uStretchTotal ) / ( fixedTotal + uStretchTotal );
 
+  vMaskTexCoord = gridPosition.xy / size;
   gl_Position = vertexPosition;
 }
diff --git a/dali/graphics/vulkan/shaders/npatch-visual-mask-shader.frag b/dali/graphics/vulkan/shaders/npatch-visual-mask-shader.frag
new file mode 100644 (file)
index 0000000..1f47c4b
--- /dev/null
@@ -0,0 +1,28 @@
+#version 430
+
+layout(location=0) in vec2 vTexCoord;
+layout(location=1) in vec2 vMaskTexCoord;
+
+layout(set=0, binding=1, std140) uniform FragData
+{
+    vec4 uColor;
+    vec3 mixColor;
+    float opacity;
+    float preMultipliedAlpha;
+    float auxiliaryImageAlpha;
+};
+
+layout(set=0, binding=2) uniform sampler2D sTexture;
+layout(set=0, binding=3) uniform sampler2D sMask;
+
+layout(location=0) out vec4 fragColor;
+
+void main()
+{
+  vec4 color = texture( sTexture, vTexCoord );
+  vec4 mask  = texture( sMask, vMaskTexCoord );
+
+  vec3 mixedColor = color.rgb * mix( 1.0-mask.a, 1.0, 1.0-auxiliaryImageAlpha) + mask.rgb*mask.a * auxiliaryImageAlpha;
+
+  fragColor = vec4(mixedColor,1.0) * uColor * vec4( mixColor, 1.0 );
+}
index 42ae4b0..e4b7101 100644 (file)
@@ -14,12 +14,7 @@ layout(set=0, binding=2) uniform sampler2D sTexture;
 
 layout(location=0) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-    fragColor = texture( sTexture, vTexCoord ) * uColor * visualMixColor();
+    fragColor = texture( sTexture, vTexCoord ) * uColor * vec4(mixColor,1.0);
 }
index 6f3f09c..82b2133 100644 (file)
@@ -2,6 +2,7 @@
 
 layout(location=0) in vec2 aPosition;
 layout(location=0) out vec2 vTexCoord;
+layout(location=1) out vec2 vMaskTexCoord;
 
 // using specialization constants
 layout(constant_id = 0) const int FACTOR_SIZE_X = 4;
@@ -24,22 +25,22 @@ layout(set=0, binding=0, std140) uniform VertData
 
 void main()
 {
-    vec2 fixedFactor  = vec2( uNinePatchFactorsX[ int( ( aPosition.x + 1.0 ) * 0.5 ) ].x, uNinePatchFactorsY[ int( ( aPosition.y + 1.0 ) * 0.5 ) ].x );
-    vec2 stretch      = vec2( uNinePatchFactorsX[ int( ( aPosition.x       ) * 0.5 ) ].y, uNinePatchFactorsY[ int( ( aPosition.y       ) * 0.5 ) ].y );
+  vec2 fixedFactor  = vec2( uNinePatchFactorsX[ int( ( aPosition.x + 1.0 ) * 0.5 ) ].x, uNinePatchFactorsY[ int( ( aPosition.y + 1.0 ) * 0.5 ) ].x );
+  vec2 stretch      = vec2( uNinePatchFactorsX[ int( ( aPosition.x       ) * 0.5 ) ].y, uNinePatchFactorsY[ int( ( aPosition.y       ) * 0.5 ) ].y );
 
-    vec2 fixedTotal   = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].x, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].x );
-    vec2 stretchTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].y, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].y );
+  vec2 fixedTotal   = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].x, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].x );
+  vec2 stretchTotal = vec2( uNinePatchFactorsX[ FACTOR_SIZE_X - 1 ].y, uNinePatchFactorsY[ FACTOR_SIZE_Y - 1 ].y );
 
+  vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
+  vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
 
-    vec2 visualSize = mix(uSize.xy*size, size, offsetSizeMode.zw );
-    vec2 visualOffset = mix( offset, offset/uSize.xy, offsetSizeMode.xy);
+  vec4 gridPosition = vec4( fixedFactor + ( visualSize.xy - fixedTotal ) * stretch / stretchTotal, 0.0, 1.0 );
+  vec4 vertexPosition = gridPosition;
+  vertexPosition.xy -= visualSize.xy * vec2( 0.5, 0.5 );
+  vertexPosition.xy += anchorPoint*visualSize + (visualOffset + origin)*uSize.xy;
+  vertexPosition = uMvpMatrix * vertexPosition;
 
-    vec4 vertexPosition = vec4( ( fixedFactor + ( visualSize.xy - fixedTotal ) * stretch / stretchTotal ) +  anchorPoint*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );
-    vertexPosition.xy -= visualSize.xy * vec2( 0.5, 0.5 );
-
-    vertexPosition = uMvpMatrix * vertexPosition;
-
-    vTexCoord = ( fixedFactor + stretch ) / ( fixedTotal + stretchTotal );
-
-    gl_Position = vertexPosition;
+  vTexCoord = ( fixedFactor + stretch ) / ( fixedTotal + stretchTotal );
+  vMaskTexCoord = gridPosition.xy / visualSize;
+  gl_Position = vertexPosition;
 }
index a32e492..985f914 100644 (file)
@@ -5,10 +5,8 @@ layout( location = 0 ) in vec2 vTexCoord;
 // uniforms
 layout( set = 0, binding = 1, std140 ) uniform FragData
 {
-  vec4 uAtlasRect;
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
   float preMultipliedAlpha;
 };
 
@@ -16,16 +14,10 @@ layout( set = 0, binding = 2 ) uniform sampler2D sTexture;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-  vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-  vec4 textTexture = texture( sTexture, texCoord );
+  vec4 textTexture = texture( sTexture, vTexCoord );
   textTexture.rgb *= mix( 1.0, textTexture.a, preMultipliedAlpha );
 
-  fragColor = textTexture * uColor * visualMixColor();
+  fragColor = textTexture * uColor * vec4(mixColor,1.0);
 }
index 59f679a..0448425 100644 (file)
@@ -4,10 +4,8 @@ layout( location = 0 ) in vec2 vTexCoord;
 
 layout( set = 1, binding = 0, std140 ) uniform FragData
 {
-  vec4 uAtlasRect;
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
   float preMultipliedAlpha;
 };
 
@@ -16,18 +14,12 @@ layout( set = 1, binding = 2 ) uniform sampler2D sStyle;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-  vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-  vec4 textTexture = texture( sTexture, texCoord );
-  vec4 styleTexture = texture( sStyle, texCoord );
+  vec4 textTexture = texture( sTexture, vTexCoord );
+  vec4 styleTexture = texture( sStyle, vTexCoord );
   textTexture.rgb *= mix( 1.0, textTexture.a, preMultipliedAlpha );
 
   // Draw the text as overlay above the style
-  fragColor = ( textTexture + styleTexture * ( 1.0 - textTexture.a ) ) * uColor * visualMixColor();
+  fragColor = ( textTexture + styleTexture * ( 1.0 - textTexture.a ) ) * uColor * vec4(mixColor,1.0);
 }
index cc2efa4..5af011d 100644 (file)
@@ -5,10 +5,8 @@ layout( location = 0 ) in vec2 vTexCoord;
 layout( set = 0, binding = 1, std140 ) uniform FragData
 {
   vec4 uTextColorAnimatable;
-  vec4 uAtlasRect;
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
   float preMultipliedAlpha;
 };
 
@@ -16,16 +14,10 @@ layout( set = 0, binding = 2) uniform sampler2D sTexture;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-  vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-  float textTexture = texture( sTexture, texCoord ).r;
+  float textTexture = texture( sTexture, vTexCoord ).r;
 
   // Set the color of the text to what it is animated to.
-  fragColor = uTextColorAnimatable * textTexture * uColor * visualMixColor();
+  fragColor = uTextColorAnimatable * textTexture * uColor * vec4(mixColor,1.0);
 }
index d05ce8c..9ae12f8 100644 (file)
@@ -5,10 +5,8 @@ layout( location = 0 ) in vec2 vTexCoord;
 layout( set = 0, binding = 1, std140 ) uniform FragData
 {
   vec4 uTextColorAnimatable;
-  vec4 uAtlasRect;
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
   float preMultipliedAlpha;
 };
 
@@ -17,23 +15,17 @@ layout( set = 0, binding = 3 ) uniform sampler2D sMask;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-  vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-  vec4 textTexture = texture( sTexture, texCoord );
-  float maskTexture = texture( sMask, texCoord ).r;
+  vec4 theTextTexture = texture( sTexture, vTexCoord );
+  float theMaskTexture = texture( sMask, vTexCoord ).r;
 
   // Set the color of non-transparent pixel in text to what it is animated to.
   // Markup text with multiple text colors are not animated (but can be supported later on if required).
   // Emoji color are not animated.
-  float vstep = step( 0.0001, textTexture.a );
-  textTexture.rgb = mix( textTexture.rgb, uTextColorAnimatable.rgb, vstep * maskTexture ) * mix( 1.0, textTexture.a, preMultipliedAlpha );
+  float vstep = step( 0.0001, theTextTexture.a );
+  theTextTexture.rgb = mix( theTextTexture.rgb, uTextColorAnimatable.rgb, vstep * theMaskTexture ) * mix( 1.0, theTextTexture.a, preMultipliedAlpha );
 
   // Draw the text as overlay above the style
-  fragColor = textTexture * uColor * visualMixColor();
+  fragColor = theTextTexture * uColor * vec4(mixColor,1.0);
 }
index d5ed5e1..f6e81d7 100644 (file)
@@ -6,10 +6,8 @@ layout( set = 1, binding = 0, std140 ) uniform FragData
 {
   float uHasMultipleTextColors;
   vec4 uTextColorAnimatable;
-  vec4 uAtlasRect;
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
   float preMultipliedAlpha;
 };
 
@@ -19,17 +17,11 @@ layout( set = 1, binding = 3 ) uniform sampler2D sMask;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-  vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-  vec4 textTexture = texture( sTexture, texCoord );
-  vec4 styleTexture = texture( sStyle, texCoord );
-  float maskTexture = texture( sMask, texCoord ).r;
+  vec4 textTexture = texture( sTexture, vTexCoord );
+  vec4 styleTexture = texture( sStyle, vTexCoord );
+  float maskTexture = texture( sMask, vTexCoord ).r;
 
   // Set the color of non-transparent pixel in text to what it is animated to.
   // Markup text with multiple text colors are not animated (but can be supported later on if required).
@@ -38,5 +30,5 @@ void main()
   textTexture.rgb = mix( textTexture.rgb, uTextColorAnimatable.rgb, vstep * maskTexture * ( 1.0 - uHasMultipleTextColors ) ) * mix( 1.0, textTexture.a, preMultipliedAlpha );
 
   // Draw the text as overlay above the style
-  fragColor = ( textTexture + styleTexture * ( 1.0 - textTexture.a ) ) * uColor * visualMixColor();
+  fragColor = ( textTexture + styleTexture * ( 1.0 - textTexture.a ) ) * uColor * vec4(mixColor,1.0);
 }
index b46391c..1139549 100644 (file)
@@ -5,10 +5,8 @@ layout( location = 0 ) in vec2 vTexCoord;
 layout( set = 0, binding = 1, std140 ) uniform FragData
 {
   vec4 uTextColorAnimatable;
-  vec4 uAtlasRect;
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
   float preMultipliedAlpha;
 };
 
@@ -17,17 +15,11 @@ layout( set = 0, binding = 3 ) uniform sampler2D sStyle;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-  vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-  float textTexture = texture( sTexture, texCoord ).r;
-  vec4 styleTexture = texture( sStyle, texCoord );
+  float textTexture = texture( sTexture, vTexCoord ).r;
+  vec4 styleTexture = texture( sStyle, vTexCoord );
 
   // Draw the text as overlay above the style
-  fragColor = ( uTextColorAnimatable * textTexture + styleTexture * ( 1.0 - textTexture ) ) * uColor * visualMixColor();
+  fragColor = ( uTextColorAnimatable * textTexture + styleTexture * ( 1.0 - uTextColorAnimatable.a * textTexture ) ) * uColor * vec4(mixColor,1.0);
 }
index 3d2e898..4167462 100644 (file)
@@ -4,12 +4,11 @@ layout( set = 1, binding = 0, std140 ) uniform FragData
 {
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
 };
 
 layout( location = 0 ) out vec4 fragColor;
 
 void main()
 {
-  fragColor = uColor * vec4( mixColor, opacity );
+  fragColor = uColor * vec4( mixColor, 1.0 );
 }
index 8aa867b..6ba5eba 100644 (file)
  *
  */
 
-#include <iostream>
-
 #include <dali/graphics/vulkan/spirv/vulkan-spirv.h>
 #include <dali/graphics/vulkan/spirv/vulkan-spirv-opcode.h>
+#include <dali/graphics/vulkan/vulkan-debug.h>
 
-#define debug( x ) std::cout << x << std::endl;
 
 namespace Dali
 {
@@ -395,7 +393,7 @@ struct SPIRVShader::Impl
         {
           auto decorationQualifier = decoration->GetParameter<SpvDecoration>( 1 );
           decorationInfo.decorations.emplace( decorationQualifier, decoration );
-          std::cout << decorationQualifier << std::endl;
+          DALI_LOG_STREAM( gVulkanFilter, Debug::General, decorationQualifier);
         }
         decorationVariables.emplace( id, decorationInfo );
 
@@ -409,7 +407,7 @@ struct SPIRVShader::Impl
           // variable may not be named ( global scope of the shader )
           if( !(*name.result)->GetParameterAsString( 1 ).empty() )
           {
-            std::cout <<"Found name\n";
+            DALI_LOG_STREAM( gVulkanFilter, Debug::General, "Found name");
             decorationVariables[id].name = (*name.result)->GetParameterAsString( 1 );
             foundName = true;
           }
@@ -427,7 +425,7 @@ struct SPIRVShader::Impl
           GetResult<SPIRVOpCode*> retval{};
           if( (retval = GetMapItem( opNames, pointerToType.localData.resultId )).success )
           {
-            std::cout << "Found: " << (*retval.result)->GetParameterAsString(1) << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::General, "Found: " << (*retval.result)->GetParameterAsString(1));
             decorationVariables[id].name = (*retval.result)->GetParameterAsString(1);
           }
 
@@ -437,8 +435,9 @@ struct SPIRVShader::Impl
           {
 
             auto memberCount = pointerToType.localData.count-2;
-            std::cout << "Found struct, look for member names and member decorations: "
-                      "member count: " << memberCount << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::General,
+                               "Found struct, look for member names and member decorations: "
+                               "member count: " << memberCount);
 
             // for each member resolve type and compute size of the structure
             auto memberNames = opMemberNames[ pointerToType.localData.resultId ];
@@ -457,8 +456,7 @@ struct SPIRVShader::Impl
                 memberOpInfo.decorations.emplace( mop->GetParameter<SpvDecoration>( 2 ), mop );
               }
               decorationVariables[id].members.emplace_back(memberOpInfo);
-              std::cout << "memberName: " << memberName->GetParameterAsString(2);
-              std::cout << std::endl;
+              DALI_LOG_STREAM( gVulkanFilter, Debug::General,  "memberName: " << memberName->GetParameterAsString(2) );
             }
 
             uint32_t structSize = 0u;
@@ -479,13 +477,13 @@ struct SPIRVShader::Impl
               }
               decorationVariables[id].structSize = structSize;
             }
-            std::cout << "struct size: " << structSize << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::General, "struct size: " << structSize);
           }
         }
       }
     }
 
-    std::cout << "Found " << uniformVariables.size() << " variables\n";
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General,  "Found " << uniformVariables.size() << " variables" );
 
     return decorationVariables;
   }
@@ -498,11 +496,11 @@ struct SPIRVShader::Impl
     auto iter = data.begin();
     if( !CheckHeader() )
     {
-      debug( "Not SPIRV!" );
+      DALI_LOG_STREAM( gVulkanFilter, Debug::General,  "Not SPIRV!" );
       return retval;
     }
 
-    debug( "SPIR-V detected" );
+    DALI_LOG_STREAM( gVulkanFilter, Debug::General,  "SPIR-V detected" );
     std::advance( iter, 5u ); // skip header
 
     while( iter != data.end() )
@@ -632,7 +630,7 @@ struct SPIRVShader::Impl
       {
         auto binding = MapContains( symbolData.decorations, SpvDecorationBinding ) ? symbolData.decorations[SpvDecorationBinding]->GetParameterU32(2) : 0u;
         auto descriptorSet = MapContains( symbolData.decorations, SpvDecorationDescriptorSet ) ? symbolData.decorations[SpvDecorationDescriptorSet]->GetParameterU32(2) : 0u;
-        debug("found layout: binding: " << binding << " ds: " << descriptorSet << ", type: " << U32(symbolData.descriptorType) );
+        DALI_LOG_STREAM( gVulkanFilter, Debug::General, "found layout: binding: " << binding << " ds: " << descriptorSet << ", type: " << U32(symbolData.descriptorType) );
 
         auto& ds = (MapContains( vkDescriptorSetLayoutCreateInfos, descriptorSet ) ?
                     vkDescriptorSetLayoutCreateInfos[descriptorSet] :
@@ -1095,4 +1093,4 @@ std::unique_ptr<SPIRVShader> SPIRVUtils::Parse( const SPIRVWord* data, size_t si
 
 } // namespace Graphics
 
-} // namespace Dali
\ No newline at end of file
+} // namespace Dali
diff --git a/dali/graphics/vulkan/vulkan-debug.cpp b/dali/graphics/vulkan/vulkan-debug.cpp
new file mode 100644 (file)
index 0000000..25ec915
--- /dev/null
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dali/graphics/vulkan/vulkan-debug.h>
+
+#if defined(DEBUG_ENABLED)
+
+const char* LOG_VULKAN( getenv( "LOG_VULKAN" ) );
+
+#endif
diff --git a/dali/graphics/vulkan/vulkan-debug.h b/dali/graphics/vulkan/vulkan-debug.h
new file mode 100644 (file)
index 0000000..140bd5b
--- /dev/null
@@ -0,0 +1,37 @@
+#ifndef DALI_GRAPHICS_VULKAN_DEBUG_H
+#define DALI_GRAPHICS_VULKAN_DEBUG_H
+
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if defined(DEBUG_ENABLED)
+
+#include <iostream>
+
+
+extern const char* LOG_VULKAN;
+
+#define DALI_LOG_STREAM( filter, level, stream )  \
+  if( nullptr != LOG_VULKAN)                      \
+  {                                               \
+    std::cout << stream << std::endl;             \
+  }
+
+#else
+#define DALI_LOG_STREAM( filter, level, stream )
+#endif
+
+#endif // DALI_GRAPHICS_VULKAN_DEBUG_H
index 4413f20..8dfe64f 100644 (file)
 #include <dali/graphics/vulkan/vulkan-pipeline-cache.h>
 #include <dali/graphics/vulkan/vulkan-sampler.h>
 #include <dali/graphics/vulkan/vulkan-resource-cache.h>
-
+#include <dali/graphics/vulkan/vulkan-debug.h>
 #include <dali/graphics-api/graphics-api-controller.h>
 
+
 #ifndef VK_KHR_XLIB_SURFACE_EXTENSION_NAME
 #define VK_KHR_XLIB_SURFACE_EXTENSION_NAME "VK_KHR_xlib_surface"
 #endif
@@ -48,6 +49,7 @@
 #define VK_KHR_XCB_SURFACE_EXTENSION_NAME "VK_KHR_xcb_surface"
 #endif
 
+
 namespace Dali
 {
 namespace Graphics
@@ -59,8 +61,8 @@ namespace Vulkan
 const auto VALIDATION_LAYERS = std::vector< const char* >{
 
   //"VK_LAYER_LUNARG_screenshot",           // screenshot
-  //"VK_LAYER_RENDERDOC_Capture",
-  //"VK_LAYER_LUNARG_parameter_validation", // parameter
+  "VK_LAYER_RENDERDOC_Capture",
+  "VK_LAYER_LUNARG_parameter_validation", // parameter
   //"VK_LAYER_LUNARG_vktrace",              // vktrace ( requires vktrace connection )
   //"VK_LAYER_LUNARG_monitor",             // monitor
   "VK_LAYER_LUNARG_swapchain",           // swapchain
@@ -188,7 +190,7 @@ void Graphics::Create()
   {
     for( auto&& prop : layers.value )
     {
-      std::cout << prop.layerName << std::endl;
+      DALI_LOG_STREAM( gVulkanFilter, Debug::General, prop.layerName );
       if( std::string(prop.layerName) == reqLayer )
       {
         validationLayers.push_back(reqLayer);
@@ -207,9 +209,15 @@ void Graphics::CreateInstance( const std::vector<const char*>& extensions, const
   info.setEnabledExtensionCount(U32(extensions.size()))
       .setPpEnabledExtensionNames(extensions.data())
       .setEnabledLayerCount(U32(validationLayers.size()))
-      //.setEnabledLayerCount(0)
       .setPpEnabledLayerNames(validationLayers.data());
 
+#if defined(DEBUG_ENABLED)
+  if( ! getenv("LOG_VULKAN") )
+  {
+    info.setEnabledLayerCount(0);
+  }
+#endif
+
   mInstance = VkAssert(vk::createInstance(info, *mAllocator));
 }
 
index f2f9dc8..7e35409 100644 (file)
@@ -63,6 +63,13 @@ using Dali::Integration::Graphics::Vulkan::VkSurfaceFactory;
 extern std::vector<uint8_t> VSH;
 extern std::vector<uint8_t> FSH;
 
+namespace // unnamed namespace
+{
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gVulkanFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VULKAN");
+#endif
+}
+
 template<typename T, typename... Args>
 std::unique_ptr<T> MakeUnique( Args&&... args )
 {
@@ -569,12 +576,11 @@ void spirv_test0( std::vector<SPIRVWord> code )
 {
   auto shader = SPIRVUtils::Parse( code, vk::ShaderStageFlagBits::eVertex );
   auto opcodeCount = shader->GetOpCodeCount();
-  std::cout << "opcodecount" << opcodeCount << std::endl;
+  DEBUG_LOG_STREAMS( gVulkanFilter, Debug::General, "opcodecount" << opcodeCount );
 
   auto layoutCreateInfo = shader->GenerateDescriptorSetLayoutCreateInfo();
 
-  std::cout<< "yay!" <<std::endl;
-
+  DEBUG_LOG_STREAMS( gVulkanFilter, Debug::General, "yay!" );
 }
 
 void RunSPIRVTest()
index 3c0eafa..e164b85 100644 (file)
@@ -21,7 +21,6 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/view-mode.h>
-#include <dali/integration-api/context-notifier.h>
 #include <dali/integration-api/resource-policies.h>
 
 namespace Dali
index ac9585c..e837f0b 100644 (file)
@@ -105,9 +105,9 @@ void Core::Update(
                  renderToFboEnabled, isRenderingToFbo );
 }
 
-void Core::Render( RenderStatus& status )
+void Core::Render( RenderStatus& status, bool forceClear )
 {
-  DALI_LOG_ERROR("Core::Render() called in error");
+  DALI_LOG_ERROR("Core::Render() called in error\n");
 }
 
 SystemOverlay& Core::GetSystemOverlay()
index ad0abd4..1ba6c71 100644 (file)
 // EXTERNAL INCLUDES
 #include <string>
 #include <sstream>
+#include <iostream>
 #include <list>
 #include <stdint.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wfloat-conversion"
+#pragma GCC diagnostic ignored "-Wdouble-promotion"
+
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 
+#pragma GCC diagnostic pop
+
 // Using Debug namespace alias shortens the log usage significantly
 namespace Dali{namespace Integration{namespace Log{}}}
 namespace Debug = Dali::Integration::Log;
@@ -312,9 +322,18 @@ public:
 #define DALI_LOG_INFO(filter, level, format, args...)                        \
   if(filter && filter->IsEnabledFor(level)) { filter->Log(level, format,  ## args); }
 
+#define DALI_LOG_STREAM( filter, level, stream )  \
+  if(filter && filter->IsEnabledFor(level))       \
+  {                                               \
+    std::ostringstream o;                         \
+    o << stream << std::endl;                     \
+    filter->Log(level, "%s", o.str().c_str());    \
+  }
+
 #else // DEBUG_ENABLED
 
 #define DALI_LOG_INFO(filter, level, format, args...)
+#define DALI_LOG_STREAM( filter, level, stream )
 
 #endif // DEBUG_ENABLED
 
index bc69b00..4190379 100644 (file)
@@ -207,9 +207,9 @@ void Core::Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds,
   // Any message to update will wake it up anyways
 }
 
-void Core::Render( RenderStatus& status )
+void Core::Render( RenderStatus& status, bool forceClear )
 {
-  DALI_LOG_ERROR("Render()!");
+  DALI_LOG_ERROR("Render()!\n");
   (void)status;
 }
 
index 987de69..82e2993 100644 (file)
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/common/view-mode.h>
+#include <dali/public-api/object/ref-object.h>
 
-#include <dali/integration-api/context-notifier.h>
 #include <dali/integration-api/core-enumerations.h>
+#include <dali/integration-api/resource-policies.h>
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/internal/event/animation/animation-playlist-declarations.h>
 #include <dali/internal/event/common/stage-def.h>
index 2f7f1e4..36af143 100644 (file)
@@ -25,6 +25,7 @@
 #include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/event/common/property-helper.h>    // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
 #include <dali/internal/event/common/property-input-impl.h>
+#include <dali/internal/update/rendering/stencil-parameters.h>
 #include <dali/internal/update/rendering/scene-graph-geometry.h>
 #include <dali/internal/update/manager/update-manager.h>
 #include <dali/internal/update/rendering/scene-graph-renderer.h>
@@ -1084,49 +1085,49 @@ bool Renderer::GetCurrentPropertyValue( Property::Index index, Property::Value&
     }
     case Dali::Renderer::Property::STENCIL_FUNCTION:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.stencilFunction;
       break;
     }
     case Dali::Renderer::Property::STENCIL_FUNCTION_MASK:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.stencilFunctionMask;
       break;
     }
     case Dali::Renderer::Property::STENCIL_FUNCTION_REFERENCE:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.stencilFunctionReference;
       break;
     }
     case Dali::Renderer::Property::STENCIL_MASK:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.stencilMask;
       break;
     }
     case Dali::Renderer::Property::RENDER_MODE:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.renderMode;
       break;
     }
     case Dali::Renderer::Property::STENCIL_OPERATION_ON_FAIL:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.stencilOperationOnFail;
       break;
     }
     case Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_FAIL:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.stencilOperationOnZFail;
       break;
     }
     case Dali::Renderer::Property::STENCIL_OPERATION_ON_Z_PASS:
     {
-      Render::Renderer::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
+      SceneGraph::StencilParameters stencilParameters = mSceneObject->GetStencilParameters();
       value = stencilParameters.stencilOperationOnZPass;
       break;
     }
index 5acb572..a397b83 100644 (file)
@@ -82,6 +82,8 @@ void SubmitRenderItemList( Graphics::API::Controller&           graphics,
   for( auto i = 0u; i < numberOfRenderItems; ++i )
   {
     auto& item = renderItemList.GetItem( i );
+    auto color = item.mNode->GetWorldColor( bufferIndex );
+
     for( auto j = 0u; j < item.mNode->GetRendererCount(); ++j )
     {
       auto sgRenderer = item.mNode
@@ -93,6 +95,18 @@ void SubmitRenderItemList( Graphics::API::Controller&           graphics,
         continue;
       }
       cmd.BindRenderTarget(renderTargetBinding);
+
+      auto opacity = sgRenderer->GetOpacity( bufferIndex );
+      if( sgRenderer->IsPreMultipliedAlphaEnabled() )
+      {
+        float alpha = color.a * opacity;
+        color = Vector4( color.r * alpha, color.g * alpha, color.b * alpha, alpha );
+      }
+      else
+      {
+        color.a *= opacity;
+      }
+
       Matrix mvp, mvp2;
       Matrix::Multiply(mvp, item.mModelMatrix, viewProjection);
       Matrix::Multiply(mvp2, mvp, CLIP_MATRIX);
@@ -102,8 +116,8 @@ void SubmitRenderItemList( Graphics::API::Controller&           graphics,
       sgRenderer->WriteUniform("uModelViewMatrix", item.mModelViewMatrix);
       sgRenderer->WriteUniform("uProjection", vulkanProjectionMatrix);
       sgRenderer->WriteUniform("uSize", item.mSize);
-      sgRenderer->WriteUniform("uColor", item.mNode
-                                             ->GetWorldColor(bufferIndex));
+      sgRenderer->WriteUniform( "uColor", color );
+
       commandList.push_back(&cmd);
     }
   }
index 799596f..9c61452 100644 (file)
 #include <dali/internal/update/rendering/data-providers/node-data-provider.h>
 #include <dali/internal/update/rendering/scene-graph-geometry.h>
 #include <dali/internal/update/rendering/scene-graph-property-buffer.h>
-#include <dali/internal/update/rendering/scene-graph-texture-set.h>
 #include <dali/internal/update/rendering/scene-graph-shader.h>
+#include <dali/internal/update/rendering/scene-graph-sampler.h>
+#include <dali/internal/update/rendering/scene-graph-texture.h>
+#include <dali/internal/update/rendering/scene-graph-texture-set.h>
 
 #include <dali/graphics-api/graphics-api-controller.h>
 #include <dali/graphics-api/graphics-api-render-command.h>
 #include <dali/graphics-api/graphics-api-shader.h>
 #include <dali/graphics-api/graphics-api-shader-details.h>
-
 #include <cstring>
 
-
-namespace
-{
-
-/**
- * Helper to set view and projection matrices once per program
- * @param program to set the matrices to
- * @param modelMatrix to set
- * @param viewMatrix to set
- * @param projectionMatrix to set
- * @param modelViewMatrix to set
- * @param modelViewProjectionMatrix to set
- */
-inline void SetMatrices(
-                         const Dali::Matrix& modelMatrix,
-                         const Dali::Matrix& viewMatrix,
-                         const Dali::Matrix& projectionMatrix,
-                         const Dali::Matrix& modelViewMatrix )
-{
-
-}
-
-}
-
 namespace // unnamed namespace
 {
+#if defined(DEBUG_ENABLED)
+Debug::Filter* gVulkanFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_VULKAN_UNIFORMS");
+#endif
+
 
 const unsigned int UNIFORM_MAP_READY      = 0;
 const unsigned int COPY_UNIFORM_MAP       = 1;
@@ -134,11 +115,9 @@ Renderer* Renderer::New()
 
 Renderer::Renderer()
 : mGraphics( nullptr ),
-  mRenderDataProvider(),
   mTextureSet( NULL ),
   mGeometry( NULL ),
   mShader( NULL ),
-  mRenderDataProvider( NULL ),
   mBlendColor( NULL ),
   mStencilParameters( RenderMode::AUTO, StencilFunction::ALWAYS, 0xFF, 0x00, 0xFF, StencilOperation::KEEP, StencilOperation::KEEP, StencilOperation::KEEP ),
   mIndexedDrawFirstElement( 0u ),
@@ -186,23 +165,6 @@ void Renderer::Initialize( Integration::Graphics::Graphics& graphics )
   mGraphics = &graphics;
 
   mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
-
-  mRenderDataProvider = std::make_unique< RenderDataProvider >();
-
-  mRenderDataProvider->mUniformMapDataProvider = this;
-  mRenderDataProvider->mShader = mShader;
-
-  if( mTextureSet )
-  {
-    size_t textureCount = mTextureSet->GetTextureCount();
-    mRenderDataProvider->mTextures.resize( textureCount );
-    mRenderDataProvider->mSamplers.resize( textureCount );
-    for( unsigned int i(0); i<textureCount; ++i )
-    {
-      mRenderDataProvider->mTextures[i] = mTextureSet->GetTexture(i);
-      mRenderDataProvider->mSamplers[i] = mTextureSet->GetTextureSampler(i);
-    }
-  }
 }
 
 
@@ -215,11 +177,7 @@ void* AllocateUniformBufferMemory( size_t size )
 void Renderer::UpdateUniformMap( BufferIndex updateBufferIndex )
 {
 
-  if( mRegenerateUniformMap == UNIFORM_MAP_READY )
-  {
-    mUniformMapChanged[updateBufferIndex] = false;
-  }
-  else
+  if( mRegenerateUniformMap > UNIFORM_MAP_READY )
   {
     if( mRegenerateUniformMap == REGENERATE_UNIFORM_MAP)
     {
@@ -289,14 +247,13 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
     {
       // create binding per attribute
       auto binding = Graphics::API::RenderCommand::VertexAttributeBufferBinding{}
-        .SetOffset((vertexBuffer->GetFormat()
-                                ->components[i]).offset)
+        .SetOffset((vertexBuffer->GetFormat()->components[i]).offset)
         .SetBinding(bindingIndex)
         .SetBuffer(vertexBuffer->GetGfxObject())
         .SetInputAttributeRate(Graphics::API::RenderCommand::InputAttributeRate::PER_VERTEX)
         .SetLocation(locationIndex + i)
-        .SetStride(vertexBuffer->GetFormat()
-                               ->size);
+        .SetStride(vertexBuffer->GetFormat()->size);
+
       vertexAttributeBindings.emplace_back(binding);
     }
     locationIndex += attributeCountInForBuffer;
@@ -311,8 +268,7 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
 
   UpdateUniformMap(updateBufferIndex);
 
-  auto &shader = mShader->GetGfxObject()
-                        .Get();
+  auto &shader = mShader->GetGfxObject().Get();
   auto uboCount = shader.GetUniformBlockCount();
 
   auto pushConstantsBindings = Graphics::API::RenderCommand::NewPushConstantsBindings(uboCount);
@@ -331,7 +287,7 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
   {
     Graphics::API::ShaderDetails::UniformBlockInfo ubInfo;
 
-    std::cout << sizeof(ubInfo) << std::endl;
+    DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose, sizeof(ubInfo) );
 
     shader.GetUniformBlock(i, ubInfo);
 
@@ -363,7 +319,7 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
         auto arrayRightBracket = j->uniformName
                                   .find(']');
         arrayIndex = std::atoi(&uniformName.c_str()[arrayLeftBracket + 1]);
-        std::cout << "UNIFORM NAME: " << j->uniformName << ", index: " << arrayIndex << std::endl;
+        DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  "UNIFORM NAME: " << j->uniformName << ", index: " << arrayIndex );
         uniformName = uniformName.substr(0, arrayLeftBracket);
       }
 
@@ -379,8 +335,9 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
           case Property::Type::INTEGER:
           case Property::Type::BOOLEAN:
           {
-            std::cout << uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing 32bit offset: "
-                      << uniformInfo.offset << ", size: " << sizeof(float) << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing 32bit offset: "
+                   << uniformInfo.offset << ", size: " << sizeof(float) );
+
             dst += sizeof(float) * arrayIndex;
             memcpy(dst, &j->propertyPtr
                           ->GetFloat(updateBufferIndex), sizeof(float));
@@ -388,8 +345,8 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
           }
           case Property::Type::VECTOR2:
           {
-            std::cout << uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing vec2 offset: "
-                      << uniformInfo.offset << ", size: " << sizeof(Vector2) << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing vec2 offset: "
+                   << uniformInfo.offset << ", size: " << sizeof(Vector2) ) ;
             dst += /* sizeof(Vector2) * */arrayIndex * 16; // todo: use array stride from spirv
             memcpy(dst, &j->propertyPtr
                           ->GetVector2(updateBufferIndex), sizeof(Vector2));
@@ -397,8 +354,8 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
           }
           case Property::Type::VECTOR3:
           {
-            std::cout << uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing vec3 offset: "
-                      << uniformInfo.offset << ", size: " << sizeof(Vector3) << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing vec3 offset: "
+                   << uniformInfo.offset << ", size: " << sizeof(Vector3) );
             dst += sizeof(Vector3) * arrayIndex;
             memcpy(dst, &j->propertyPtr
                           ->GetVector3(updateBufferIndex), sizeof(Vector3));
@@ -406,8 +363,9 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
           }
           case Property::Type::VECTOR4:
           {
-            std::cout << uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing vec4 offset: "
-                      << uniformInfo.offset << ", size: " << sizeof(Vector4) << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing vec4 offset: "
+                   << uniformInfo.offset << ", size: " << sizeof(Vector4) );
+
             dst += sizeof(float) * arrayIndex;
             memcpy(dst, &j->propertyPtr
                           ->GetVector4(updateBufferIndex), sizeof(Vector4));
@@ -415,8 +373,8 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
           }
           case Property::Type::MATRIX:
           {
-            std::cout << uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing mat4 offset: "
-                      << uniformInfo.offset << ", size: " << sizeof(Matrix) << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing mat4 offset: "
+                   << uniformInfo.offset << ", size: " << sizeof(Matrix)  );
             dst += sizeof(Matrix) * arrayIndex;
             memcpy(dst, &j->propertyPtr
                           ->GetMatrix(updateBufferIndex), sizeof(Matrix));
@@ -424,8 +382,8 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
           }
           case Property::Type::MATRIX3:
           {
-            std::cout << uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing mat3 offset: "
-                      << uniformInfo.offset << ", size: " << sizeof(Matrix3) << std::endl;
+            DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  uniformInfo.name << ":[" << uniformInfo.bufferIndex << "]: " << "Writing mat3 offset: "
+                   << uniformInfo.offset << ", size: " << sizeof(Matrix3) );
             dst += sizeof(Matrix3) * arrayIndex;
             memcpy(dst, &j->propertyPtr
                           ->GetMatrix3(updateBufferIndex), sizeof(Matrix3));
@@ -522,7 +480,7 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
                                         .SetVertexCount(vb->GetElementCount())
                                         .SetInstanceCount(1u)));
   }
-  std::cout << "done\n";
+  DALI_LOG_STREAM( gVulkanFilter, Debug::Verbose,  "done\n" );
 }
 
 void Renderer::WriteUniform( const std::string& name, const void* data, uint32_t size )
@@ -549,8 +507,6 @@ void Renderer::SetTextures( TextureSet* textureSet )
   mTextureSet = textureSet;
   mTextureSet->AddObserver( this );
   mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
-
-  UpdateTextureSet();
 }
 
 void Renderer::SetShader( Shader* shader )
@@ -630,7 +586,7 @@ void Renderer::SetBlendColor( const Vector4& blendColor )
   }
 }
 
-Vector4 Renderer::GetBlendColor() const
+const Vector4& Renderer::GetBlendColor() const
 {
   if( mBlendColor )
   {
@@ -737,7 +693,9 @@ void Renderer::SetStencilOperationOnZFail( StencilOperation::Type stencilOperati
 void Renderer::SetStencilOperationOnZPass( StencilOperation::Type stencilOperationOnZPass )
 {
   mStencilParameters.stencilOperationOnZPass = stencilOperationOnZPass;
-const Render::Renderer::StencilParameters& Renderer::GetStencilParameters() const
+}
+
+const StencilParameters& Renderer::GetStencilParameters() const
 {
   return mStencilParameters;
 }
@@ -752,20 +710,6 @@ float Renderer::GetOpacity( BufferIndex updateBufferIndex ) const
   return mOpacity[updateBufferIndex];
 }
 
-  mRenderDataProvider = NULL;
-RenderDataProvider* Renderer::NewRenderDataProvider()
-  if( mRenderDataProvider )
-}
-
-const Vector4& Renderer::GetBlendColor() const
-{
-  if( mBlendColor )
-  {
-    return *mBlendColor;
-  }
-  return Color::TRANSPARENT;
-}
-
 const CollectedUniformMap& Renderer::GetUniformMap( BufferIndex bufferIndex ) const
 {
   return mCollectedUniformMap[bufferIndex];
index 2d06e7e..77179fe 100644 (file)
 
 #include <dali/public-api/rendering/geometry.h>
 #include <dali/public-api/rendering/renderer.h> // Dali::Renderer
+#include <dali/integration-api/graphics/graphics.h>
 #include <dali/internal/common/blending-options.h>
 #include <dali/internal/common/type-abstraction-enums.h>
 #include <dali/internal/event/common/event-thread-services.h>
+#include <dali/internal/update/common/animatable-property.h>
 #include <dali/internal/update/common/property-owner.h>
 #include <dali/internal/update/common/uniform-map.h>
 #include <dali/internal/update/common/scene-graph-connection-change-propagator.h>
-#include <dali/internal/update/common/animatable-property.h>
-#include <dali/internal/update/rendering/data-providers/render-data-provider.h>
+#include <dali/internal/update/rendering/data-providers/uniform-map-data-provider.h>
 #include <dali/internal/update/rendering/stencil-parameters.h>
 #include <dali/graphics-api/graphics-api-render-command.h>
 #include <dali/graphics-api/graphics-api-controller.h>
@@ -37,13 +38,12 @@ namespace Dali
 namespace Internal
 {
 
-
-
 namespace SceneGraph
 {
 class Geometry;
 class SceneController;
 class TextureSet;
+class Shader;
 
 class Renderer;
 typedef Dali::Vector< Renderer* > RendererContainer;
@@ -194,7 +194,7 @@ public:
    * Get the blending color
    * @return The blend color
    */
-  Vector4 GetBlendColor() const;
+  const Vector4& GetBlendColor() const;
 
   /**
    * Set the index of first element for indexed draw
@@ -320,7 +320,7 @@ public:
    * Gets the stencil parameters
    * @return The stencil parameters
    */
-  const Render::Renderer::StencilParameters& GetStencilParameters() const;
+  const StencilParameters& GetStencilParameters() const;
 
   /**
    * Bakes the opacity
@@ -441,11 +441,6 @@ private:
   Renderer();
 
   /**
-   * Update texture set to the render data provider
-   */
-  void UpdateTextureSet();
-
-  /**
    * Helper function to update the uniform map.
    */
   void UpdateUniformMap( BufferIndex updateBufferIndex );
@@ -454,12 +449,9 @@ private:
   Integration::Graphics::Graphics* mGraphics; ///< Graphics interface object
 
   CollectedUniformMap          mCollectedUniformMap[2];           ///< Uniform maps collected by the renderer
-
-  std::unique_ptr<RenderDataProvider> mRenderDataProvider;        ///< Contains data for graphics renderer @todo Refactor
   TextureSet*                  mTextureSet;                       ///< The texture set this renderer uses. (Not owned)
   SceneGraph::Geometry*        mGeometry;                         ///< The geometry this renderer uses. (Not owned)
   Shader*                      mShader;                           ///< The shader this renderer uses. (Not owned)
-  RenderDataProvider*          mRenderDataProvider;               ///< The render data provider
   OwnerPointer< Vector4 >      mBlendColor;                       ///< The blend color for blending operation
 
   StencilParameters            mStencilParameters;                ///< Struct containing all stencil related options
index c9d614b..dd200f9 100644 (file)
@@ -21,6 +21,7 @@
 #include <dali/internal/common/internal-constants.h>
 #include <dali/internal/common/memory-pool-object-allocator.h>
 #include <dali/internal/update/rendering/scene-graph-renderer.h>
+#include <dali/internal/update/rendering/scene-graph-texture.h>
 
 namespace //Unnamed namespace
 {