diff --git a/shaders/background.frag b/shaders/background.frag index e1ca705..1a4bea3 100644 --- a/shaders/background.frag +++ b/shaders/background.frag @@ -6,11 +6,14 @@ layout(location = 2) in vec2 fragPosition; layout(location = 0) out vec4 outColor; -layout(binding = 0) uniform UniformBufferObject { - float time; - vec2 resolution; - float rotation; - float wavePhase; +layout(binding = 0, std140) uniform UniformBufferObject { + float time; // offset 0 + float resX; // offset 4 + float resY; // offset 8 + float rotation; // offset 12 + float wavePhase; // offset 16 + float padding1; // offset 20 + float padding2; // offset 24 } ubo; void main() { @@ -36,3 +39,4 @@ void main() { outColor = vec4(finalColor, 1.0); } + diff --git a/shaders/background.vert b/shaders/background.vert index 8cd8961..10ceacd 100644 --- a/shaders/background.vert +++ b/shaders/background.vert @@ -8,11 +8,14 @@ layout(location = 0) out vec4 fragColor; layout(location = 1) out vec2 fragTexCoord; layout(location = 2) out vec2 fragPosition; -layout(binding = 0) uniform UniformBufferObject { - float time; - vec2 resolution; - float rotation; - float wavePhase; +layout(binding = 0, std140) uniform UniformBufferObject { + float time; // offset 0 + float resX; // offset 4 + float resY; // offset 8 + float rotation; // offset 12 + float wavePhase; // offset 16 + float padding1; // offset 20 + float padding2; // offset 24 } ubo; void main() { diff --git a/shaders/geometry.frag b/shaders/geometry.frag index e596551..feeab0f 100644 --- a/shaders/geometry.frag +++ b/shaders/geometry.frag @@ -5,11 +5,14 @@ layout(location = 1) in vec2 fragTexCoord; layout(location = 0) out vec4 outColor; -layout(binding = 0) uniform UniformBufferObject { - float time; - vec2 resolution; - float rotation; - float wavePhase; +layout(binding = 0, std140) uniform UniformBufferObject { + float time; // offset 0 + float resX; // offset 4 + float resY; // offset 8 + float rotation; // offset 12 + float wavePhase; // offset 16 + float padding1; // offset 20 + float padding2; // offset 24 } ubo; void main() { diff --git a/shaders/text.frag b/shaders/text.frag index f261870..f6eaeab 100644 --- a/shaders/text.frag +++ b/shaders/text.frag @@ -5,11 +5,14 @@ layout(location = 1) in vec2 fragTexCoord; layout(location = 0) out vec4 outColor; -layout(binding = 0) uniform UniformBufferObject { - float time; - vec2 resolution; - float rotation; - float wavePhase; +layout(binding = 0, std140) uniform UniformBufferObject { + float time; // offset 0 + float resX; // offset 4 + float resY; // offset 8 + float rotation; // offset 12 + float wavePhase; // offset 16 + float padding1; // offset 20 + float padding2; // offset 24 } ubo; layout(binding = 1) uniform sampler2D texSampler; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d87d614..43d333f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -63,6 +63,19 @@ MainWindow::MainWindow(QWidget *parent) connect(m_updateTimer, &QTimer::timeout, this, &MainWindow::updateStatusDisplay); m_updateTimer->start(100); // 每100ms更新一次状态显示 +#ifdef ENABLE_VULKAN_WIDGET + // 初始化Vulkan并默认启用渲染 + if (m_vulkanWidget) { + bool vulkanInitOk = m_vulkanWidget->initializeVulkan(); + if (vulkanInitOk) { + m_vulkanWidget->setRenderingEnabled(true); + qDebug() << "VulkanWidget initialized and rendering enabled by default"; + } else { + qDebug() << "Failed to initialize VulkanWidget:" << m_vulkanWidget->getLastError(); + } + } +#endif // ENABLE_VULKAN_WIDGET + // 初始化状态显示 updateStatusDisplay(); updateButtonStates(); @@ -96,7 +109,58 @@ void MainWindow::setupUI() m_tabWidget = new QTabWidget(this); m_mainLayout->addWidget(m_tabWidget, 1); - // ========== Tab 1: CustomWidget (QPainter) ========== +#ifdef ENABLE_VULKAN_WIDGET + // ========== Tab 1: VulkanWidget ========== + QWidget *vulkanTab = new QWidget(this); + QVBoxLayout *vulkanLayout = new QVBoxLayout(vulkanTab); + vulkanLayout->setSpacing(10); + vulkanLayout->setContentsMargins(10, 10, 10, 10); + + // 创建Vulkan渲染组件 + m_vulkanWidget = new VulkanWidget(this); + vulkanLayout->addWidget(m_vulkanWidget, 1); + + // 创建Vulkan控制面板 + m_vulkanControlGroup = new QGroupBox("Vulkan Control", this); + QHBoxLayout *vulkanControlLayout = new QHBoxLayout(m_vulkanControlGroup); + + m_enableVulkanBtn = new QPushButton("Enable Rendering", this); + m_disableVulkanBtn = new QPushButton("Disable Rendering", this); + m_resetVulkanFrameBtn = new QPushButton("Reset Frame Count", this); + + m_enableVulkanBtn->setMinimumHeight(35); + m_disableVulkanBtn->setMinimumHeight(35); + m_resetVulkanFrameBtn->setMinimumHeight(35); + + vulkanControlLayout->addWidget(m_enableVulkanBtn); + vulkanControlLayout->addWidget(m_disableVulkanBtn); + vulkanControlLayout->addWidget(m_resetVulkanFrameBtn); + vulkanControlLayout->addStretch(); + + vulkanLayout->addWidget(m_vulkanControlGroup); + + // 创建Vulkan状态显示面板 + m_vulkanStatusGroup = new QGroupBox("Vulkan Status Information", this); + QVBoxLayout *vulkanStatusLayout = new QVBoxLayout(m_vulkanStatusGroup); + + m_vulkanInitLabel = new QLabel("Vulkan Status: Not Initialized", this); + m_vulkanRenderStatusLabel = new QLabel("Rendering Status: Disabled", this); + m_vulkanFrameCountLabel = new QLabel("Frame Count: 0", this); + + m_vulkanInitLabel->setFont(statusFont); + m_vulkanRenderStatusLabel->setFont(statusFont); + m_vulkanFrameCountLabel->setFont(statusFont); + + vulkanStatusLayout->addWidget(m_vulkanInitLabel); + vulkanStatusLayout->addWidget(m_vulkanRenderStatusLabel); + vulkanStatusLayout->addWidget(m_vulkanFrameCountLabel); + + vulkanLayout->addWidget(m_vulkanStatusGroup); + + m_tabWidget->addTab(vulkanTab, "Vulkan Widget"); +#endif // ENABLE_VULKAN_WIDGET + + // ========== Tab 2: CustomWidget (QPainter) ========== QWidget *customTab = new QWidget(this); QVBoxLayout *customLayout = new QVBoxLayout(customTab); customLayout->setSpacing(10); @@ -147,57 +211,6 @@ void MainWindow::setupUI() customLayout->addWidget(m_statusGroup); m_tabWidget->addTab(customTab, "QPainter Widget"); - -#ifdef ENABLE_VULKAN_WIDGET - // ========== Tab 2: VulkanWidget ========== - QWidget *vulkanTab = new QWidget(this); - QVBoxLayout *vulkanLayout = new QVBoxLayout(vulkanTab); - vulkanLayout->setSpacing(10); - vulkanLayout->setContentsMargins(10, 10, 10, 10); - - // 创建Vulkan渲染组件 - m_vulkanWidget = new VulkanWidget(this); - vulkanLayout->addWidget(m_vulkanWidget, 1); - - // 创建Vulkan控制面板 - m_vulkanControlGroup = new QGroupBox("Vulkan Control", this); - QHBoxLayout *vulkanControlLayout = new QHBoxLayout(m_vulkanControlGroup); - - m_enableVulkanBtn = new QPushButton("Enable Rendering", this); - m_disableVulkanBtn = new QPushButton("Disable Rendering", this); - m_resetVulkanFrameBtn = new QPushButton("Reset Frame Count", this); - - m_enableVulkanBtn->setMinimumHeight(35); - m_disableVulkanBtn->setMinimumHeight(35); - m_resetVulkanFrameBtn->setMinimumHeight(35); - - vulkanControlLayout->addWidget(m_enableVulkanBtn); - vulkanControlLayout->addWidget(m_disableVulkanBtn); - vulkanControlLayout->addWidget(m_resetVulkanFrameBtn); - vulkanControlLayout->addStretch(); - - vulkanLayout->addWidget(m_vulkanControlGroup); - - // 创建Vulkan状态显示面板 - m_vulkanStatusGroup = new QGroupBox("Vulkan Status Information", this); - QVBoxLayout *vulkanStatusLayout = new QVBoxLayout(m_vulkanStatusGroup); - - m_vulkanInitLabel = new QLabel("Vulkan Status: Not Initialized", this); - m_vulkanRenderStatusLabel = new QLabel("Rendering Status: Disabled", this); - m_vulkanFrameCountLabel = new QLabel("Frame Count: 0", this); - - m_vulkanInitLabel->setFont(statusFont); - m_vulkanRenderStatusLabel->setFont(statusFont); - m_vulkanFrameCountLabel->setFont(statusFont); - - vulkanStatusLayout->addWidget(m_vulkanInitLabel); - vulkanStatusLayout->addWidget(m_vulkanRenderStatusLabel); - vulkanStatusLayout->addWidget(m_vulkanFrameCountLabel); - - vulkanLayout->addWidget(m_vulkanStatusGroup); - - m_tabWidget->addTab(vulkanTab, "Vulkan Widget"); -#endif // ENABLE_VULKAN_WIDGET } void MainWindow::setupConnections() diff --git a/src/shaders_spirv/background.frag.spv b/src/shaders_spirv/background.frag.spv index ea195c0..97bc552 100644 Binary files a/src/shaders_spirv/background.frag.spv and b/src/shaders_spirv/background.frag.spv differ diff --git a/src/shaders_spirv/background.vert.spv b/src/shaders_spirv/background.vert.spv index 4fb710d..dbdb8e3 100644 Binary files a/src/shaders_spirv/background.vert.spv and b/src/shaders_spirv/background.vert.spv differ diff --git a/src/shaders_spirv/background_frag.inc b/src/shaders_spirv/background_frag.inc index a4ad936..7be4a17 100644 --- a/src/shaders_spirv/background_frag.inc +++ b/src/shaders_spirv/background_frag.inc @@ -1,5 +1,5 @@ // Auto-generated from background.frag.spv -// Size: 2488 bytes (622 words) +// Size: 2624 bytes (656 words) 0x07230203u, 0x00010000u, 0x0008000bu, 0x00000061u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, 0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u, 0x0009000fu, 0x00000004u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x0000000bu, 0x00000058u, 0x0000005fu, @@ -7,9 +7,11 @@ 0x00000004u, 0x6e69616du, 0x00000000u, 0x00030005u, 0x00000009u, 0x00007675u, 0x00060005u, 0x0000000bu, 0x67617266u, 0x69736f50u, 0x6e6f6974u, 0x00000000u, 0x00030005u, 0x00000013u, 0x00000074u, 0x00070005u, 0x00000014u, 0x66696e55u, 0x426d726fu, 0x65666675u, 0x6a624f72u, 0x00746365u, 0x00050006u, 0x00000014u, - 0x00000000u, 0x656d6974u, 0x00000000u, 0x00060006u, 0x00000014u, 0x00000001u, 0x6f736572u, 0x6974756cu, - 0x00006e6fu, 0x00060006u, 0x00000014u, 0x00000002u, 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, - 0x00000014u, 0x00000003u, 0x65766177u, 0x73616850u, 0x00000065u, 0x00030005u, 0x00000016u, 0x006f6275u, + 0x00000000u, 0x656d6974u, 0x00000000u, 0x00050006u, 0x00000014u, 0x00000001u, 0x58736572u, 0x00000000u, + 0x00050006u, 0x00000014u, 0x00000002u, 0x59736572u, 0x00000000u, 0x00060006u, 0x00000014u, 0x00000003u, + 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000014u, 0x00000004u, 0x65766177u, 0x73616850u, + 0x00000065u, 0x00060006u, 0x00000014u, 0x00000005u, 0x64646170u, 0x31676e69u, 0x00000000u, 0x00060006u, + 0x00000014u, 0x00000006u, 0x64646170u, 0x32676e69u, 0x00000000u, 0x00030005u, 0x00000016u, 0x006f6275u, 0x00030005u, 0x0000001eu, 0x00000072u, 0x00030005u, 0x00000027u, 0x00000067u, 0x00030005u, 0x00000030u, 0x00000062u, 0x00040005u, 0x0000003cu, 0x6f6c6f63u, 0x00003172u, 0x00040005u, 0x00000041u, 0x6f6c6f63u, 0x00003272u, 0x00050005u, 0x00000045u, 0x64617267u, 0x746e6569u, 0x00000000u, 0x00050005u, 0x00000050u, @@ -17,64 +19,66 @@ 0x00050005u, 0x0000005fu, 0x67617266u, 0x6f6c6f43u, 0x00000072u, 0x00060005u, 0x00000060u, 0x67617266u, 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00040047u, 0x0000000bu, 0x0000001eu, 0x00000002u, 0x00050048u, 0x00000014u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000014u, 0x00000001u, 0x00000023u, - 0x00000008u, 0x00050048u, 0x00000014u, 0x00000002u, 0x00000023u, 0x00000010u, 0x00050048u, 0x00000014u, - 0x00000003u, 0x00000023u, 0x00000014u, 0x00030047u, 0x00000014u, 0x00000002u, 0x00040047u, 0x00000016u, - 0x00000022u, 0x00000000u, 0x00040047u, 0x00000016u, 0x00000021u, 0x00000000u, 0x00040047u, 0x00000058u, - 0x0000001eu, 0x00000000u, 0x00040047u, 0x0000005fu, 0x0000001eu, 0x00000000u, 0x00040047u, 0x00000060u, - 0x0000001eu, 0x00000001u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, 0x00000002u, 0x00030016u, - 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, 0x00000002u, 0x00040020u, 0x00000008u, - 0x00000007u, 0x00000007u, 0x00040020u, 0x0000000au, 0x00000001u, 0x00000007u, 0x0004003bu, 0x0000000au, - 0x0000000bu, 0x00000001u, 0x0004002bu, 0x00000006u, 0x0000000du, 0x3f800000u, 0x0004002bu, 0x00000006u, - 0x00000010u, 0x3f000000u, 0x00040020u, 0x00000012u, 0x00000007u, 0x00000006u, 0x0006001eu, 0x00000014u, - 0x00000006u, 0x00000007u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000015u, 0x00000002u, 0x00000014u, - 0x0004003bu, 0x00000015u, 0x00000016u, 0x00000002u, 0x00040015u, 0x00000017u, 0x00000020u, 0x00000001u, - 0x0004002bu, 0x00000017u, 0x00000018u, 0x00000000u, 0x00040020u, 0x00000019u, 0x00000002u, 0x00000006u, - 0x0004002bu, 0x00000006u, 0x0000001cu, 0x43b40000u, 0x0004002bu, 0x00000006u, 0x0000001fu, 0x3ec8b439u, - 0x0004002bu, 0x00000006u, 0x00000020u, 0x3e48b439u, 0x0004002bu, 0x00000006u, 0x00000022u, 0x40c90fd0u, - 0x0004002bu, 0x00000006u, 0x00000028u, 0x3f16872bu, 0x0004002bu, 0x00000006u, 0x0000002bu, 0x3f860419u, - 0x0004002bu, 0x00000006u, 0x00000031u, 0x3f48b439u, 0x0004002bu, 0x00000006u, 0x00000032u, 0x3e5d2f1bu, - 0x0004002bu, 0x00000006u, 0x00000035u, 0x40060419u, 0x00040017u, 0x0000003au, 0x00000006u, 0x00000003u, - 0x00040020u, 0x0000003bu, 0x00000007u, 0x0000003au, 0x0004002bu, 0x00000006u, 0x00000042u, 0x3df1a9fcu, - 0x0004002bu, 0x00000006u, 0x00000043u, 0x3e70a3d7u, 0x0006002cu, 0x0000003au, 0x00000044u, 0x00000042u, - 0x00000042u, 0x00000043u, 0x00040015u, 0x00000046u, 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000046u, - 0x00000047u, 0x00000000u, 0x0004002bu, 0x00000046u, 0x0000004bu, 0x00000001u, 0x00040017u, 0x00000056u, - 0x00000006u, 0x00000004u, 0x00040020u, 0x00000057u, 0x00000003u, 0x00000056u, 0x0004003bu, 0x00000057u, - 0x00000058u, 0x00000003u, 0x00040020u, 0x0000005eu, 0x00000001u, 0x00000056u, 0x0004003bu, 0x0000005eu, - 0x0000005fu, 0x00000001u, 0x0004003bu, 0x0000000au, 0x00000060u, 0x00000001u, 0x00050036u, 0x00000002u, - 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, 0x00000008u, 0x00000009u, - 0x00000007u, 0x0004003bu, 0x00000012u, 0x00000013u, 0x00000007u, 0x0004003bu, 0x00000012u, 0x0000001eu, - 0x00000007u, 0x0004003bu, 0x00000012u, 0x00000027u, 0x00000007u, 0x0004003bu, 0x00000012u, 0x00000030u, - 0x00000007u, 0x0004003bu, 0x0000003bu, 0x0000003cu, 0x00000007u, 0x0004003bu, 0x0000003bu, 0x00000041u, - 0x00000007u, 0x0004003bu, 0x00000012u, 0x00000045u, 0x00000007u, 0x0004003bu, 0x0000003bu, 0x00000050u, - 0x00000007u, 0x0004003du, 0x00000007u, 0x0000000cu, 0x0000000bu, 0x00050050u, 0x00000007u, 0x0000000eu, - 0x0000000du, 0x0000000du, 0x00050081u, 0x00000007u, 0x0000000fu, 0x0000000cu, 0x0000000eu, 0x0005008eu, - 0x00000007u, 0x00000011u, 0x0000000fu, 0x00000010u, 0x0003003eu, 0x00000009u, 0x00000011u, 0x00050041u, - 0x00000019u, 0x0000001au, 0x00000016u, 0x00000018u, 0x0004003du, 0x00000006u, 0x0000001bu, 0x0000001au, - 0x00050088u, 0x00000006u, 0x0000001du, 0x0000001bu, 0x0000001cu, 0x0003003eu, 0x00000013u, 0x0000001du, - 0x0004003du, 0x00000006u, 0x00000021u, 0x00000013u, 0x00050085u, 0x00000006u, 0x00000023u, 0x00000021u, - 0x00000022u, 0x0006000cu, 0x00000006u, 0x00000024u, 0x00000001u, 0x0000000du, 0x00000023u, 0x00050085u, - 0x00000006u, 0x00000025u, 0x00000020u, 0x00000024u, 0x00050081u, 0x00000006u, 0x00000026u, 0x0000001fu, - 0x00000025u, 0x0003003eu, 0x0000001eu, 0x00000026u, 0x0004003du, 0x00000006u, 0x00000029u, 0x00000013u, - 0x00050085u, 0x00000006u, 0x0000002au, 0x00000029u, 0x00000022u, 0x00050081u, 0x00000006u, 0x0000002cu, - 0x0000002au, 0x0000002bu, 0x0006000cu, 0x00000006u, 0x0000002du, 0x00000001u, 0x0000000du, 0x0000002cu, - 0x00050085u, 0x00000006u, 0x0000002eu, 0x00000020u, 0x0000002du, 0x00050081u, 0x00000006u, 0x0000002fu, - 0x00000028u, 0x0000002eu, 0x0003003eu, 0x00000027u, 0x0000002fu, 0x0004003du, 0x00000006u, 0x00000033u, - 0x00000013u, 0x00050085u, 0x00000006u, 0x00000034u, 0x00000033u, 0x00000022u, 0x00050081u, 0x00000006u, - 0x00000036u, 0x00000034u, 0x00000035u, 0x0006000cu, 0x00000006u, 0x00000037u, 0x00000001u, 0x0000000du, - 0x00000036u, 0x00050085u, 0x00000006u, 0x00000038u, 0x00000032u, 0x00000037u, 0x00050081u, 0x00000006u, - 0x00000039u, 0x00000031u, 0x00000038u, 0x0003003eu, 0x00000030u, 0x00000039u, 0x0004003du, 0x00000006u, - 0x0000003du, 0x0000001eu, 0x0004003du, 0x00000006u, 0x0000003eu, 0x00000027u, 0x0004003du, 0x00000006u, - 0x0000003fu, 0x00000030u, 0x00060050u, 0x0000003au, 0x00000040u, 0x0000003du, 0x0000003eu, 0x0000003fu, - 0x0003003eu, 0x0000003cu, 0x00000040u, 0x0003003eu, 0x00000041u, 0x00000044u, 0x00050041u, 0x00000012u, - 0x00000048u, 0x00000009u, 0x00000047u, 0x0004003du, 0x00000006u, 0x00000049u, 0x00000048u, 0x00050085u, - 0x00000006u, 0x0000004au, 0x00000049u, 0x00000010u, 0x00050041u, 0x00000012u, 0x0000004cu, 0x00000009u, - 0x0000004bu, 0x0004003du, 0x00000006u, 0x0000004du, 0x0000004cu, 0x00050085u, 0x00000006u, 0x0000004eu, - 0x0000004du, 0x00000010u, 0x00050081u, 0x00000006u, 0x0000004fu, 0x0000004au, 0x0000004eu, 0x0003003eu, - 0x00000045u, 0x0000004fu, 0x0004003du, 0x0000003au, 0x00000051u, 0x0000003cu, 0x0004003du, 0x0000003au, - 0x00000052u, 0x00000041u, 0x0004003du, 0x00000006u, 0x00000053u, 0x00000045u, 0x00060050u, 0x0000003au, - 0x00000054u, 0x00000053u, 0x00000053u, 0x00000053u, 0x0008000cu, 0x0000003au, 0x00000055u, 0x00000001u, - 0x0000002eu, 0x00000051u, 0x00000052u, 0x00000054u, 0x0003003eu, 0x00000050u, 0x00000055u, 0x0004003du, - 0x0000003au, 0x00000059u, 0x00000050u, 0x00050051u, 0x00000006u, 0x0000005au, 0x00000059u, 0x00000000u, - 0x00050051u, 0x00000006u, 0x0000005bu, 0x00000059u, 0x00000001u, 0x00050051u, 0x00000006u, 0x0000005cu, - 0x00000059u, 0x00000002u, 0x00070050u, 0x00000056u, 0x0000005du, 0x0000005au, 0x0000005bu, 0x0000005cu, - 0x0000000du, 0x0003003eu, 0x00000058u, 0x0000005du, 0x000100fdu, 0x00010038u + 0x00000004u, 0x00050048u, 0x00000014u, 0x00000002u, 0x00000023u, 0x00000008u, 0x00050048u, 0x00000014u, + 0x00000003u, 0x00000023u, 0x0000000cu, 0x00050048u, 0x00000014u, 0x00000004u, 0x00000023u, 0x00000010u, + 0x00050048u, 0x00000014u, 0x00000005u, 0x00000023u, 0x00000014u, 0x00050048u, 0x00000014u, 0x00000006u, + 0x00000023u, 0x00000018u, 0x00030047u, 0x00000014u, 0x00000002u, 0x00040047u, 0x00000016u, 0x00000022u, + 0x00000000u, 0x00040047u, 0x00000016u, 0x00000021u, 0x00000000u, 0x00040047u, 0x00000058u, 0x0000001eu, + 0x00000000u, 0x00040047u, 0x0000005fu, 0x0000001eu, 0x00000000u, 0x00040047u, 0x00000060u, 0x0000001eu, + 0x00000001u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, + 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, 0x00000002u, 0x00040020u, 0x00000008u, 0x00000007u, + 0x00000007u, 0x00040020u, 0x0000000au, 0x00000001u, 0x00000007u, 0x0004003bu, 0x0000000au, 0x0000000bu, + 0x00000001u, 0x0004002bu, 0x00000006u, 0x0000000du, 0x3f800000u, 0x0004002bu, 0x00000006u, 0x00000010u, + 0x3f000000u, 0x00040020u, 0x00000012u, 0x00000007u, 0x00000006u, 0x0009001eu, 0x00000014u, 0x00000006u, + 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000015u, + 0x00000002u, 0x00000014u, 0x0004003bu, 0x00000015u, 0x00000016u, 0x00000002u, 0x00040015u, 0x00000017u, + 0x00000020u, 0x00000001u, 0x0004002bu, 0x00000017u, 0x00000018u, 0x00000000u, 0x00040020u, 0x00000019u, + 0x00000002u, 0x00000006u, 0x0004002bu, 0x00000006u, 0x0000001cu, 0x43b40000u, 0x0004002bu, 0x00000006u, + 0x0000001fu, 0x3ec8b439u, 0x0004002bu, 0x00000006u, 0x00000020u, 0x3e48b439u, 0x0004002bu, 0x00000006u, + 0x00000022u, 0x40c90fd0u, 0x0004002bu, 0x00000006u, 0x00000028u, 0x3f16872bu, 0x0004002bu, 0x00000006u, + 0x0000002bu, 0x3f860419u, 0x0004002bu, 0x00000006u, 0x00000031u, 0x3f48b439u, 0x0004002bu, 0x00000006u, + 0x00000032u, 0x3e5d2f1bu, 0x0004002bu, 0x00000006u, 0x00000035u, 0x40060419u, 0x00040017u, 0x0000003au, + 0x00000006u, 0x00000003u, 0x00040020u, 0x0000003bu, 0x00000007u, 0x0000003au, 0x0004002bu, 0x00000006u, + 0x00000042u, 0x3df1a9fcu, 0x0004002bu, 0x00000006u, 0x00000043u, 0x3e70a3d7u, 0x0006002cu, 0x0000003au, + 0x00000044u, 0x00000042u, 0x00000042u, 0x00000043u, 0x00040015u, 0x00000046u, 0x00000020u, 0x00000000u, + 0x0004002bu, 0x00000046u, 0x00000047u, 0x00000000u, 0x0004002bu, 0x00000046u, 0x0000004bu, 0x00000001u, + 0x00040017u, 0x00000056u, 0x00000006u, 0x00000004u, 0x00040020u, 0x00000057u, 0x00000003u, 0x00000056u, + 0x0004003bu, 0x00000057u, 0x00000058u, 0x00000003u, 0x00040020u, 0x0000005eu, 0x00000001u, 0x00000056u, + 0x0004003bu, 0x0000005eu, 0x0000005fu, 0x00000001u, 0x0004003bu, 0x0000000au, 0x00000060u, 0x00000001u, + 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, + 0x00000008u, 0x00000009u, 0x00000007u, 0x0004003bu, 0x00000012u, 0x00000013u, 0x00000007u, 0x0004003bu, + 0x00000012u, 0x0000001eu, 0x00000007u, 0x0004003bu, 0x00000012u, 0x00000027u, 0x00000007u, 0x0004003bu, + 0x00000012u, 0x00000030u, 0x00000007u, 0x0004003bu, 0x0000003bu, 0x0000003cu, 0x00000007u, 0x0004003bu, + 0x0000003bu, 0x00000041u, 0x00000007u, 0x0004003bu, 0x00000012u, 0x00000045u, 0x00000007u, 0x0004003bu, + 0x0000003bu, 0x00000050u, 0x00000007u, 0x0004003du, 0x00000007u, 0x0000000cu, 0x0000000bu, 0x00050050u, + 0x00000007u, 0x0000000eu, 0x0000000du, 0x0000000du, 0x00050081u, 0x00000007u, 0x0000000fu, 0x0000000cu, + 0x0000000eu, 0x0005008eu, 0x00000007u, 0x00000011u, 0x0000000fu, 0x00000010u, 0x0003003eu, 0x00000009u, + 0x00000011u, 0x00050041u, 0x00000019u, 0x0000001au, 0x00000016u, 0x00000018u, 0x0004003du, 0x00000006u, + 0x0000001bu, 0x0000001au, 0x00050088u, 0x00000006u, 0x0000001du, 0x0000001bu, 0x0000001cu, 0x0003003eu, + 0x00000013u, 0x0000001du, 0x0004003du, 0x00000006u, 0x00000021u, 0x00000013u, 0x00050085u, 0x00000006u, + 0x00000023u, 0x00000021u, 0x00000022u, 0x0006000cu, 0x00000006u, 0x00000024u, 0x00000001u, 0x0000000du, + 0x00000023u, 0x00050085u, 0x00000006u, 0x00000025u, 0x00000020u, 0x00000024u, 0x00050081u, 0x00000006u, + 0x00000026u, 0x0000001fu, 0x00000025u, 0x0003003eu, 0x0000001eu, 0x00000026u, 0x0004003du, 0x00000006u, + 0x00000029u, 0x00000013u, 0x00050085u, 0x00000006u, 0x0000002au, 0x00000029u, 0x00000022u, 0x00050081u, + 0x00000006u, 0x0000002cu, 0x0000002au, 0x0000002bu, 0x0006000cu, 0x00000006u, 0x0000002du, 0x00000001u, + 0x0000000du, 0x0000002cu, 0x00050085u, 0x00000006u, 0x0000002eu, 0x00000020u, 0x0000002du, 0x00050081u, + 0x00000006u, 0x0000002fu, 0x00000028u, 0x0000002eu, 0x0003003eu, 0x00000027u, 0x0000002fu, 0x0004003du, + 0x00000006u, 0x00000033u, 0x00000013u, 0x00050085u, 0x00000006u, 0x00000034u, 0x00000033u, 0x00000022u, + 0x00050081u, 0x00000006u, 0x00000036u, 0x00000034u, 0x00000035u, 0x0006000cu, 0x00000006u, 0x00000037u, + 0x00000001u, 0x0000000du, 0x00000036u, 0x00050085u, 0x00000006u, 0x00000038u, 0x00000032u, 0x00000037u, + 0x00050081u, 0x00000006u, 0x00000039u, 0x00000031u, 0x00000038u, 0x0003003eu, 0x00000030u, 0x00000039u, + 0x0004003du, 0x00000006u, 0x0000003du, 0x0000001eu, 0x0004003du, 0x00000006u, 0x0000003eu, 0x00000027u, + 0x0004003du, 0x00000006u, 0x0000003fu, 0x00000030u, 0x00060050u, 0x0000003au, 0x00000040u, 0x0000003du, + 0x0000003eu, 0x0000003fu, 0x0003003eu, 0x0000003cu, 0x00000040u, 0x0003003eu, 0x00000041u, 0x00000044u, + 0x00050041u, 0x00000012u, 0x00000048u, 0x00000009u, 0x00000047u, 0x0004003du, 0x00000006u, 0x00000049u, + 0x00000048u, 0x00050085u, 0x00000006u, 0x0000004au, 0x00000049u, 0x00000010u, 0x00050041u, 0x00000012u, + 0x0000004cu, 0x00000009u, 0x0000004bu, 0x0004003du, 0x00000006u, 0x0000004du, 0x0000004cu, 0x00050085u, + 0x00000006u, 0x0000004eu, 0x0000004du, 0x00000010u, 0x00050081u, 0x00000006u, 0x0000004fu, 0x0000004au, + 0x0000004eu, 0x0003003eu, 0x00000045u, 0x0000004fu, 0x0004003du, 0x0000003au, 0x00000051u, 0x0000003cu, + 0x0004003du, 0x0000003au, 0x00000052u, 0x00000041u, 0x0004003du, 0x00000006u, 0x00000053u, 0x00000045u, + 0x00060050u, 0x0000003au, 0x00000054u, 0x00000053u, 0x00000053u, 0x00000053u, 0x0008000cu, 0x0000003au, + 0x00000055u, 0x00000001u, 0x0000002eu, 0x00000051u, 0x00000052u, 0x00000054u, 0x0003003eu, 0x00000050u, + 0x00000055u, 0x0004003du, 0x0000003au, 0x00000059u, 0x00000050u, 0x00050051u, 0x00000006u, 0x0000005au, + 0x00000059u, 0x00000000u, 0x00050051u, 0x00000006u, 0x0000005bu, 0x00000059u, 0x00000001u, 0x00050051u, + 0x00000006u, 0x0000005cu, 0x00000059u, 0x00000002u, 0x00070050u, 0x00000056u, 0x0000005du, 0x0000005au, + 0x0000005bu, 0x0000005cu, 0x0000000du, 0x0003003eu, 0x00000058u, 0x0000005du, 0x000100fdu, 0x00010038u diff --git a/src/shaders_spirv/background_vert.inc b/src/shaders_spirv/background_vert.inc index daf5343..1c23299 100644 --- a/src/shaders_spirv/background_vert.inc +++ b/src/shaders_spirv/background_vert.inc @@ -1,5 +1,5 @@ // Auto-generated from background.vert.spv -// Size: 1536 bytes (384 words) +// Size: 1672 bytes (418 words) 0x07230203u, 0x00010000u, 0x0008000bu, 0x00000028u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, 0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u, 0x000c000fu, 0x00000000u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x0000000du, 0x00000012u, 0x0000001bu, @@ -14,37 +14,42 @@ 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00050005u, 0x00000021u, 0x65546e69u, 0x6f6f4378u, 0x00006472u, 0x00060005u, 0x00000023u, 0x67617266u, 0x69736f50u, 0x6e6f6974u, 0x00000000u, 0x00070005u, 0x00000025u, 0x66696e55u, 0x426d726fu, 0x65666675u, 0x6a624f72u, 0x00746365u, 0x00050006u, 0x00000025u, 0x00000000u, - 0x656d6974u, 0x00000000u, 0x00060006u, 0x00000025u, 0x00000001u, 0x6f736572u, 0x6974756cu, 0x00006e6fu, - 0x00060006u, 0x00000025u, 0x00000002u, 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000025u, - 0x00000003u, 0x65766177u, 0x73616850u, 0x00000065u, 0x00030005u, 0x00000027u, 0x006f6275u, 0x00050048u, + 0x656d6974u, 0x00000000u, 0x00050006u, 0x00000025u, 0x00000001u, 0x58736572u, 0x00000000u, 0x00050006u, + 0x00000025u, 0x00000002u, 0x59736572u, 0x00000000u, 0x00060006u, 0x00000025u, 0x00000003u, 0x61746f72u, + 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000025u, 0x00000004u, 0x65766177u, 0x73616850u, 0x00000065u, + 0x00060006u, 0x00000025u, 0x00000005u, 0x64646170u, 0x31676e69u, 0x00000000u, 0x00060006u, 0x00000025u, + 0x00000006u, 0x64646170u, 0x32676e69u, 0x00000000u, 0x00030005u, 0x00000027u, 0x006f6275u, 0x00050048u, 0x0000000bu, 0x00000000u, 0x0000000bu, 0x00000000u, 0x00050048u, 0x0000000bu, 0x00000001u, 0x0000000bu, 0x00000001u, 0x00050048u, 0x0000000bu, 0x00000002u, 0x0000000bu, 0x00000003u, 0x00050048u, 0x0000000bu, 0x00000003u, 0x0000000bu, 0x00000004u, 0x00030047u, 0x0000000bu, 0x00000002u, 0x00040047u, 0x00000012u, 0x0000001eu, 0x00000000u, 0x00040047u, 0x0000001bu, 0x0000001eu, 0x00000000u, 0x00040047u, 0x0000001du, 0x0000001eu, 0x00000001u, 0x00040047u, 0x00000020u, 0x0000001eu, 0x00000001u, 0x00040047u, 0x00000021u, 0x0000001eu, 0x00000002u, 0x00040047u, 0x00000023u, 0x0000001eu, 0x00000002u, 0x00050048u, 0x00000025u, - 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000025u, 0x00000001u, 0x00000023u, 0x00000008u, - 0x00050048u, 0x00000025u, 0x00000002u, 0x00000023u, 0x00000010u, 0x00050048u, 0x00000025u, 0x00000003u, - 0x00000023u, 0x00000014u, 0x00030047u, 0x00000025u, 0x00000002u, 0x00040047u, 0x00000027u, 0x00000022u, - 0x00000000u, 0x00040047u, 0x00000027u, 0x00000021u, 0x00000000u, 0x00020013u, 0x00000002u, 0x00030021u, - 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, - 0x00000004u, 0x00040015u, 0x00000008u, 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000008u, 0x00000009u, - 0x00000001u, 0x0004001cu, 0x0000000au, 0x00000006u, 0x00000009u, 0x0006001eu, 0x0000000bu, 0x00000007u, - 0x00000006u, 0x0000000au, 0x0000000au, 0x00040020u, 0x0000000cu, 0x00000003u, 0x0000000bu, 0x0004003bu, - 0x0000000cu, 0x0000000du, 0x00000003u, 0x00040015u, 0x0000000eu, 0x00000020u, 0x00000001u, 0x0004002bu, - 0x0000000eu, 0x0000000fu, 0x00000000u, 0x00040017u, 0x00000010u, 0x00000006u, 0x00000002u, 0x00040020u, - 0x00000011u, 0x00000001u, 0x00000010u, 0x0004003bu, 0x00000011u, 0x00000012u, 0x00000001u, 0x0004002bu, - 0x00000006u, 0x00000014u, 0x00000000u, 0x0004002bu, 0x00000006u, 0x00000015u, 0x3f800000u, 0x00040020u, - 0x00000019u, 0x00000003u, 0x00000007u, 0x0004003bu, 0x00000019u, 0x0000001bu, 0x00000003u, 0x00040020u, - 0x0000001cu, 0x00000001u, 0x00000007u, 0x0004003bu, 0x0000001cu, 0x0000001du, 0x00000001u, 0x00040020u, - 0x0000001fu, 0x00000003u, 0x00000010u, 0x0004003bu, 0x0000001fu, 0x00000020u, 0x00000003u, 0x0004003bu, - 0x00000011u, 0x00000021u, 0x00000001u, 0x0004003bu, 0x0000001fu, 0x00000023u, 0x00000003u, 0x0006001eu, - 0x00000025u, 0x00000006u, 0x00000010u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000026u, 0x00000002u, - 0x00000025u, 0x0004003bu, 0x00000026u, 0x00000027u, 0x00000002u, 0x00050036u, 0x00000002u, 0x00000004u, - 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003du, 0x00000010u, 0x00000013u, 0x00000012u, - 0x00050051u, 0x00000006u, 0x00000016u, 0x00000013u, 0x00000000u, 0x00050051u, 0x00000006u, 0x00000017u, - 0x00000013u, 0x00000001u, 0x00070050u, 0x00000007u, 0x00000018u, 0x00000016u, 0x00000017u, 0x00000014u, - 0x00000015u, 0x00050041u, 0x00000019u, 0x0000001au, 0x0000000du, 0x0000000fu, 0x0003003eu, 0x0000001au, - 0x00000018u, 0x0004003du, 0x00000007u, 0x0000001eu, 0x0000001du, 0x0003003eu, 0x0000001bu, 0x0000001eu, - 0x0004003du, 0x00000010u, 0x00000022u, 0x00000021u, 0x0003003eu, 0x00000020u, 0x00000022u, 0x0004003du, - 0x00000010u, 0x00000024u, 0x00000012u, 0x0003003eu, 0x00000023u, 0x00000024u, 0x000100fdu, 0x00010038u + 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000025u, 0x00000001u, 0x00000023u, 0x00000004u, + 0x00050048u, 0x00000025u, 0x00000002u, 0x00000023u, 0x00000008u, 0x00050048u, 0x00000025u, 0x00000003u, + 0x00000023u, 0x0000000cu, 0x00050048u, 0x00000025u, 0x00000004u, 0x00000023u, 0x00000010u, 0x00050048u, + 0x00000025u, 0x00000005u, 0x00000023u, 0x00000014u, 0x00050048u, 0x00000025u, 0x00000006u, 0x00000023u, + 0x00000018u, 0x00030047u, 0x00000025u, 0x00000002u, 0x00040047u, 0x00000027u, 0x00000022u, 0x00000000u, + 0x00040047u, 0x00000027u, 0x00000021u, 0x00000000u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, + 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, 0x00000004u, + 0x00040015u, 0x00000008u, 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000008u, 0x00000009u, 0x00000001u, + 0x0004001cu, 0x0000000au, 0x00000006u, 0x00000009u, 0x0006001eu, 0x0000000bu, 0x00000007u, 0x00000006u, + 0x0000000au, 0x0000000au, 0x00040020u, 0x0000000cu, 0x00000003u, 0x0000000bu, 0x0004003bu, 0x0000000cu, + 0x0000000du, 0x00000003u, 0x00040015u, 0x0000000eu, 0x00000020u, 0x00000001u, 0x0004002bu, 0x0000000eu, + 0x0000000fu, 0x00000000u, 0x00040017u, 0x00000010u, 0x00000006u, 0x00000002u, 0x00040020u, 0x00000011u, + 0x00000001u, 0x00000010u, 0x0004003bu, 0x00000011u, 0x00000012u, 0x00000001u, 0x0004002bu, 0x00000006u, + 0x00000014u, 0x00000000u, 0x0004002bu, 0x00000006u, 0x00000015u, 0x3f800000u, 0x00040020u, 0x00000019u, + 0x00000003u, 0x00000007u, 0x0004003bu, 0x00000019u, 0x0000001bu, 0x00000003u, 0x00040020u, 0x0000001cu, + 0x00000001u, 0x00000007u, 0x0004003bu, 0x0000001cu, 0x0000001du, 0x00000001u, 0x00040020u, 0x0000001fu, + 0x00000003u, 0x00000010u, 0x0004003bu, 0x0000001fu, 0x00000020u, 0x00000003u, 0x0004003bu, 0x00000011u, + 0x00000021u, 0x00000001u, 0x0004003bu, 0x0000001fu, 0x00000023u, 0x00000003u, 0x0009001eu, 0x00000025u, + 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00040020u, + 0x00000026u, 0x00000002u, 0x00000025u, 0x0004003bu, 0x00000026u, 0x00000027u, 0x00000002u, 0x00050036u, + 0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003du, 0x00000010u, + 0x00000013u, 0x00000012u, 0x00050051u, 0x00000006u, 0x00000016u, 0x00000013u, 0x00000000u, 0x00050051u, + 0x00000006u, 0x00000017u, 0x00000013u, 0x00000001u, 0x00070050u, 0x00000007u, 0x00000018u, 0x00000016u, + 0x00000017u, 0x00000014u, 0x00000015u, 0x00050041u, 0x00000019u, 0x0000001au, 0x0000000du, 0x0000000fu, + 0x0003003eu, 0x0000001au, 0x00000018u, 0x0004003du, 0x00000007u, 0x0000001eu, 0x0000001du, 0x0003003eu, + 0x0000001bu, 0x0000001eu, 0x0004003du, 0x00000010u, 0x00000022u, 0x00000021u, 0x0003003eu, 0x00000020u, + 0x00000022u, 0x0004003du, 0x00000010u, 0x00000024u, 0x00000012u, 0x0003003eu, 0x00000023u, 0x00000024u, + 0x000100fdu, 0x00010038u diff --git a/src/shaders_spirv/geometry.frag.spv b/src/shaders_spirv/geometry.frag.spv index 42b7c9e..73e8665 100644 Binary files a/src/shaders_spirv/geometry.frag.spv and b/src/shaders_spirv/geometry.frag.spv differ diff --git a/src/shaders_spirv/geometry_frag.inc b/src/shaders_spirv/geometry_frag.inc index c7412a7..ee5898c 100644 --- a/src/shaders_spirv/geometry_frag.inc +++ b/src/shaders_spirv/geometry_frag.inc @@ -1,5 +1,5 @@ // Auto-generated from geometry.frag.spv -// Size: 784 bytes (196 words) +// Size: 920 bytes (230 words) 0x07230203u, 0x00010000u, 0x0008000bu, 0x00000013u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, 0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u, 0x0008000fu, 0x00000004u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x00000009u, 0x0000000bu, 0x0000000fu, @@ -7,21 +7,25 @@ 0x6e69616du, 0x00000000u, 0x00050005u, 0x00000009u, 0x4374756fu, 0x726f6c6fu, 0x00000000u, 0x00050005u, 0x0000000bu, 0x67617266u, 0x6f6c6f43u, 0x00000072u, 0x00060005u, 0x0000000fu, 0x67617266u, 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00070005u, 0x00000010u, 0x66696e55u, 0x426d726fu, 0x65666675u, 0x6a624f72u, - 0x00746365u, 0x00050006u, 0x00000010u, 0x00000000u, 0x656d6974u, 0x00000000u, 0x00060006u, 0x00000010u, - 0x00000001u, 0x6f736572u, 0x6974756cu, 0x00006e6fu, 0x00060006u, 0x00000010u, 0x00000002u, 0x61746f72u, - 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000010u, 0x00000003u, 0x65766177u, 0x73616850u, 0x00000065u, + 0x00746365u, 0x00050006u, 0x00000010u, 0x00000000u, 0x656d6974u, 0x00000000u, 0x00050006u, 0x00000010u, + 0x00000001u, 0x58736572u, 0x00000000u, 0x00050006u, 0x00000010u, 0x00000002u, 0x59736572u, 0x00000000u, + 0x00060006u, 0x00000010u, 0x00000003u, 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000010u, + 0x00000004u, 0x65766177u, 0x73616850u, 0x00000065u, 0x00060006u, 0x00000010u, 0x00000005u, 0x64646170u, + 0x31676e69u, 0x00000000u, 0x00060006u, 0x00000010u, 0x00000006u, 0x64646170u, 0x32676e69u, 0x00000000u, 0x00030005u, 0x00000012u, 0x006f6275u, 0x00040047u, 0x00000009u, 0x0000001eu, 0x00000000u, 0x00040047u, 0x0000000bu, 0x0000001eu, 0x00000000u, 0x00040047u, 0x0000000fu, 0x0000001eu, 0x00000001u, 0x00050048u, 0x00000010u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000010u, 0x00000001u, 0x00000023u, - 0x00000008u, 0x00050048u, 0x00000010u, 0x00000002u, 0x00000023u, 0x00000010u, 0x00050048u, 0x00000010u, - 0x00000003u, 0x00000023u, 0x00000014u, 0x00030047u, 0x00000010u, 0x00000002u, 0x00040047u, 0x00000012u, - 0x00000022u, 0x00000000u, 0x00040047u, 0x00000012u, 0x00000021u, 0x00000000u, 0x00020013u, 0x00000002u, - 0x00030021u, 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, - 0x00000006u, 0x00000004u, 0x00040020u, 0x00000008u, 0x00000003u, 0x00000007u, 0x0004003bu, 0x00000008u, - 0x00000009u, 0x00000003u, 0x00040020u, 0x0000000au, 0x00000001u, 0x00000007u, 0x0004003bu, 0x0000000au, - 0x0000000bu, 0x00000001u, 0x00040017u, 0x0000000du, 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000eu, - 0x00000001u, 0x0000000du, 0x0004003bu, 0x0000000eu, 0x0000000fu, 0x00000001u, 0x0006001eu, 0x00000010u, - 0x00000006u, 0x0000000du, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000011u, 0x00000002u, 0x00000010u, - 0x0004003bu, 0x00000011u, 0x00000012u, 0x00000002u, 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, - 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003du, 0x00000007u, 0x0000000cu, 0x0000000bu, 0x0003003eu, - 0x00000009u, 0x0000000cu, 0x000100fdu, 0x00010038u + 0x00000004u, 0x00050048u, 0x00000010u, 0x00000002u, 0x00000023u, 0x00000008u, 0x00050048u, 0x00000010u, + 0x00000003u, 0x00000023u, 0x0000000cu, 0x00050048u, 0x00000010u, 0x00000004u, 0x00000023u, 0x00000010u, + 0x00050048u, 0x00000010u, 0x00000005u, 0x00000023u, 0x00000014u, 0x00050048u, 0x00000010u, 0x00000006u, + 0x00000023u, 0x00000018u, 0x00030047u, 0x00000010u, 0x00000002u, 0x00040047u, 0x00000012u, 0x00000022u, + 0x00000000u, 0x00040047u, 0x00000012u, 0x00000021u, 0x00000000u, 0x00020013u, 0x00000002u, 0x00030021u, + 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, + 0x00000004u, 0x00040020u, 0x00000008u, 0x00000003u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000009u, + 0x00000003u, 0x00040020u, 0x0000000au, 0x00000001u, 0x00000007u, 0x0004003bu, 0x0000000au, 0x0000000bu, + 0x00000001u, 0x00040017u, 0x0000000du, 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000eu, 0x00000001u, + 0x0000000du, 0x0004003bu, 0x0000000eu, 0x0000000fu, 0x00000001u, 0x0009001eu, 0x00000010u, 0x00000006u, + 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000011u, + 0x00000002u, 0x00000010u, 0x0004003bu, 0x00000011u, 0x00000012u, 0x00000002u, 0x00050036u, 0x00000002u, + 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003du, 0x00000007u, 0x0000000cu, + 0x0000000bu, 0x0003003eu, 0x00000009u, 0x0000000cu, 0x000100fdu, 0x00010038u diff --git a/src/shaders_spirv/text.frag.spv b/src/shaders_spirv/text.frag.spv index a2ad793..063e964 100644 Binary files a/src/shaders_spirv/text.frag.spv and b/src/shaders_spirv/text.frag.spv differ diff --git a/src/shaders_spirv/text_frag.inc b/src/shaders_spirv/text_frag.inc index 030a621..97645c8 100644 --- a/src/shaders_spirv/text_frag.inc +++ b/src/shaders_spirv/text_frag.inc @@ -1,5 +1,5 @@ // Auto-generated from text.frag.spv -// Size: 1320 bytes (330 words) +// Size: 1456 bytes (364 words) 0x07230203u, 0x00010000u, 0x0008000bu, 0x0000002bu, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, 0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u, 0x0008000fu, 0x00000004u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x00000010u, 0x00000018u, 0x0000001au, @@ -8,37 +8,41 @@ 0x53786574u, 0x6c706d61u, 0x00007265u, 0x00060005u, 0x00000010u, 0x67617266u, 0x43786554u, 0x64726f6fu, 0x00000000u, 0x00050005u, 0x00000018u, 0x4374756fu, 0x726f6c6fu, 0x00000000u, 0x00050005u, 0x0000001au, 0x67617266u, 0x6f6c6f43u, 0x00000072u, 0x00070005u, 0x00000028u, 0x66696e55u, 0x426d726fu, 0x65666675u, - 0x6a624f72u, 0x00746365u, 0x00050006u, 0x00000028u, 0x00000000u, 0x656d6974u, 0x00000000u, 0x00060006u, - 0x00000028u, 0x00000001u, 0x6f736572u, 0x6974756cu, 0x00006e6fu, 0x00060006u, 0x00000028u, 0x00000002u, - 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, 0x00000028u, 0x00000003u, 0x65766177u, 0x73616850u, - 0x00000065u, 0x00030005u, 0x0000002au, 0x006f6275u, 0x00040047u, 0x0000000cu, 0x00000022u, 0x00000000u, + 0x6a624f72u, 0x00746365u, 0x00050006u, 0x00000028u, 0x00000000u, 0x656d6974u, 0x00000000u, 0x00050006u, + 0x00000028u, 0x00000001u, 0x58736572u, 0x00000000u, 0x00050006u, 0x00000028u, 0x00000002u, 0x59736572u, + 0x00000000u, 0x00060006u, 0x00000028u, 0x00000003u, 0x61746f72u, 0x6e6f6974u, 0x00000000u, 0x00060006u, + 0x00000028u, 0x00000004u, 0x65766177u, 0x73616850u, 0x00000065u, 0x00060006u, 0x00000028u, 0x00000005u, + 0x64646170u, 0x31676e69u, 0x00000000u, 0x00060006u, 0x00000028u, 0x00000006u, 0x64646170u, 0x32676e69u, + 0x00000000u, 0x00030005u, 0x0000002au, 0x006f6275u, 0x00040047u, 0x0000000cu, 0x00000022u, 0x00000000u, 0x00040047u, 0x0000000cu, 0x00000021u, 0x00000001u, 0x00040047u, 0x00000010u, 0x0000001eu, 0x00000001u, 0x00040047u, 0x00000018u, 0x0000001eu, 0x00000000u, 0x00040047u, 0x0000001au, 0x0000001eu, 0x00000000u, 0x00050048u, 0x00000028u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000028u, 0x00000001u, - 0x00000023u, 0x00000008u, 0x00050048u, 0x00000028u, 0x00000002u, 0x00000023u, 0x00000010u, 0x00050048u, - 0x00000028u, 0x00000003u, 0x00000023u, 0x00000014u, 0x00030047u, 0x00000028u, 0x00000002u, 0x00040047u, - 0x0000002au, 0x00000022u, 0x00000000u, 0x00040047u, 0x0000002au, 0x00000021u, 0x00000000u, 0x00020013u, - 0x00000002u, 0x00030021u, 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040020u, - 0x00000007u, 0x00000007u, 0x00000006u, 0x00090019u, 0x00000009u, 0x00000006u, 0x00000001u, 0x00000000u, - 0x00000000u, 0x00000000u, 0x00000001u, 0x00000000u, 0x0003001bu, 0x0000000au, 0x00000009u, 0x00040020u, - 0x0000000bu, 0x00000000u, 0x0000000au, 0x0004003bu, 0x0000000bu, 0x0000000cu, 0x00000000u, 0x00040017u, - 0x0000000eu, 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000fu, 0x00000001u, 0x0000000eu, 0x0004003bu, - 0x0000000fu, 0x00000010u, 0x00000001u, 0x00040017u, 0x00000012u, 0x00000006u, 0x00000004u, 0x00040015u, - 0x00000014u, 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000014u, 0x00000015u, 0x00000000u, 0x00040020u, - 0x00000017u, 0x00000003u, 0x00000012u, 0x0004003bu, 0x00000017u, 0x00000018u, 0x00000003u, 0x00040020u, - 0x00000019u, 0x00000001u, 0x00000012u, 0x0004003bu, 0x00000019u, 0x0000001au, 0x00000001u, 0x00040017u, - 0x0000001bu, 0x00000006u, 0x00000003u, 0x0004002bu, 0x00000014u, 0x0000001eu, 0x00000003u, 0x00040020u, - 0x0000001fu, 0x00000001u, 0x00000006u, 0x0006001eu, 0x00000028u, 0x00000006u, 0x0000000eu, 0x00000006u, - 0x00000006u, 0x00040020u, 0x00000029u, 0x00000002u, 0x00000028u, 0x0004003bu, 0x00000029u, 0x0000002au, - 0x00000002u, 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, - 0x0004003bu, 0x00000007u, 0x00000008u, 0x00000007u, 0x0004003du, 0x0000000au, 0x0000000du, 0x0000000cu, - 0x0004003du, 0x0000000eu, 0x00000011u, 0x00000010u, 0x00050057u, 0x00000012u, 0x00000013u, 0x0000000du, - 0x00000011u, 0x00050051u, 0x00000006u, 0x00000016u, 0x00000013u, 0x00000000u, 0x0003003eu, 0x00000008u, - 0x00000016u, 0x0004003du, 0x00000012u, 0x0000001cu, 0x0000001au, 0x0008004fu, 0x0000001bu, 0x0000001du, - 0x0000001cu, 0x0000001cu, 0x00000000u, 0x00000001u, 0x00000002u, 0x00050041u, 0x0000001fu, 0x00000020u, - 0x0000001au, 0x0000001eu, 0x0004003du, 0x00000006u, 0x00000021u, 0x00000020u, 0x0004003du, 0x00000006u, - 0x00000022u, 0x00000008u, 0x00050085u, 0x00000006u, 0x00000023u, 0x00000021u, 0x00000022u, 0x00050051u, - 0x00000006u, 0x00000024u, 0x0000001du, 0x00000000u, 0x00050051u, 0x00000006u, 0x00000025u, 0x0000001du, - 0x00000001u, 0x00050051u, 0x00000006u, 0x00000026u, 0x0000001du, 0x00000002u, 0x00070050u, 0x00000012u, - 0x00000027u, 0x00000024u, 0x00000025u, 0x00000026u, 0x00000023u, 0x0003003eu, 0x00000018u, 0x00000027u, - 0x000100fdu, 0x00010038u + 0x00000023u, 0x00000004u, 0x00050048u, 0x00000028u, 0x00000002u, 0x00000023u, 0x00000008u, 0x00050048u, + 0x00000028u, 0x00000003u, 0x00000023u, 0x0000000cu, 0x00050048u, 0x00000028u, 0x00000004u, 0x00000023u, + 0x00000010u, 0x00050048u, 0x00000028u, 0x00000005u, 0x00000023u, 0x00000014u, 0x00050048u, 0x00000028u, + 0x00000006u, 0x00000023u, 0x00000018u, 0x00030047u, 0x00000028u, 0x00000002u, 0x00040047u, 0x0000002au, + 0x00000022u, 0x00000000u, 0x00040047u, 0x0000002au, 0x00000021u, 0x00000000u, 0x00020013u, 0x00000002u, + 0x00030021u, 0x00000003u, 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040020u, 0x00000007u, + 0x00000007u, 0x00000006u, 0x00090019u, 0x00000009u, 0x00000006u, 0x00000001u, 0x00000000u, 0x00000000u, + 0x00000000u, 0x00000001u, 0x00000000u, 0x0003001bu, 0x0000000au, 0x00000009u, 0x00040020u, 0x0000000bu, + 0x00000000u, 0x0000000au, 0x0004003bu, 0x0000000bu, 0x0000000cu, 0x00000000u, 0x00040017u, 0x0000000eu, + 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000fu, 0x00000001u, 0x0000000eu, 0x0004003bu, 0x0000000fu, + 0x00000010u, 0x00000001u, 0x00040017u, 0x00000012u, 0x00000006u, 0x00000004u, 0x00040015u, 0x00000014u, + 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000014u, 0x00000015u, 0x00000000u, 0x00040020u, 0x00000017u, + 0x00000003u, 0x00000012u, 0x0004003bu, 0x00000017u, 0x00000018u, 0x00000003u, 0x00040020u, 0x00000019u, + 0x00000001u, 0x00000012u, 0x0004003bu, 0x00000019u, 0x0000001au, 0x00000001u, 0x00040017u, 0x0000001bu, + 0x00000006u, 0x00000003u, 0x0004002bu, 0x00000014u, 0x0000001eu, 0x00000003u, 0x00040020u, 0x0000001fu, + 0x00000001u, 0x00000006u, 0x0009001eu, 0x00000028u, 0x00000006u, 0x00000006u, 0x00000006u, 0x00000006u, + 0x00000006u, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000029u, 0x00000002u, 0x00000028u, 0x0004003bu, + 0x00000029u, 0x0000002au, 0x00000002u, 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, + 0x000200f8u, 0x00000005u, 0x0004003bu, 0x00000007u, 0x00000008u, 0x00000007u, 0x0004003du, 0x0000000au, + 0x0000000du, 0x0000000cu, 0x0004003du, 0x0000000eu, 0x00000011u, 0x00000010u, 0x00050057u, 0x00000012u, + 0x00000013u, 0x0000000du, 0x00000011u, 0x00050051u, 0x00000006u, 0x00000016u, 0x00000013u, 0x00000000u, + 0x0003003eu, 0x00000008u, 0x00000016u, 0x0004003du, 0x00000012u, 0x0000001cu, 0x0000001au, 0x0008004fu, + 0x0000001bu, 0x0000001du, 0x0000001cu, 0x0000001cu, 0x00000000u, 0x00000001u, 0x00000002u, 0x00050041u, + 0x0000001fu, 0x00000020u, 0x0000001au, 0x0000001eu, 0x0004003du, 0x00000006u, 0x00000021u, 0x00000020u, + 0x0004003du, 0x00000006u, 0x00000022u, 0x00000008u, 0x00050085u, 0x00000006u, 0x00000023u, 0x00000021u, + 0x00000022u, 0x00050051u, 0x00000006u, 0x00000024u, 0x0000001du, 0x00000000u, 0x00050051u, 0x00000006u, + 0x00000025u, 0x0000001du, 0x00000001u, 0x00050051u, 0x00000006u, 0x00000026u, 0x0000001du, 0x00000002u, + 0x00070050u, 0x00000012u, 0x00000027u, 0x00000024u, 0x00000025u, 0x00000026u, 0x00000023u, 0x0003003eu, + 0x00000018u, 0x00000027u, 0x000100fdu, 0x00010038u diff --git a/src/vulkanwidget.cpp b/src/vulkanwidget.cpp index 0f223b0..bebf6ab 100644 --- a/src/vulkanwidget.cpp +++ b/src/vulkanwidget.cpp @@ -364,7 +364,7 @@ bool VulkanWidget::createDevice() vkGetPhysicalDeviceFeatures(m_physicalDevice, &supportedFeatures); VkPhysicalDeviceFeatures deviceFeatures = {}; - + // Enable sample rate shading for better MSAA quality if (supportedFeatures.sampleRateShading) { deviceFeatures.sampleRateShading = VK_TRUE; @@ -372,7 +372,7 @@ bool VulkanWidget::createDevice() } else { qDebug() << "Sample rate shading not supported by device"; } - + // Enable wide lines if supported (for smoother line rendering) if (supportedFeatures.wideLines) { deviceFeatures.wideLines = VK_TRUE;