Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beau test app #1839

Open
wants to merge 42 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
0e6a4a2
Ported vk bootstrap for test apps
beau-lunarg Oct 16, 2024
e6c9ffc
Common test app cmake target
beau-lunarg Oct 19, 2024
8e7b58c
Move window functions to test app base
beau-lunarg Oct 19, 2024
5fff727
Move swapchain creating to test app base
beau-lunarg Oct 20, 2024
ad9469a
Refactor framebuffer creation into test app base
beau-lunarg Oct 20, 2024
a478c15
Refactor command pool creation to test_app_base
beau-lunarg Oct 20, 2024
81c25c8
Separate sync object from render data
beau-lunarg Oct 21, 2024
b9dd99e
Move sync object creation into test app base
beau-lunarg Oct 21, 2024
025cb13
Move triangle runner into namespace
beau-lunarg Oct 21, 2024
731d6f6
Load shader module from file
beau-lunarg Oct 21, 2024
f04f20b
Refactor errors
beau-lunarg Oct 21, 2024
b80ecdc
Move init to test app base
beau-lunarg Oct 21, 2024
fe7a170
Simplify create framebuffers
beau-lunarg Oct 21, 2024
3fb08a9
Move swapchain creation for init to test app base
beau-lunarg Oct 21, 2024
6f06e31
Test app base version of recreate swapchain
beau-lunarg Oct 21, 2024
6d8d3a3
Test app base class
beau-lunarg Oct 21, 2024
d66b9b3
Test apps can configure instance creation, physical device selection,…
beau-lunarg Oct 21, 2024
9b5e836
Cleanup triangle
beau-lunarg Oct 21, 2024
f7de695
Include cleanup
beau-lunarg Oct 21, 2024
8aa0d84
Multisample depth test app
beau-lunarg Oct 22, 2024
154d4fc
Fix multiple frames
beau-lunarg Oct 27, 2024
a8c0b7a
Triangle test with clean validation
beau-lunarg Oct 27, 2024
62c3b61
Clean validation for multisample
beau-lunarg Oct 27, 2024
4d432eb
Format
beau-lunarg Oct 27, 2024
1c98a17
Tricky format issue
beau-lunarg Oct 27, 2024
4328526
Remove sdl submodule
beau-lunarg Nov 2, 2024
5dfb7f7
Add SDL3 dependency through CMAKE
beau-lunarg Nov 2, 2024
4e72f0b
Win32 conditional to copy dlls
beau-lunarg Nov 2, 2024
508d8f9
Fix copyright names and years
beau-lunarg Nov 2, 2024
5833c9a
Setup extensions from device builder
beau-lunarg Nov 4, 2024
28e3e55
Fix formatting
beau-lunarg Nov 4, 2024
adf499a
Strange formatting issue
beau-lunarg Nov 4, 2024
02882b6
Removed overuse of this->.
beau-lunarg Nov 5, 2024
e7ed80e
Fix format issues
beau-lunarg Nov 5, 2024
f7a628b
Same formatting issue as before
beau-lunarg Nov 5, 2024
6128e34
Test pipeline binaries and host image copy
ziga-lunarg Nov 2, 2024
8cc5d16
Add test for shader objects
ziga-lunarg Nov 2, 2024
db20e08
Change max frames to size_t
beau-lunarg Nov 8, 2024
7fff54e
Fix formatting in pipeline binaries test app
beau-lunarg Nov 8, 2024
a2b2c8e
Mark configure methods as override in pipeline-binaries test app
beau-lunarg Nov 8, 2024
98bde8e
Fix format issues in shader objects test app
beau-lunarg Nov 8, 2024
92e1326
Add missing overrides in host image copy and shader objects test apps
beau-lunarg Nov 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "external/SPIRV-Reflect"]
path = external/SPIRV-Reflect
url = https://github.com/KhronosGroup/SPIRV-Reflect.git
[submodule "external/SDL"]
path = external/SDL
url = https://github.com/libsdl-org/SDL.git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change says "ported vk boostrap" but I don't see it added as a submodule.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't usable without deep changes, so I ended up copying and reworking the code

2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,14 @@ if (${RUN_TESTS})
target_include_directories(catch2 INTERFACE external)
endif()

add_subdirectory(external/SDL)
MarkY-LunarG marked this conversation as resolved.
Show resolved Hide resolved
add_subdirectory(external/nlohmann)
add_subdirectory(framework)
if(NOT BUILD_STATIC)
add_subdirectory(layer)
endif()
add_subdirectory(tools)
add_subdirectory(test)

if (${RUN_TESTS})
add_test_package_file(${CMAKE_CURRENT_LIST_DIR}/scripts/build.py)
Expand Down
1 change: 1 addition & 0 deletions external/SDL
Submodule SDL added at 3ebfdb
9,608 changes: 9,608 additions & 0 deletions external/Vulkan-Utility-Libraries/vk_enum_string_helper.h

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
###############################################################################
# Copyright (c) 2018-2020 LunarG, Inc.
ziga-lunarg marked this conversation as resolved.
Show resolved Hide resolved
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc.
# All rights reserved
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
# Author: LunarG Team
# Author: AMD Developer Tools Team
# Description: CMake script for gfxrecon tests
###############################################################################

add_subdirectory(test_apps)

# TODO: runner goes here
32 changes: 32 additions & 0 deletions test/test_apps/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
###############################################################################
# Copyright (c) 2018-2020 LunarG, Inc.
ziga-lunarg marked this conversation as resolved.
Show resolved Hide resolved
# Copyright (c) 2020-2023 Advanced Micro Devices, Inc.
# All rights reserved
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
# Author: LunarG Team
# Author: AMD Developer Tools Team
# Description: CMake script for test apps
###############################################################################

add_custom_target(gfxrecon-testapps)

add_subdirectory(triangle)
add_subdirectory(multisample-depth)
2 changes: 2 additions & 0 deletions test/test_apps/common/CurrentBuildVulkanVersion.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION 1.3.296)
set(VK_BOOTSTRAP_SOURCE_HEADER_VERSION_GIT_TAG v1.3.296)
Loading
Loading