From dc587fa295a9edec10f8aaafd4fcb686312b4d75 Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Sat, 23 May 2015 00:38:37 -0400
Subject: video_core/utils: Remove unused variables in GetMortonOffset

---
 src/video_core/utils.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/video_core')

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);
 
-- 
cgit v1.2.3


From 951353558ef7e812d5f48f60e5ff5f9cbbfdf0fe Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Sat, 23 May 2015 00:58:32 -0400
Subject: gl_state: Remove unnecessary const specifier on Apply

---
 src/video_core/renderer_opengl/gl_state.cpp | 2 +-
 src/video_core/renderer_opengl/gl_state.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/video_core')

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;
-- 
cgit v1.2.3