summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-08-10 18:50:38 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-08-21 18:14:27 +0200
commit83ec2091c1836bf32e9070d0ddf2a53288871d69 (patch)
tree01e8cc762d81d04ede0cb712288b018273e4376a
parentBuffer_Cache: Implement flushing. (diff)
downloadyuzu-83ec2091c1836bf32e9070d0ddf2a53288871d69.tar
yuzu-83ec2091c1836bf32e9070d0ddf2a53288871d69.tar.gz
yuzu-83ec2091c1836bf32e9070d0ddf2a53288871d69.tar.bz2
yuzu-83ec2091c1836bf32e9070d0ddf2a53288871d69.tar.lz
yuzu-83ec2091c1836bf32e9070d0ddf2a53288871d69.tar.xz
yuzu-83ec2091c1836bf32e9070d0ddf2a53288871d69.tar.zst
yuzu-83ec2091c1836bf32e9070d0ddf2a53288871d69.zip
-rw-r--r--src/video_core/buffer_cache/buffer_block.h7
-rw-r--r--src/video_core/renderer_opengl/gl_buffer_cache.h6
2 files changed, 6 insertions, 7 deletions
diff --git a/src/video_core/buffer_cache/buffer_block.h b/src/video_core/buffer_cache/buffer_block.h
index 2c739a586..d2124443f 100644
--- a/src/video_core/buffer_cache/buffer_block.h
+++ b/src/video_core/buffer_cache/buffer_block.h
@@ -19,8 +19,8 @@ public:
return (cache_addr < end) && (cache_addr_end > start);
}
- bool IsInside(const CacheAddr other_start, const CacheAddr other_end) {
- return (cache_addr <= other_start && other_end <= cache_addr_end);
+ bool IsInside(const CacheAddr other_start, const CacheAddr other_end) const {
+ return cache_addr <= other_start && other_end <= cache_addr_end;
}
u8* GetWritableHostPtr() const {
@@ -61,8 +61,7 @@ public:
}
protected:
- explicit BufferBlock(CacheAddr cache_addr,const std::size_t size)
- : size{size} {
+ explicit BufferBlock(CacheAddr cache_addr, const std::size_t size) : size{size} {
SetCacheAddr(cache_addr);
}
~BufferBlock() = default;
diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h
index fb93f22dd..022e7bfa9 100644
--- a/src/video_core/renderer_opengl/gl_buffer_cache.h
+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h
@@ -54,13 +54,13 @@ protected:
const GLuint* ToHandle(const Buffer& buffer) override;
void UploadBlockData(const Buffer& buffer, std::size_t offset, std::size_t size,
- const u8* data) override;
+ const u8* data) override;
void DownloadBlockData(const Buffer& buffer, std::size_t offset, std::size_t size,
- u8* data) override;
+ u8* data) override;
void CopyBlock(const Buffer& src, const Buffer& dst, std::size_t src_offset,
- std::size_t dst_offset, std::size_t size) override;
+ std::size_t dst_offset, std::size_t size) override;
};
} // namespace OpenGL