diff options
| author | skidau <skidau@gmail.com> | 2014-10-25 13:48:27 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-25 13:48:27 +1100 |
| commit | bc26cb1b19993934abe375eb2f5861c2f1587f8d (patch) | |
| tree | 0bc2606599bb496af2d20e6a74889af5596a5748 /Source/Core/VideoCommon | |
| parent | 8598d6bc2b77f908ec0b9673ec342c87a07bfd75 (diff) | |
| parent | 7292ea6a043d51907c9ce1d612f144aa65048350 (diff) | |
Merge pull request #1322 from degasus/ogl-pp
OGL: force enable postprocessing
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/FramebufferManagerBase.h | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/PostProcessing.h | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index bd9eef5037..50813539ab 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -14,7 +14,7 @@ struct XFBSourceBase virtual ~XFBSourceBase() {} virtual void Draw(const MathUtil::Rectangle<int> &sourcerc, - const MathUtil::Rectangle<float> &drawrc) const = 0; + const MathUtil::Rectangle<float> &drawrc) const {}; virtual void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) = 0; diff --git a/Source/Core/VideoCommon/PostProcessing.h b/Source/Core/VideoCommon/PostProcessing.h index 0f539dbb05..68ab47cff6 100644 --- a/Source/Core/VideoCommon/PostProcessing.h +++ b/Source/Core/VideoCommon/PostProcessing.h @@ -11,6 +11,8 @@ #include "Common/StringUtil.h" #include "Common/Timer.h" +#include "VideoCommon/VideoCommon.h" + class PostProcessingShaderConfiguration { public: @@ -88,15 +90,11 @@ public: PostProcessingShaderConfiguration* GetConfig() { return &m_config; } // Should be implemented by the backends for backend specific code - virtual void BindTargetFramebuffer() = 0; - virtual void BlitToScreen() = 0; - virtual void Update(u32 width, u32 height) = 0; + virtual void BlitFromTexture(TargetRectangle src, TargetRectangle dst, + int src_texture, int src_width, int src_height) = 0; virtual void ApplyShader() = 0; protected: - bool m_enable; - u32 m_width; - u32 m_height; // Timer for determining our time value Common::Timer m_timer; |
