summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-11-16 16:00:03 +0100
committerGitHub <noreply@github.com>2018-11-16 16:00:03 +0100
commit0b701751da5f1114a79078b536d57a4e5eb0321f (patch)
tree3188c4547d7316c5f78bd6ce18fc0190f2353ee3 /src
parentMerge pull request #1706 from lioncash/file-err (diff)
parentgl_state: Amend compilation warnings (diff)
downloadyuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar.gz
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar.bz2
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar.lz
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar.xz
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar.zst
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_state.cpp5
-rw-r--r--src/video_core/renderer_opengl/gl_state.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index 2635f2b0c..98622a058 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -266,7 +266,8 @@ void OpenGLState::ApplyViewport() const {
const auto& updated = viewports[0];
if (updated.x != current.x || updated.y != current.y || updated.width != current.width ||
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 ||
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& current = cur_state.blend[target];
const bool blend_changed = updated.enabled != current.enabled || force;
diff --git a/src/video_core/renderer_opengl/gl_state.h b/src/video_core/renderer_opengl/gl_state.h
index eacca0b9c..e5d1baae6 100644
--- a/src/video_core/renderer_opengl/gl_state.h
+++ b/src/video_core/renderer_opengl/gl_state.h
@@ -208,7 +208,7 @@ private:
void ApplyPrimitiveRestart() const;
void ApplyStencilTest() const;
void ApplyViewport() const;
- void ApplyTargetBlending(int target, bool force) const;
+ void ApplyTargetBlending(std::size_t target, bool force) const;
void ApplyGlobalBlending() const;
void ApplyBlending() const;
void ApplyLogicOp() const;