Skip to content

Commit

Permalink
Add tests for EXT_discard_rectangles
Browse files Browse the repository at this point in the history 
Added tests that check that the rendered image is correct for the the
combination of: the two different modes (inclusive, exclusive),
different number of rectangles (1, 2, 3, 4, 8, 16), dynamic discard
rectangles, scissor, dynamic scissor.

These tests don't check that the device groups work as expected.

New tests:

dEQP-VK.draw.discard_rectangles.*

Components: Vulkan
VK-GL-CTS issue: 1679

Change-Id: Idcfe2a9fc9113051fd72e51a0019e4247463cede
  • Loading branch information
@samuelig
samuelig committed Apr 26, 2019
1 parent 5deebf4 commit 337ea07
Show file tree
Hide file tree
Showing 8 changed files with 1,161 additions and 0 deletions.
1 change: 1 addition & 0 deletions AndroidGen.mk
View file
Expand Up @@ -114,6 +114,7 @@ LOCAL_SRC_FILES := \
external/vulkancts/modules/vulkan/draw/vktDrawBufferObjectUtil.cpp \
external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp \
external/vulkancts/modules/vulkan/draw/vktDrawDifferingInterpolationTests.cpp \
external/vulkancts/modules/vulkan/draw/vktDrawDiscardRectanglesTests.cpp \
external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp \
external/vulkancts/modules/vulkan/draw/vktDrawIndexedTest.cpp \
external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp \
Expand Down
72 changes: 72 additions & 0 deletions android/cts/master/vk-master.txt
View file
Expand Up @@ -314061,6 +314061,78 @@ dEQP-VK.draw.multiple_interpolation.8_samples
dEQP-VK.draw.multiple_interpolation.16_samples
dEQP-VK.draw.multiple_interpolation.32_samples
dEQP-VK.draw.multiple_interpolation.64_samples
dEQP-VK.draw.discard_rectangles.inclusive_rect_1
dEQP-VK.draw.discard_rectangles.inclusive_rect_2
dEQP-VK.draw.discard_rectangles.inclusive_rect_3
dEQP-VK.draw.discard_rectangles.inclusive_rect_4
dEQP-VK.draw.discard_rectangles.inclusive_rect_8
dEQP-VK.draw.discard_rectangles.inclusive_rect_16
dEQP-VK.draw.discard_rectangles.exclusive_rect_1
dEQP-VK.draw.discard_rectangles.exclusive_rect_2
dEQP-VK.draw.discard_rectangles.exclusive_rect_3
dEQP-VK.draw.discard_rectangles.exclusive_rect_4
dEQP-VK.draw.discard_rectangles.exclusive_rect_8
dEQP-VK.draw.discard_rectangles.exclusive_rect_16
dEQP-VK.draw.discard_rectangles.scissor_inclusive_rect_1
dEQP-VK.draw.discard_rectangles.scissor_inclusive_rect_2
dEQP-VK.draw.discard_rectangles.scissor_inclusive_rect_3
dEQP-VK.draw.discard_rectangles.scissor_inclusive_rect_4
dEQP-VK.draw.discard_rectangles.scissor_inclusive_rect_8
dEQP-VK.draw.discard_rectangles.scissor_inclusive_rect_16
dEQP-VK.draw.discard_rectangles.scissor_exclusive_rect_1
dEQP-VK.draw.discard_rectangles.scissor_exclusive_rect_2
dEQP-VK.draw.discard_rectangles.scissor_exclusive_rect_3
dEQP-VK.draw.discard_rectangles.scissor_exclusive_rect_4
dEQP-VK.draw.discard_rectangles.scissor_exclusive_rect_8
dEQP-VK.draw.discard_rectangles.scissor_exclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_scissor_inclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_scissor_inclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_scissor_inclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_scissor_inclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_scissor_inclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_scissor_inclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_scissor_exclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_scissor_exclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_scissor_exclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_scissor_exclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_scissor_exclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_scissor_exclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_discard_inclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_discard_inclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_discard_inclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_discard_inclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_discard_inclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_discard_inclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_discard_exclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_discard_exclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_discard_exclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_discard_exclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_discard_exclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_discard_exclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_inclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_inclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_inclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_inclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_inclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_inclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_exclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_exclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_exclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_exclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_exclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_discard_scissor_exclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_inclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_inclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_inclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_inclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_inclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_inclusive_rect_16
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_exclusive_rect_1
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_exclusive_rect_2
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_exclusive_rect_3
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_exclusive_rect_4
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_exclusive_rect_8
dEQP-VK.draw.discard_rectangles.dynamic_discard_dynamic_scissor_exclusive_rect_16
dEQP-VK.compute.basic.empty_shader
dEQP-VK.compute.basic.concurrent_compute
dEQP-VK.compute.basic.ubo_to_ssbo_single_invocation
Expand Down
2 changes: 2 additions & 0 deletions external/vulkancts/modules/vulkan/draw/CMakeLists.txt
View file
Expand Up @@ -38,6 +38,8 @@ set(DEQP_VK_DRAW_SRCS
vktDrawScissorTests.cpp
vktDrawMultipleInterpolationTests.hpp
vktDrawMultipleInterpolationTests.cpp
vktDrawDiscardRectanglesTests.hpp
vktDrawDiscardRectanglesTests.cpp
)

set(DEQP_VK_DRAW_LIBS
Expand Down

0 comments on commit 337ea07

Please sign in to comment.