summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Vulkan
diff options
context:
space:
mode:
authorMarkus Wick <degasus@users.noreply.github.com>2016-10-11 22:25:28 +0200
committerGitHub <noreply@github.com>2016-10-11 22:25:28 +0200
commit7d5363ffa8228dce2a606ca542a997ce06aa7be0 (patch)
treed347e0b81a18d6dabf202f76b26025f5b1079e38 /Source/Core/VideoBackends/Vulkan
parent4e46be951a3872b03352c82e4aa3def27de4f124 (diff)
parent9f264c0872603ba1963adfa706ca7a1490bd0a24 (diff)
Merge pull request #4337 from degasus/framedump
AVIDump: Move CoreTiming into caller.
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan')
-rw-r--r--Source/Core/VideoBackends/Vulkan/Renderer.cpp4
-rw-r--r--Source/Core/VideoBackends/Vulkan/Renderer.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp
index 7192f93169..77a788ae08 100644
--- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp
+++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp
@@ -460,7 +460,7 @@ void Renderer::ReinterpretPixelData(unsigned int convtype)
}
void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height,
- const EFBRectangle& rc, float gamma)
+ const EFBRectangle& rc, u64 ticks, float gamma)
{
// Flush any pending EFB pokes.
m_framebuffer_mgr->FlushEFBPokes(m_state_tracker.get());
@@ -486,7 +486,7 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height
DumpFrameData(reinterpret_cast<const u8*>(m_screenshot_readback_texture->GetMapPointer()),
static_cast<int>(m_screenshot_render_texture->GetWidth()),
static_cast<int>(m_screenshot_render_texture->GetHeight()),
- static_cast<int>(m_screenshot_readback_texture->GetRowStride()));
+ static_cast<int>(m_screenshot_readback_texture->GetRowStride()), ticks);
FinishFrameData();
}
diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.h b/Source/Core/VideoBackends/Vulkan/Renderer.h
index c97ee50a06..d3a5d42926 100644
--- a/Source/Core/VideoBackends/Vulkan/Renderer.h
+++ b/Source/Core/VideoBackends/Vulkan/Renderer.h
@@ -42,7 +42,7 @@ public:
TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) override;
void SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, const EFBRectangle& rc,
- float gamma) override;
+ u64 ticks, float gamma) override;
void ClearScreen(const EFBRectangle& rc, bool color_enable, bool alpha_enable, bool z_enable,
u32 color, u32 z) override;