summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-11-13 13:08:11 +0100
committerLioncash <mathew1800@gmail.com>2018-11-13 13:10:40 +0100
commit9a0fb7d9fbe5bf855155b62030e589d503372303 (patch)
tree9796890ec8fc3ec8e7eca7837a1addacffe8f9e1
parentMerge pull request #1628 from greggameplayer/Texture2DArray (diff)
downloadyuzu-9a0fb7d9fbe5bf855155b62030e589d503372303.tar
yuzu-9a0fb7d9fbe5bf855155b62030e589d503372303.tar.gz
yuzu-9a0fb7d9fbe5bf855155b62030e589d503372303.tar.bz2
yuzu-9a0fb7d9fbe5bf855155b62030e589d503372303.tar.lz
yuzu-9a0fb7d9fbe5bf855155b62030e589d503372303.tar.xz
yuzu-9a0fb7d9fbe5bf855155b62030e589d503372303.tar.zst
yuzu-9a0fb7d9fbe5bf855155b62030e589d503372303.zip
-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;