diff options
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) { | |||
| 236 | const size_t tile_size = 8 * 8 * bpp; | 236 | const size_t tile_size = 8 * 8 * bpp; |
| 237 | 237 | ||
| 238 | for (size_t line = 0; line < input_lines;) { | 238 | for (size_t line = 0; line < input_lines;) { |
| 239 | size_t tile_y = line / 8; | ||
| 240 | size_t max_line = line + 8; | 239 | size_t max_line = line + 8; |
| 241 | 240 | ||
| 242 | for (; line < max_line; ++line) { | 241 | 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() { | |||
| 43 | draw.shader_program = 0; | 43 | draw.shader_program = 0; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | const void OpenGLState::Apply() { | 46 | void OpenGLState::Apply() { |
| 47 | // Culling | 47 | // Culling |
| 48 | if (cull.enabled != cur_state.cull.enabled) { | 48 | if (cull.enabled != cur_state.cull.enabled) { |
| 49 | if (cull.enabled) { | 49 | 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: | |||
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | /// Apply this state as the current OpenGL state | 65 | /// Apply this state as the current OpenGL state |
| 66 | const void Apply(); | 66 | void Apply(); |
| 67 | 67 | ||
| 68 | private: | 68 | private: |
| 69 | static OpenGLState cur_state; | 69 | 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) { | |||
| 72 | // | 72 | // |
| 73 | // This pattern is what's called Z-order curve, or Morton order. | 73 | // This pattern is what's called Z-order curve, or Morton order. |
| 74 | 74 | ||
| 75 | const unsigned int block_width = 8; | ||
| 76 | const unsigned int block_height = 8; | 75 | const unsigned int block_height = 8; |
| 77 | |||
| 78 | const unsigned int coarse_x = x & ~7; | 76 | const unsigned int coarse_x = x & ~7; |
| 79 | const unsigned int coarse_y = y & ~7; | ||
| 80 | 77 | ||
| 81 | u32 i = VideoCore::MortonInterleave(x, y); | 78 | u32 i = VideoCore::MortonInterleave(x, y); |
| 82 | 79 | ||