franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1676 from lioncash/warn 

gl_state: Amend compilation warnings
This commit is contained in:
bunnei 2018-11-16 07:00:03 -08:00 committed by GitHub
parent 238bc4a077 9a0fb7d9fb
commit 0b701751da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,7 +266,8 @@ void OpenGLState::ApplyViewport() const {
const auto& updated = viewports[0]; const auto& updated = viewports[0];
if (updated.x != current.x || updated.y != current.y || updated.width != current.width || if (updated.x != current.x || updated.y != current.y || updated.width != current.width ||
updated.height != current.height) { updated.height != current.height) {
glViewport(updated.x, updated.y, updated.width, updated.height); glViewport(static_cast<GLint>(updated.x), static_cast<GLint>(updated.y),
static_cast<GLsizei>(updated.width), static_cast<GLsizei>(updated.height));
} }
if (updated.depth_range_near != current.depth_range_near || if (updated.depth_range_near != current.depth_range_near ||
updated.depth_range_far != current.depth_range_far) { updated.depth_range_far != current.depth_range_far) {
@ -313,7 +314,7 @@ void OpenGLState::ApplyGlobalBlending() const {
} }
} }
void OpenGLState::ApplyTargetBlending(int target, bool force) const { void OpenGLState::ApplyTargetBlending(std::size_t target, bool force) const {
const Blend& updated = blend[target]; const Blend& updated = blend[target];
const Blend& current = cur_state.blend[target]; const Blend& current = cur_state.blend[target];
const bool blend_changed = updated.enabled != current.enabled || force; const bool blend_changed = updated.enabled != current.enabled || force;

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

@ -208,7 +208,7 @@ private:
void ApplyPrimitiveRestart() const; void ApplyPrimitiveRestart() const;
void ApplyStencilTest() const; void ApplyStencilTest() const;
void ApplyViewport() const; void ApplyViewport() const;
void ApplyTargetBlending(int target, bool force) const; void ApplyTargetBlending(std::size_t target, bool force) const;
void ApplyGlobalBlending() const; void ApplyGlobalBlending() const;
void ApplyBlending() const; void ApplyBlending() const;
void ApplyLogicOp() const; void ApplyLogicOp() const;