diff options
| author | 2018-01-01 15:40:35 -0500 | |
|---|---|---|
| committer | 2018-01-01 15:40:35 -0500 | |
| commit | 93480b10ef443dbc616a9240fe8f7456315c1940 (patch) | |
| tree | ca1f8c7f31835e3c895e72e08745789034c2758b /src/video_core | |
| parent | svc: Stub out svcWaitSynchronization. (diff) | |
| download | yuzu-93480b10ef443dbc616a9240fe8f7456315c1940.tar.gz yuzu-93480b10ef443dbc616a9240fe8f7456315c1940.tar.xz yuzu-93480b10ef443dbc616a9240fe8f7456315c1940.zip | |
core/video_core: Fix a bunch of u64 -> u32 warnings.
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/rasterizer_interface.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 4 | ||||
| -rw-r--r-- | src/video_core/swrasterizer/swrasterizer.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index 8ef7e74c7..4b099bc55 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h | |||
| @@ -36,11 +36,11 @@ public: | |||
| 36 | virtual void FlushAll() = 0; | 36 | virtual void FlushAll() = 0; |
| 37 | 37 | ||
| 38 | /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory | 38 | /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory |
| 39 | virtual void FlushRegion(PAddr addr, u32 size) = 0; | 39 | virtual void FlushRegion(PAddr addr, u64 size) = 0; |
| 40 | 40 | ||
| 41 | /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory | 41 | /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory |
| 42 | /// and invalidated | 42 | /// and invalidated |
| 43 | virtual void FlushAndInvalidateRegion(PAddr addr, u32 size) = 0; | 43 | virtual void FlushAndInvalidateRegion(PAddr addr, u64 size) = 0; |
| 44 | 44 | ||
| 45 | /// Attempt to use a faster method to perform a display transfer with is_texture_copy = 0 | 45 | /// Attempt to use a faster method to perform a display transfer with is_texture_copy = 0 |
| 46 | virtual bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) { | 46 | virtual bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) { |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 7e09e4712..becaf7bde 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -889,12 +889,12 @@ void RasterizerOpenGL::FlushAll() { | |||
| 889 | res_cache.FlushAll(); | 889 | res_cache.FlushAll(); |
| 890 | } | 890 | } |
| 891 | 891 | ||
| 892 | void RasterizerOpenGL::FlushRegion(PAddr addr, u32 size) { | 892 | void RasterizerOpenGL::FlushRegion(PAddr addr, u64 size) { |
| 893 | MICROPROFILE_SCOPE(OpenGL_CacheManagement); | 893 | MICROPROFILE_SCOPE(OpenGL_CacheManagement); |
| 894 | res_cache.FlushRegion(addr, size, nullptr, false); | 894 | res_cache.FlushRegion(addr, size, nullptr, false); |
| 895 | } | 895 | } |
| 896 | 896 | ||
| 897 | void RasterizerOpenGL::FlushAndInvalidateRegion(PAddr addr, u32 size) { | 897 | void RasterizerOpenGL::FlushAndInvalidateRegion(PAddr addr, u64 size) { |
| 898 | MICROPROFILE_SCOPE(OpenGL_CacheManagement); | 898 | MICROPROFILE_SCOPE(OpenGL_CacheManagement); |
| 899 | res_cache.FlushRegion(addr, size, nullptr, true); | 899 | res_cache.FlushRegion(addr, size, nullptr, true); |
| 900 | } | 900 | } |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 46c62961c..d02c157e8 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -42,8 +42,8 @@ public: | |||
| 42 | void DrawTriangles() override; | 42 | void DrawTriangles() override; |
| 43 | void NotifyPicaRegisterChanged(u32 id) override; | 43 | void NotifyPicaRegisterChanged(u32 id) override; |
| 44 | void FlushAll() override; | 44 | void FlushAll() override; |
| 45 | void FlushRegion(PAddr addr, u32 size) override; | 45 | void FlushRegion(PAddr addr, u64 size) override; |
| 46 | void FlushAndInvalidateRegion(PAddr addr, u32 size) override; | 46 | void FlushAndInvalidateRegion(PAddr addr, u64 size) override; |
| 47 | bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) override; | 47 | bool AccelerateDisplayTransfer(const GPU::Regs::DisplayTransferConfig& config) override; |
| 48 | bool AccelerateTextureCopy(const GPU::Regs::DisplayTransferConfig& config) override; | 48 | bool AccelerateTextureCopy(const GPU::Regs::DisplayTransferConfig& config) override; |
| 49 | bool AccelerateFill(const GPU::Regs::MemoryFillConfig& config) override; | 49 | bool AccelerateFill(const GPU::Regs::MemoryFillConfig& config) override; |
diff --git a/src/video_core/swrasterizer/swrasterizer.h b/src/video_core/swrasterizer/swrasterizer.h index 6d42d7409..04ebd5312 100644 --- a/src/video_core/swrasterizer/swrasterizer.h +++ b/src/video_core/swrasterizer/swrasterizer.h | |||
| @@ -21,7 +21,7 @@ class SWRasterizer : public RasterizerInterface { | |||
| 21 | void DrawTriangles() override {} | 21 | void DrawTriangles() override {} |
| 22 | void NotifyPicaRegisterChanged(u32 id) override {} | 22 | void NotifyPicaRegisterChanged(u32 id) override {} |
| 23 | void FlushAll() override {} | 23 | void FlushAll() override {} |
| 24 | void FlushRegion(PAddr addr, u32 size) override {} | 24 | void FlushRegion(PAddr addr, u64 size) override {} |
| 25 | void FlushAndInvalidateRegion(PAddr addr, u32 size) override {} | 25 | void FlushAndInvalidateRegion(PAddr addr, u64 size) override {} |
| 26 | }; | 26 | }; |
| 27 | } | 27 | } |