From dc587fa295a9edec10f8aaafd4fcb686312b4d75 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 23 May 2015 00:38:37 -0400
Subject: [PATCH 1/3] video_core/utils: Remove unused variables in
GetMortonOffset
---
src/video_core/utils.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/video_core/utils.h b/src/video_core/utils.h
index ffb3e73a3c..4fa60a10ed 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);
From ebca3a490223b9f78728b79f02b810728cca77aa Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 23 May 2015 00:46:22 -0400
Subject: [PATCH 2/3] y2r_u: Remove unused variable in StartConversion
---
src/core/hle/service/y2r_u.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp
index 15987e0289..19bfde7565 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) {
From 951353558ef7e812d5f48f60e5ff5f9cbbfdf0fe Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 23 May 2015 00:58:32 -0400
Subject: [PATCH 3/3] 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(-)
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index 938edf1c26..1afa58c99b 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 a56d313712..281b7cad5f 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;