Skip to content

Move screenshot layer to screenshot directory #21

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.

Sign up for GitHub

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

Draft
emrekultursay wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Move screenshot layer to screenshot directory #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions layersvt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,16 @@ if(BUILD_SCREENSHOT)
add_library(VkLayer_screenshot MODULE)
set_target_properties(VkLayer_screenshot PROPERTIES FOLDER "layers/screenshot")
target_sources(VkLayer_screenshot PRIVATE
screenshot.cpp
screenshot_parsing.cpp
screenshot_parsing.h
screenshot/screenshot.cpp
screenshot/screenshot_parsing.cpp
screenshot/screenshot_parsing.h
perfetto/perfetto.cc
perfetto/screenshots_perfetto_helpers.cpp
screenshot/screenshot_perfetto.cpp
vk_layer_table.cpp
vk_layer_table.h
screenshot_layer.md
screenshot/screenshot_layer.md
layer_keep_alive.cpp
json/VkLayer_screenshot.json.in
screenshot/json/VkLayer_screenshot.json.in
)
endif()

Expand Down Expand Up @@ -215,6 +215,8 @@ foreach(layer ${TOOL_LAYERS})
set(layer_dir "debug_marker/")
elseif(layer STREQUAL "VkLayer_CPUTiming")
set(layer_dir "cpu_timing/")
elseif(layer STREQUAL "VkLayer_screenshot")
set(layer_dir "screenshot/")
else()
set(layer_dir "")
endif()
Expand Down Expand Up @@ -261,9 +263,13 @@ foreach(layer ${TOOL_LAYERS})
set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/debug_marker/${layer}.json.in")
elseif(layer STREQUAL "VkLayer_CPUTiming")
set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpu_timing/${layer}.json.in")
elseif(layer STREQUAL "VkLayer_screenshot")
set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/screenshot/json/${layer}.json.in")
else()
set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/json/${layer}.json.in")
endif()


set(INTERMEDIATE_FILE "${CMAKE_CURRENT_BINARY_DIR}/json/intermediate-${layer}.json")
set(OUTPUT_FILE_FINAL_NAME "${layer}.json")
set(LAYER_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
Expand Down
0 layersvt/VkLayer_screenshot.def → layersvt/screenshot/VkLayer_screenshot.def
View file
Open in desktop
File renamed without changes.
0 layersvt/json/VkLayer_screenshot.json.in → ...creenshot/json/VkLayer_screenshot.json.in
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion layersvt/screenshot.cpp → layersvt/screenshot/screenshot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

#include "vk_layer_table.h"
#include "screenshot_parsing.h"
#include "perfetto/screenshots_perfetto_helpers.h"
#include "screenshot_perfetto.h"
#include "screenshot_writer.h"

using namespace std;
Expand Down
0 layersvt/screenshot_layer.md → layersvt/screenshot/screenshot_layer.md
View file
Open in desktop
File renamed without changes.
0 layersvt/screenshot_parsing.cpp → layersvt/screenshot/screenshot_parsing.cpp
View file
Open in desktop
File renamed without changes.
0 layersvt/screenshot_parsing.h → layersvt/screenshot/screenshot_parsing.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...perfetto/screenshots_perfetto_helpers.cpp → layersvt/screenshot/screenshot_perfetto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "screenshots_perfetto_helpers.h"
#include "screenshot_perfetto.h"
#include <atomic>
#include <thread>
#include <mutex>
Expand Down
8 changes: 4 additions & 4 deletions ...t/perfetto/screenshots_perfetto_helpers.h → layersvt/screenshot/screenshot_perfetto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef LAYERSVT_SCREENSHOTS_PERFETTO_HELPERS_H
#define LAYERSVT_SCREENSHOTS_PERFETTO_HELPERS_H
#ifndef LAYERSVT_SCREENSHOT_PERFETTO_H
#define LAYERSVT_SCREENSHOT_PERFETTO_H

#include "perfetto.h"
#include "perfetto/perfetto.h"

class ScreenshotDataSource : public perfetto::DataSource<ScreenshotDataSource> {
public:
Expand All @@ -11,4 +11,4 @@ class ScreenshotDataSource : public perfetto::DataSource<ScreenshotDataSource> {

void InitializeScreenshotsPerfetto();

#endif // LAYERSVT_SCREENSHOTS_PERFETTO_HELPERS_H
#endif // LAYERSVT_SCREENSHOT_PERFETTO_H
0 layersvt/screenshot_writer.h → layersvt/screenshot/screenshot_writer.h
View file
Open in desktop
File renamed without changes.
Loading