Skip to content

Commit 3fc6186

Browse files
fholgerfholger
authored
Add config option to disable GPU statistics gathering (crosire#204)
1 parent 4db2ba6 commit 3fc6186

File tree

7 files changed

+99
-65
lines changed

7 files changed

+99
-65
lines changed

‎source/d3d10/runtime_d3d10.cpp

+27-21
Original file line numberDiff line numberDiff line change
@@ -878,26 +878,29 @@ void reshade::d3d10::runtime_impl::render_technique(technique &technique)
878878
const auto impl = static_cast<technique_data *>(technique.impl);
879879
effect_data &effect_data = _effect_data[technique.effect_index];
880880

881-
// Evaluate queries
882-
if (impl->query_in_flight)
881+
if (_gather_gpu_statistics)
883882
{
884-
UINT64 timestamp0, timestamp1;
885-
D3D10_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
886-
887-
if (impl->timestamp_disjoint->GetData(&disjoint, sizeof(disjoint), D3D10_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
888-
impl->timestamp_query_beg->GetData(&timestamp0, sizeof(timestamp0), D3D10_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
889-
impl->timestamp_query_end->GetData(&timestamp1, sizeof(timestamp1), D3D10_ASYNC_GETDATA_DONOTFLUSH) == S_OK)
883+
// Evaluate queries
884+
if (impl->query_in_flight)
890885
{
891-
if (!disjoint.Disjoint)
892-
technique.average_gpu_duration.append((timestamp1 - timestamp0) * 1'000'000'000 / disjoint.Frequency);
893-
impl->query_in_flight = false;
886+
UINT64 timestamp0, timestamp1;
887+
D3D10_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
888+
889+
if (impl->timestamp_disjoint->GetData(&disjoint, sizeof(disjoint), D3D10_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
890+
impl->timestamp_query_beg->GetData(&timestamp0, sizeof(timestamp0), D3D10_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
891+
impl->timestamp_query_end->GetData(&timestamp1, sizeof(timestamp1), D3D10_ASYNC_GETDATA_DONOTFLUSH) == S_OK)
892+
{
893+
if (!disjoint.Disjoint)
894+
technique.average_gpu_duration.append((timestamp1 - timestamp0) * 1'000'000'000 / disjoint.Frequency);
895+
impl->query_in_flight = false;
896+
}
894897
}
895-
}
896898

897-
if (!impl->query_in_flight)
898-
{
899-
impl->timestamp_disjoint->Begin();
900-
impl->timestamp_query_beg->End();
899+
if (!impl->query_in_flight)
900+
{
901+
impl->timestamp_disjoint->Begin();
902+
impl->timestamp_query_beg->End();
903+
}
901904
}
902905

903906
RESHADE_ADDON_EVENT(reshade_before_effects, this, _device_impl);
@@ -1040,13 +1043,16 @@ void reshade::d3d10::runtime_impl::render_technique(technique &technique)
10401043

10411044
RESHADE_ADDON_EVENT(reshade_after_effects, this, _device_impl);
10421045

1043-
if (!impl->query_in_flight)
1046+
if (_gather_gpu_statistics)
10441047
{
1045-
impl->timestamp_query_end->End();
1046-
impl->timestamp_disjoint->End();
1047-
}
1048+
if (!impl->query_in_flight)
1049+
{
1050+
impl->timestamp_query_end->End();
1051+
impl->timestamp_disjoint->End();
1052+
}
10481053

1049-
impl->query_in_flight = true;
1054+
impl->query_in_flight = true;
1055+
}
10501056
}
10511057

10521058
void reshade::d3d10::runtime_impl::update_texture_bindings(const char *semantic, api::resource_view_handle api_srv)

‎source/d3d11/runtime_d3d11.cpp

+27-21
Original file line numberDiff line numberDiff line change
@@ -1030,26 +1030,29 @@ void reshade::d3d11::runtime_impl::render_technique(technique &technique)
10301030
const auto impl = static_cast<technique_data *>(technique.impl);
10311031
effect_data &effect_data = _effect_data[technique.effect_index];
10321032

1033-
// Evaluate queries
1034-
if (impl->query_in_flight)
1033+
if (_gather_gpu_statistics)
10351034
{
1036-
UINT64 timestamp0, timestamp1;
1037-
D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
1038-
1039-
if (_immediate_context->GetData(impl->timestamp_disjoint.get(), &disjoint, sizeof(disjoint), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
1040-
_immediate_context->GetData(impl->timestamp_query_beg.get(), &timestamp0, sizeof(timestamp0), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
1041-
_immediate_context->GetData(impl->timestamp_query_end.get(), &timestamp1, sizeof(timestamp1), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK)
1035+
// Evaluate queries
1036+
if (impl->query_in_flight)
10421037
{
1043-
if (!disjoint.Disjoint)
1044-
technique.average_gpu_duration.append((timestamp1 - timestamp0) * 1'000'000'000 / disjoint.Frequency);
1045-
impl->query_in_flight = false;
1038+
UINT64 timestamp0, timestamp1;
1039+
D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
1040+
1041+
if (_immediate_context->GetData(impl->timestamp_disjoint.get(), &disjoint, sizeof(disjoint), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
1042+
_immediate_context->GetData(impl->timestamp_query_beg.get(), &timestamp0, sizeof(timestamp0), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK &&
1043+
_immediate_context->GetData(impl->timestamp_query_end.get(), &timestamp1, sizeof(timestamp1), D3D11_ASYNC_GETDATA_DONOTFLUSH) == S_OK)
1044+
{
1045+
if (!disjoint.Disjoint)
1046+
technique.average_gpu_duration.append((timestamp1 - timestamp0) * 1'000'000'000 / disjoint.Frequency);
1047+
impl->query_in_flight = false;
1048+
}
10461049
}
1047-
}
10481050

1049-
if (!impl->query_in_flight)
1050-
{
1051-
_immediate_context->Begin(impl->timestamp_disjoint.get());
1052-
_immediate_context->End(impl->timestamp_query_beg.get());
1051+
if (!impl->query_in_flight)
1052+
{
1053+
_immediate_context->Begin(impl->timestamp_disjoint.get());
1054+
_immediate_context->End(impl->timestamp_query_beg.get());
1055+
}
10531056
}
10541057

10551058
RESHADE_ADDON_EVENT(reshade_before_effects, this, _immediate_context_impl);
@@ -1213,13 +1216,16 @@ void reshade::d3d11::runtime_impl::render_technique(technique &technique)
12131216

12141217
RESHADE_ADDON_EVENT(reshade_after_effects, this, _immediate_context_impl);
12151218

1216-
if (!impl->query_in_flight)
1219+
if (_gather_gpu_statistics)
12171220
{
1218-
_immediate_context->End(impl->timestamp_query_end.get());
1219-
_immediate_context->End(impl->timestamp_disjoint.get());
1220-
}
1221+
if (!impl->query_in_flight)
1222+
{
1223+
_immediate_context->End(impl->timestamp_query_end.get());
1224+
_immediate_context->End(impl->timestamp_disjoint.get());
1225+
}
12211226

1222-
impl->query_in_flight = true;
1227+
impl->query_in_flight = true;
1228+
}
12231229
}
12241230

12251231
void reshade::d3d11::runtime_impl::update_texture_bindings(const char *semantic, api::resource_view_handle api_srv)

‎source/opengl/runtime_gl.cpp

+19-13
Original file line numberDiff line numberDiff line change
@@ -958,19 +958,22 @@ void reshade::opengl::runtime_impl::render_technique(technique &technique)
958958

959959
const auto impl = static_cast<technique_data *>(technique.impl);
960960

961-
if (GLuint available = 0; impl->query_in_flight)
961+
if (_gather_gpu_statistics)
962962
{
963-
glGetQueryObjectuiv(impl->query, GL_QUERY_RESULT_AVAILABLE, &available);
964-
if (GLuint64 elapsed_time = 0; available != GL_FALSE)
963+
if (GLuint available = 0; impl->query_in_flight)
965964
{
966-
glGetQueryObjectui64v(impl->query, GL_QUERY_RESULT, &elapsed_time);
967-
technique.average_gpu_duration.append(elapsed_time);
968-
impl->query_in_flight = false; // Reset query status
965+
glGetQueryObjectuiv(impl->query, GL_QUERY_RESULT_AVAILABLE, &available);
966+
if (GLuint64 elapsed_time = 0; available != GL_FALSE)
967+
{
968+
glGetQueryObjectui64v(impl->query, GL_QUERY_RESULT, &elapsed_time);
969+
technique.average_gpu_duration.append(elapsed_time);
970+
impl->query_in_flight = false; // Reset query status
971+
}
969972
}
970-
}
971973

972-
if (!impl->query_in_flight) {
973-
glBeginQuery(GL_TIME_ELAPSED, impl->query);
974+
if (!impl->query_in_flight) {
975+
glBeginQuery(GL_TIME_ELAPSED, impl->query);
976+
}
974977
}
975978

976979
RESHADE_ADDON_EVENT(reshade_before_effects, this, this);
@@ -1136,11 +1139,14 @@ void reshade::opengl::runtime_impl::render_technique(technique &technique)
11361139

11371140
RESHADE_ADDON_EVENT(reshade_after_effects, this, this);
11381141

1139-
if (!impl->query_in_flight) {
1140-
glEndQuery(GL_TIME_ELAPSED);
1141-
}
1142+
if (_gather_gpu_statistics)
1143+
{
1144+
if (!impl->query_in_flight) {
1145+
glEndQuery(GL_TIME_ELAPSED);
1146+
}
11421147

1143-
impl->query_in_flight = true;
1148+
impl->query_in_flight = true;
1149+
}
11441150
}
11451151

11461152
void reshade::opengl::runtime_impl::update_texture_bindings(const char *semantic, api::resource_view_handle srv)

‎source/runtime.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1440,6 +1440,8 @@ void reshade::runtime::load_config()
14401440
config.get("GENERAL", "PresetPath", _current_preset_path);
14411441
config.get("GENERAL", "PresetTransitionDelay", _preset_transition_delay);
14421442

1443+
config.get("GENERAL", "GatherGPUStatistics", _gather_gpu_statistics);
1444+
14431445
// Fall back to temp directory if cache path does not exist
14441446
if (_intermediate_cache_path.empty() || !resolve_path(_intermediate_cache_path))
14451447
{
@@ -1496,6 +1498,8 @@ void reshade::runtime::save_config() const
14961498
config.set("GENERAL", "PresetPath", relative_preset_path);
14971499
config.set("GENERAL", "PresetTransitionDelay", _preset_transition_delay);
14981500

1501+
config.set("GENERAL", "GatherGPUStatistics", _gather_gpu_statistics);
1502+
14991503
config.set("SCREENSHOT", "ClearAlpha", _screenshot_clear_alpha);
15001504
config.set("SCREENSHOT", "FileFormat", _screenshot_format);
15011505
config.set("SCREENSHOT", "FileNamingFormat", _screenshot_naming);

‎source/runtime.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ namespace reshade
244244
std::vector<texture> _textures;
245245
std::vector<technique> _techniques;
246246

247+
// === Statistics ===
248+
bool _gather_gpu_statistics = true;
249+
247250
private:
248251
/// <summary>
249252
/// Compare current version against the latest published one.

‎source/runtime_gui.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1368,6 +1368,8 @@ void reshade::runtime::draw_gui_settings()
13681368

13691369
if (ImGui::Button("Clear effect cache", ImVec2(ImGui::CalcItemWidth(), 0)))
13701370
clear_effect_cache();
1371+
1372+
modified |= ImGui::Checkbox("Gather GPU statistics", &_gather_gpu_statistics);
13711373
}
13721374

13731375
if (ImGui::CollapsingHeader("Screenshots", ImGuiTreeNodeFlags_DefaultOpen))

‎source/vulkan/runtime_vk.cpp

+17-10
Original file line numberDiff line numberDiff line change
@@ -1747,13 +1747,16 @@ void reshade::vulkan::runtime_impl::render_technique(technique &technique)
17471747
const auto impl = static_cast<technique_data *>(technique.impl);
17481748
effect_data &effect_data = _effect_data[technique.effect_index];
17491749

1750-
// Evaluate queries from oldest frame in queue
1751-
if (uint64_t timestamps[2];
1752-
vk.GetQueryPoolResults(_device, effect_data.query_pool,
1753-
impl->query_base_index + ((_framecount + 1) % NUM_QUERY_FRAMES) * 2, 2,
1754-
sizeof(timestamps), timestamps, sizeof(uint64_t), VK_QUERY_RESULT_64_BIT) == VK_SUCCESS)
1750+
if (_gather_gpu_statistics)
17551751
{
1756-
technique.average_gpu_duration.append(timestamps[1] - timestamps[0]);
1752+
// Evaluate queries from oldest frame in queue
1753+
if (uint64_t timestamps[2];
1754+
vk.GetQueryPoolResults(_device, effect_data.query_pool,
1755+
impl->query_base_index + ((_framecount + 1) % NUM_QUERY_FRAMES) * 2, 2,
1756+
sizeof(timestamps), timestamps, sizeof(uint64_t), VK_QUERY_RESULT_64_BIT) == VK_SUCCESS)
1757+
{
1758+
technique.average_gpu_duration.append(timestamps[1] - timestamps[0]);
1759+
}
17571760
}
17581761

17591762
const VkCommandBuffer cmd_list = _cmd_impl->begin_commands();
@@ -1773,9 +1776,12 @@ void reshade::vulkan::runtime_impl::render_technique(technique &technique)
17731776
}
17741777
#endif
17751778

1776-
// Reset current queries and then write time stamp value
1777-
vk.CmdResetQueryPool(cmd_list, effect_data.query_pool, impl->query_base_index + (_framecount % NUM_QUERY_FRAMES) * 2, 2);
1778-
vk.CmdWriteTimestamp(cmd_list, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, effect_data.query_pool, impl->query_base_index + (_framecount % NUM_QUERY_FRAMES) * 2);
1779+
if (_gather_gpu_statistics)
1780+
{
1781+
// Reset current queries and then write time stamp value
1782+
vk.CmdResetQueryPool(cmd_list, effect_data.query_pool, impl->query_base_index + (_framecount % NUM_QUERY_FRAMES) * 2, 2);
1783+
vk.CmdWriteTimestamp(cmd_list, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, effect_data.query_pool, impl->query_base_index + (_framecount % NUM_QUERY_FRAMES) * 2);
1784+
}
17791785

17801786
RESHADE_ADDON_EVENT(reshade_before_effects, this, _cmd_impl);
17811787

@@ -1885,7 +1891,8 @@ void reshade::vulkan::runtime_impl::render_technique(technique &technique)
18851891

18861892
RESHADE_ADDON_EVENT(reshade_after_effects, this, _cmd_impl);
18871893

1888-
vk.CmdWriteTimestamp(cmd_list, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, effect_data.query_pool, impl->query_base_index + (_framecount % NUM_QUERY_FRAMES) * 2 + 1);
1894+
if (_gather_gpu_statistics)
1895+
vk.CmdWriteTimestamp(cmd_list, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, effect_data.query_pool, impl->query_base_index + (_framecount % NUM_QUERY_FRAMES) * 2 + 1);
18891896

18901897
#ifndef NDEBUG
18911898
if (insert_debug_markers)

0 commit comments

Comments
 (0)