Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #805 from lioncash/warn

Browse source 
video_core/core: Get rid of more warnings.
This commit is contained in:
Lioncash 2015-05-23 17:28:39 -04:00
commit 513f6a277e
4 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/hle/service/y2r_u.cpp
View file

@ -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) {

2
src/video_core/renderer_opengl/gl_state.cpp
View file

@ -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) {

2
src/video_core/renderer_opengl/gl_state.h
View file

@ -63,7 +63,7 @@ public:
}
/// Apply this state as the current OpenGL state
const void Apply();
void Apply();
private:
static OpenGLState cur_state;

3
src/video_core/utils.h
View file

@ -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);