diff options
author | Lioncash <mathew1800@gmail.com> | 2015-05-23 23:28:39 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-05-23 23:28:39 +0200 |
commit | 513f6a277e0261b1a4d336daeac1133db46213ab (patch) | |
tree | d6f268517918f33c2cb1fa503a46a74e04313dca /src | |
parent | Merge pull request #806 from yuriks/annoying-qt-warning (diff) | |
parent | gl_state: Remove unnecessary const specifier on Apply (diff) | |
download | yuzu-513f6a277e0261b1a4d336daeac1133db46213ab.tar yuzu-513f6a277e0261b1a4d336daeac1133db46213ab.tar.gz yuzu-513f6a277e0261b1a4d336daeac1133db46213ab.tar.bz2 yuzu-513f6a277e0261b1a4d336daeac1133db46213ab.tar.lz yuzu-513f6a277e0261b1a4d336daeac1133db46213ab.tar.xz yuzu-513f6a277e0261b1a4d336daeac1133db46213ab.tar.zst yuzu-513f6a277e0261b1a4d336daeac1133db46213ab.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/service/y2r_u.cpp | 1 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.h | 2 | ||||
-rw-r--r-- | src/video_core/utils.h | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp index 15987e028..19bfde756 100644 --- a/src/core/hle/service/y2r_u.cpp +++ b/src/core/hle/service/y2r_u.cpp @@ -236,7 +236,6 @@ static void StartConversion(Service::Interface* self) { const size_t tile_size = 8 * 8 * bpp; for (size_t line = 0; line < input_lines;) { - size_t tile_y = line / 8; size_t max_line = line + 8; for (; line < max_line; ++line) { diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index 938edf1c2..1afa58c99 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -43,7 +43,7 @@ OpenGLState::OpenGLState() { draw.shader_program = 0; } -const void OpenGLState::Apply() { +void OpenGLState::Apply() { // Culling if (cull.enabled != cur_state.cull.enabled) { if (cull.enabled) { diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h index a56d31371..281b7cad5 100644 --- a/src/video_core/renderer_opengl/gl_state.h +++ b/src/video_core/renderer_opengl/gl_state.h @@ -63,7 +63,7 @@ public: } /// Apply this state as the current OpenGL state - const void Apply(); + void Apply(); private: static OpenGLState cur_state; diff --git a/src/video_core/utils.h b/src/video_core/utils.h index ffb3e73a3..4fa60a10e 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h @@ -72,11 +72,8 @@ static inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) { // // This pattern is what's called Z-order curve, or Morton order. - const unsigned int block_width = 8; const unsigned int block_height = 8; - const unsigned int coarse_x = x & ~7; - const unsigned int coarse_y = y & ~7; u32 i = VideoCore::MortonInterleave(x, y); |