Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1932)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 375733004: Fixes for re-enabling more MSVC level 4 warnings: gpu/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index b06fb9a371f55fb80d6cf9d57fc02c6a7457f52c..ec6986ae630d69f120ae952361e7d643936a954c 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -103,8 +103,8 @@ GLES2DecoderTestBase::GLES2DecoderTestBase()
cached_color_mask_blue_(true),
cached_color_mask_alpha_(true),
cached_depth_mask_(true),
- cached_stencil_front_mask_(0xFFFFFFFFU),
- cached_stencil_back_mask_(0xFFFFFFFFU) {
+ cached_stencil_front_mask_(static_cast<GLuint>(-1)),
+ cached_stencil_back_mask_(static_cast<GLuint>(-1)) {
memset(immediate_buffer_, 0xEE, sizeof(immediate_buffer_));
}
@@ -730,8 +730,8 @@ void GLES2DecoderTestBase::SetupExpectationsForDepthMask(bool mask) {
}
}
-void GLES2DecoderTestBase::SetupExpectationsForStencilMask(uint32 front_mask,
- uint32 back_mask) {
+void GLES2DecoderTestBase::SetupExpectationsForStencilMask(GLuint front_mask,
+ GLuint back_mask) {
if (ignore_cached_state_for_test_ ||
cached_stencil_front_mask_ != front_mask) {
cached_stencil_front_mask_ = front_mask;

Powered by Google App Engine
This is Rietveld 408576698