summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Null
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/Null
parent4e46be951a3872b03352c82e4aa3def27de4f124 (diff)
parent9f264c0872603ba1963adfa706ca7a1490bd0a24 (diff)
Merge pull request #4337 from degasus/framedump
AVIDump: Move CoreTiming into caller.
Diffstat (limited to 'Source/Core/VideoBackends/Null')
-rw-r--r--Source/Core/VideoBackends/Null/Render.cpp2
-rw-r--r--Source/Core/VideoBackends/Null/Render.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/Null/Render.cpp b/Source/Core/VideoBackends/Null/Render.cpp
index fa26955ced..55e84be99d 100644
--- a/Source/Core/VideoBackends/Null/Render.cpp
+++ b/Source/Core/VideoBackends/Null/Render.cpp
@@ -38,7 +38,7 @@ TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
return result;
}
-void Renderer::SwapImpl(u32, u32, u32, u32, const EFBRectangle&, float)
+void Renderer::SwapImpl(u32, u32, u32, u32, const EFBRectangle&, u64, float)
{
UpdateActiveConfig();
}
diff --git a/Source/Core/VideoBackends/Null/Render.h b/Source/Core/VideoBackends/Null/Render.h
index 73e35d886d..0c2bd035c2 100644
--- a/Source/Core/VideoBackends/Null/Render.h
+++ b/Source/Core/VideoBackends/Null/Render.h
@@ -23,7 +23,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 colorEnable, bool alphaEnable, bool zEnable,
u32 color, u32 z) override