Merge pull request #805 from lioncash/warn
video_core/core: Get rid of more warnings.
This commit is contained in:
commit
513f6a277e
|
@ -236,7 +236,6 @@ static void StartConversion(Service::Interface* self) {
|
||||||
const size_t tile_size = 8 * 8 * bpp;
|
const size_t tile_size = 8 * 8 * bpp;
|
||||||
|
|
||||||
for (size_t line = 0; line < input_lines;) {
|
for (size_t line = 0; line < input_lines;) {
|
||||||
size_t tile_y = line / 8;
|
|
||||||
size_t max_line = line + 8;
|
size_t max_line = line + 8;
|
||||||
|
|
||||||
for (; line < max_line; ++line) {
|
for (; line < max_line; ++line) {
|
||||||
|
|
|
@ -43,7 +43,7 @@ OpenGLState::OpenGLState() {
|
||||||
draw.shader_program = 0;
|
draw.shader_program = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const void OpenGLState::Apply() {
|
void OpenGLState::Apply() {
|
||||||
// Culling
|
// Culling
|
||||||
if (cull.enabled != cur_state.cull.enabled) {
|
if (cull.enabled != cur_state.cull.enabled) {
|
||||||
if (cull.enabled) {
|
if (cull.enabled) {
|
||||||
|
|
|
@ -63,7 +63,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Apply this state as the current OpenGL state
|
/// Apply this state as the current OpenGL state
|
||||||
const void Apply();
|
void Apply();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static OpenGLState cur_state;
|
static OpenGLState cur_state;
|
||||||
|
|
|
@ -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.
|
// 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 block_height = 8;
|
||||||
|
|
||||||
const unsigned int coarse_x = x & ~7;
|
const unsigned int coarse_x = x & ~7;
|
||||||
const unsigned int coarse_y = y & ~7;
|
|
||||||
|
|
||||||
u32 i = VideoCore::MortonInterleave(x, y);
|
u32 i = VideoCore::MortonInterleave(x, y);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue