summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-11-16 07:00:03 -0800
committerGravatar GitHub2018-11-16 07:00:03 -0800
commit0b701751da5f1114a79078b536d57a4e5eb0321f (patch)
tree3188c4547d7316c5f78bd6ce18fc0190f2353ee3 /src
parentMerge pull request #1706 from lioncash/file-err (diff)
parentgl_state: Amend compilation warnings (diff)
downloadyuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar.gz
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.tar.xz
yuzu-0b701751da5f1114a79078b536d57a4e5eb0321f.zip
Merge pull request #1676 from lioncash/warn
gl_state: Amend compilation warnings
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 {
266 const auto& updated = viewports[0]; 266 const auto& updated = viewports[0];
267 if (updated.x != current.x || updated.y != current.y || updated.width != current.width || 267 if (updated.x != current.x || updated.y != current.y || updated.width != current.width ||
268 updated.height != current.height) { 268 updated.height != current.height) {
269 glViewport(updated.x, updated.y, updated.width, updated.height); 269 glViewport(static_cast<GLint>(updated.x), static_cast<GLint>(updated.y),
270 static_cast<GLsizei>(updated.width), static_cast<GLsizei>(updated.height));
270 } 271 }
271 if (updated.depth_range_near != current.depth_range_near || 272 if (updated.depth_range_near != current.depth_range_near ||
272 updated.depth_range_far != current.depth_range_far) { 273 updated.depth_range_far != current.depth_range_far) {
@@ -313,7 +314,7 @@ void OpenGLState::ApplyGlobalBlending() const {
313 } 314 }
314} 315}
315 316
316void OpenGLState::ApplyTargetBlending(int target, bool force) const { 317void OpenGLState::ApplyTargetBlending(std::size_t target, bool force) const {
317 const Blend& updated = blend[target]; 318 const Blend& updated = blend[target];
318 const Blend& current = cur_state.blend[target]; 319 const Blend& current = cur_state.blend[target];
319 const bool blend_changed = updated.enabled != current.enabled || force; 320 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:
208 void ApplyPrimitiveRestart() const; 208 void ApplyPrimitiveRestart() const;
209 void ApplyStencilTest() const; 209 void ApplyStencilTest() const;
210 void ApplyViewport() const; 210 void ApplyViewport() const;
211 void ApplyTargetBlending(int target, bool force) const; 211 void ApplyTargetBlending(std::size_t target, bool force) const;
212 void ApplyGlobalBlending() const; 212 void ApplyGlobalBlending() const;
213 void ApplyBlending() const; 213 void ApplyBlending() const;
214 void ApplyLogicOp() const; 214 void ApplyLogicOp() const;