CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

src/CMakeLists: Enforce multiple warnings on MSVC (#5692)

Browse Source
This commit is contained in:
Tobias
2022-11-09 23:14:28 +01:00
committed by GitHub
parent 38b8bf12de
commit bb05d8c12a
10 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/renderer_opengl/gl_shader_manager.cpp
View File

@@ -93,8 +93,9 @@ static void SetShaderUniformBlockBinding(GLuint shader, const char* name, Unifor
}
GLint ub_size = 0;
glGetActiveUniformBlockiv(shader, ub_index, GL_UNIFORM_BLOCK_DATA_SIZE, &ub_size);
ASSERT_MSG(ub_size == expected_size, "Uniform block size did not match! Got {}, expected {}",
static_cast<int>(ub_size), expected_size);
ASSERT_MSG(static_cast<std::size_t>(ub_size) == expected_size,
"Uniform block size did not match! Got {}, expected {}", static_cast<int>(ub_size),
expected_size);
glUniformBlockBinding(shader, ub_index, static_cast<GLuint>(binding));
}

3
src/video_core/shader/shader_jit_x64_compiler.cpp
View File

@@ -192,7 +192,8 @@ void JitShader::Compile_SwizzleSrc(Instruction instr, unsigned src_num, SourceRe
}
int src_offset_disp = (int)src_offset;
ASSERT_MSG(src_offset == src_offset_disp, "Source register offset too large for int type");
ASSERT_MSG(src_offset == static_cast<std::size_t>(src_offset_disp),
"Source register offset too large for int type");
unsigned operand_desc_id;