From 6de8c53f85e384a3e0ffd5f2f3ed3e3e422b562f Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 4 Sep 2020 11:29:21 +0100 Subject: [PATCH] Fix VK_Extended_Dynamic_State --- util/test/demos/vk/vk_extended_dyn_state.cpp | 14 ++++++++------ .../tests/Vulkan/VK_Extended_Dynamic_State.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/util/test/demos/vk/vk_extended_dyn_state.cpp b/util/test/demos/vk/vk_extended_dyn_state.cpp index 8fd951d33..081f596f2 100644 --- a/util/test/demos/vk/vk_extended_dyn_state.cpp +++ b/util/test/demos/vk/vk_extended_dyn_state.cpp @@ -47,6 +47,8 @@ RD_TEST(VK_Extended_Dynamic_State, VulkanGraphicsTest) if(!extFeatures.extendedDynamicState) Avail = "feature 'extendedDynamicState' not available"; + features.depthBounds = VK_TRUE; + devInfoNext = &extFeatures; } @@ -104,13 +106,13 @@ RD_TEST(VK_Extended_Dynamic_State, VulkanGraphicsTest) pipeCreateInfo.depthStencilState.back = pipeCreateInfo.depthStencilState.front; const DefaultA2V tris[6] = { - {Vec3f(-0.75f, 0.5f, 0.4f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(0.0f, 0.0f)}, - {Vec3f(-0.25f, -0.5f, 0.4f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(0.0f, 1.0f)}, - {Vec3f(0.25f, 0.5f, 0.4f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(1.0f, 0.0f)}, + {Vec3f(-0.75f, -0.5f, 0.4f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(0.0f, 0.0f)}, + {Vec3f(-0.25f, 0.5f, 0.4f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(0.0f, 1.0f)}, + {Vec3f(0.25f, -0.5f, 0.4f), Vec4f(0.0f, 1.0f, 0.0f, 1.0f), Vec2f(1.0f, 0.0f)}, - {Vec3f(-0.25f, 0.5f, 0.6f), Vec4f(0.0f, 0.0f, 1.0f, 1.0f), Vec2f(0.0f, 0.0f)}, - {Vec3f(0.25f, -0.5f, 0.6f), Vec4f(0.0f, 0.0f, 1.0f, 1.0f), Vec2f(0.0f, 1.0f)}, - {Vec3f(0.75f, 0.5f, 0.6f), Vec4f(0.0f, 0.0f, 1.0f, 1.0f), Vec2f(1.0f, 0.0f)}, + {Vec3f(-0.25f, -0.5f, 0.6f), Vec4f(0.0f, 0.0f, 1.0f, 1.0f), Vec2f(0.0f, 0.0f)}, + {Vec3f(0.25f, 0.5f, 0.6f), Vec4f(0.0f, 0.0f, 1.0f, 1.0f), Vec2f(0.0f, 1.0f)}, + {Vec3f(0.75f, -0.5f, 0.6f), Vec4f(0.0f, 0.0f, 1.0f, 1.0f), Vec2f(1.0f, 0.0f)}, }; AllocatedBuffer vb(this, diff --git a/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py b/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py index 786f9f476..2c9363d79 100644 --- a/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py +++ b/util/test/tests/Vulkan/VK_Extended_Dynamic_State.py @@ -14,28 +14,28 @@ class VK_Extended_Dynamic_State(rdtest.TestCase): 0: { 'vtx': 0, 'idx': 0, - 'Position': [-0.75, 0.5, 0.4], + 'Position': [-0.75, -0.5, 0.4], 'Color': [0.0, 1.0, 0.0, 1.0], 'UV': [0.0, 0.0], }, 1: { 'vtx': 1, 'idx': 1, - 'Position': [-0.25, -0.5, 0.4], + 'Position': [-0.25, 0.5, 0.4], 'Color': [0.0, 1.0, 0.0, 1.0], 'UV': [0.0, 1.0], }, 2: { 'vtx': 2, 'idx': 2, - 'Position': [0.25, 0.5, 0.4], + 'Position': [0.25, -0.5, 0.4], 'Color': [0.0, 1.0, 0.0, 1.0], 'UV': [1.0, 0.0], }, 5: { 'vtx': 5, 'idx': 5, - 'Position': [0.75, 0.5, 0.6], + 'Position': [0.75, -0.5, 0.6], 'Color': [0.0, 0.0, 1.0, 1.0], 'UV': [1.0, 0.0], }, @@ -49,28 +49,28 @@ class VK_Extended_Dynamic_State(rdtest.TestCase): 0: { 'vtx': 0, 'idx': 0, - 'gl_PerVertex_var.gl_Position': [-0.75, -0.5, 0.4, 1.0], + 'gl_PerVertex_var.gl_Position': [-0.75, 0.5, 0.4, 1.0], 'vertOut.col': [0.0, 1.0, 0.0, 1.0], 'vertOut.uv': [0.0, 0.0, 0.0, 1.0], }, 1: { 'vtx': 1, 'idx': 1, - 'gl_PerVertex_var.gl_Position': [-0.25, 0.5, 0.4, 1.0], + 'gl_PerVertex_var.gl_Position': [-0.25, -0.5, 0.4, 1.0], 'vertOut.col': [0.0, 1.0, 0.0, 1.0], 'vertOut.uv': [0.0, 1.0, 0.0, 1.0], }, 2: { 'vtx': 2, 'idx': 2, - 'gl_PerVertex_var.gl_Position': [0.25, -0.5, 0.4, 1.0], + 'gl_PerVertex_var.gl_Position': [0.25, 0.5, 0.4, 1.0], 'vertOut.col': [0.0, 1.0, 0.0, 1.0], 'vertOut.uv': [1.0, 0.0, 0.0, 1.0], }, 5: { 'vtx': 5, 'idx': 5, - 'gl_PerVertex_var.gl_Position': [0.75, -0.5, 0.6, 1.0], + 'gl_PerVertex_var.gl_Position': [0.75, 0.5, 0.6, 1.0], 'vertOut.col': [0.0, 0.0, 1.0, 1.0], 'vertOut.uv': [1.0, 0.0, 0.0, 1.0], },