diff options
| author | 2016-04-29 00:07:10 -0700 | |
|---|---|---|
| committer | 2016-04-29 00:07:10 -0700 | |
| commit | e3a8292495cf0fb4297be27c696649dc44e011f0 (patch) | |
| tree | f188b106e2d1b39ed7a87972db9f942e15987375 /src/video_core | |
| parent | Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709) (diff) | |
| download | yuzu-e3a8292495cf0fb4297be27c696649dc44e011f0.tar.gz yuzu-e3a8292495cf0fb4297be27c696649dc44e011f0.tar.xz yuzu-e3a8292495cf0fb4297be27c696649dc44e011f0.zip | |
Common: Remove section measurement from profiler (#1731)
This has been entirely superseded by MicroProfile. The rest of the code
can go when a simpler frametime/FPS meter is added to the GUI.
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/command_processor.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/rasterizer.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/shader/shader.cpp | 3 |
4 files changed, 0 insertions, 11 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index 3abe79c09..97ba8214e 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | #include "common/alignment.h" | 8 | #include "common/alignment.h" |
| 9 | #include "common/microprofile.h" | 9 | #include "common/microprofile.h" |
| 10 | #include "common/profiler.h" | ||
| 11 | 10 | ||
| 12 | #include "core/settings.h" | 11 | #include "core/settings.h" |
| 13 | #include "core/hle/service/gsp_gpu.h" | 12 | #include "core/hle/service/gsp_gpu.h" |
| @@ -35,8 +34,6 @@ static int default_attr_counter = 0; | |||
| 35 | 34 | ||
| 36 | static u32 default_attr_write_buffer[3]; | 35 | static u32 default_attr_write_buffer[3]; |
| 37 | 36 | ||
| 38 | Common::Profiling::TimingCategory category_drawing("Drawing"); | ||
| 39 | |||
| 40 | // Expand a 4-bit mask to 4-byte mask, e.g. 0b0101 -> 0x00FF00FF | 37 | // Expand a 4-bit mask to 4-byte mask, e.g. 0b0101 -> 0x00FF00FF |
| 41 | static const u32 expand_bits_to_bytes[] = { | 38 | static const u32 expand_bits_to_bytes[] = { |
| 42 | 0x00000000, 0x000000ff, 0x0000ff00, 0x0000ffff, | 39 | 0x00000000, 0x000000ff, 0x0000ff00, 0x0000ffff, |
| @@ -186,7 +183,6 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 186 | case PICA_REG_INDEX(trigger_draw): | 183 | case PICA_REG_INDEX(trigger_draw): |
| 187 | case PICA_REG_INDEX(trigger_draw_indexed): | 184 | case PICA_REG_INDEX(trigger_draw_indexed): |
| 188 | { | 185 | { |
| 189 | Common::Profiling::ScopeTimer scope_timer(category_drawing); | ||
| 190 | MICROPROFILE_SCOPE(GPU_Drawing); | 186 | MICROPROFILE_SCOPE(GPU_Drawing); |
| 191 | 187 | ||
| 192 | #if PICA_LOG_TEV | 188 | #if PICA_LOG_TEV |
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 0434ad05a..9cf77b1f2 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | #include "common/math_util.h" | 10 | #include "common/math_util.h" |
| 11 | #include "common/microprofile.h" | 11 | #include "common/microprofile.h" |
| 12 | #include "common/profiler.h" | ||
| 13 | 12 | ||
| 14 | #include "core/memory.h" | 13 | #include "core/memory.h" |
| 15 | #include "core/hw/gpu.h" | 14 | #include "core/hw/gpu.h" |
| @@ -287,7 +286,6 @@ static int SignedArea (const Math::Vec2<Fix12P4>& vtx1, | |||
| 287 | return Math::Cross(vec1, vec2).z; | 286 | return Math::Cross(vec1, vec2).z; |
| 288 | }; | 287 | }; |
| 289 | 288 | ||
| 290 | static Common::Profiling::TimingCategory rasterization_category("Rasterization"); | ||
| 291 | MICROPROFILE_DEFINE(GPU_Rasterization, "GPU", "Rasterization", MP_RGB(50, 50, 240)); | 289 | MICROPROFILE_DEFINE(GPU_Rasterization, "GPU", "Rasterization", MP_RGB(50, 50, 240)); |
| 292 | 290 | ||
| 293 | /** | 291 | /** |
| @@ -300,7 +298,6 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, | |||
| 300 | bool reversed = false) | 298 | bool reversed = false) |
| 301 | { | 299 | { |
| 302 | const auto& regs = g_state.regs; | 300 | const auto& regs = g_state.regs; |
| 303 | Common::Profiling::ScopeTimer timer(rasterization_category); | ||
| 304 | MICROPROFILE_SCOPE(GPU_Rasterization); | 301 | MICROPROFILE_SCOPE(GPU_Rasterization); |
| 305 | 302 | ||
| 306 | // vertex positions in rasterizer coordinates | 303 | // vertex positions in rasterizer coordinates |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 30187d4cf..a8c775c80 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include "common/file_util.h" | 11 | #include "common/file_util.h" |
| 12 | #include "common/math_util.h" | 12 | #include "common/math_util.h" |
| 13 | #include "common/microprofile.h" | 13 | #include "common/microprofile.h" |
| 14 | #include "common/profiler.h" | ||
| 15 | 14 | ||
| 16 | #include "core/memory.h" | 15 | #include "core/memory.h" |
| 17 | #include "core/settings.h" | 16 | #include "core/settings.h" |
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index 75301accd..043e99190 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #include "common/hash.h" | 10 | #include "common/hash.h" |
| 11 | #include "common/microprofile.h" | 11 | #include "common/microprofile.h" |
| 12 | #include "common/profiler.h" | ||
| 13 | 12 | ||
| 14 | #include "video_core/debug_utils/debug_utils.h" | 13 | #include "video_core/debug_utils/debug_utils.h" |
| 15 | #include "video_core/pica.h" | 14 | #include "video_core/pica.h" |
| @@ -57,13 +56,11 @@ void Shutdown() { | |||
| 57 | #endif // ARCHITECTURE_x86_64 | 56 | #endif // ARCHITECTURE_x86_64 |
| 58 | } | 57 | } |
| 59 | 58 | ||
| 60 | static Common::Profiling::TimingCategory shader_category("Vertex Shader"); | ||
| 61 | MICROPROFILE_DEFINE(GPU_VertexShader, "GPU", "Vertex Shader", MP_RGB(50, 50, 240)); | 59 | MICROPROFILE_DEFINE(GPU_VertexShader, "GPU", "Vertex Shader", MP_RGB(50, 50, 240)); |
| 62 | 60 | ||
| 63 | OutputVertex Run(UnitState<false>& state, const InputVertex& input, int num_attributes) { | 61 | OutputVertex Run(UnitState<false>& state, const InputVertex& input, int num_attributes) { |
| 64 | auto& config = g_state.regs.vs; | 62 | auto& config = g_state.regs.vs; |
| 65 | 63 | ||
| 66 | Common::Profiling::ScopeTimer timer(shader_category); | ||
| 67 | MICROPROFILE_SCOPE(GPU_VertexShader); | 64 | MICROPROFILE_SCOPE(GPU_VertexShader); |
| 68 | 65 | ||
| 69 | state.program_counter = config.main_offset; | 66 | state.program_counter = config.main_offset; |