diff options
Diffstat (limited to 'src/video_core')
-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 |
3 files changed, 2 insertions, 5 deletions
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); |