From eb6d7019c477673c57f1fbde224d5b8ae8919019 Mon Sep 17 00:00:00 2001
From: "apatrick@google.com"
<apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 25 Sep 2009 00:42:51 +0000
Subject: [PATCH] Fixed some warnings.
Review URL: http://codereview.chromium.org/231027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27159 0039d316-1c4b-4281-b951-d872f2087c98
---
.../service/cross/gl/effect_gl.cc | 4 ++--
.../service/cross/gl/geometry_gl.cc | 4 ++--
.../service/cross/gl/sampler_gl.cc | 2 +-
.../service/cross/gl/texture_gl.cc | 18 +++++++++---------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/o3d/command_buffer/service/cross/gl/effect_gl.cc b/o3d/command_buffer/service/cross/gl/effect_gl.cc
index 3c0baf677601a..41701acbb1a26 100644
--- a/o3d/command_buffer/service/cross/gl/effect_gl.cc
+++ b/o3d/command_buffer/service/cross/gl/effect_gl.cc
@@ -218,7 +218,7 @@ bool EffectParamGL::SetData(GAPIGL *gapi,
break;
}
case effect_param::SAMPLER: {
- DCHECK_GE(low_level_param.sampler_ids.size(), 1);
+ DCHECK_GE(low_level_param.sampler_ids.size(), 1U);
low_level_param.sampler_ids[0] = *static_cast<const ResourceID *>(data);
if (effect_ == gapi->current_effect()) {
gapi->DirtyEffect();
@@ -445,7 +445,7 @@ void EffectGL::AddLowLevelParams(CGprogram prog, CGenum name_space, bool vp) {
int num_elements;
if (cg_type == CG_ARRAY) {
num_elements = cgGetArraySize(cg_param, 0);
- // Substitute the first element's type for our type.
+ // Substitute the first element's type for our type.
cg_type = cgGetParameterType(cgGetArrayParameter(cg_param, 0));
} else {
num_elements = 0;
diff --git a/o3d/command_buffer/service/cross/gl/geometry_gl.cc b/o3d/command_buffer/service/cross/gl/geometry_gl.cc
index 58bf819a7e32d..8452d04b17d60 100644
--- a/o3d/command_buffer/service/cross/gl/geometry_gl.cc
+++ b/o3d/command_buffer/service/cross/gl/geometry_gl.cc
@@ -242,10 +242,10 @@ inline unsigned int GetAttribIndex(vertex_struct::Semantic semantic,
DCHECK_EQ(semantic_index, 0);
return 2;
case vertex_struct::COLOR:
- DCHECK_LT(semantic_index, 2);
+ DCHECK_LT(semantic_index, 2U);
return 3 + semantic_index;
case vertex_struct::TEX_COORD:
- DCHECK_LT(semantic_index, 8);
+ DCHECK_LT(semantic_index, 8U);
return 8 + semantic_index;
default:
DLOG(FATAL) << "Not reached.";
diff --git a/o3d/command_buffer/service/cross/gl/sampler_gl.cc b/o3d/command_buffer/service/cross/gl/sampler_gl.cc
index 6bcc948831a98..28ba32458a6c2 100644
--- a/o3d/command_buffer/service/cross/gl/sampler_gl.cc
+++ b/o3d/command_buffer/service/cross/gl/sampler_gl.cc
@@ -157,7 +157,7 @@ void SamplerGL::SetStates(sampler::AddressingMode addressing_u,
// These are validated in GAPIDecoder.cc
DCHECK_NE(mag_filter, sampler::NONE);
DCHECK_NE(min_filter, sampler::NONE);
- DCHECK_GT(max_anisotropy, 0);
+ DCHECK_GT(max_anisotropy, 0U);
gl_wrap_s_ = GLAddressMode(addressing_u);
gl_wrap_t_ = GLAddressMode(addressing_v);
gl_wrap_r_ = GLAddressMode(addressing_w);
diff --git a/o3d/command_buffer/service/cross/gl/texture_gl.cc b/o3d/command_buffer/service/cross/gl/texture_gl.cc
index 6dcdd09be5379..96a5771490a34 100644
--- a/o3d/command_buffer/service/cross/gl/texture_gl.cc
+++ b/o3d/command_buffer/service/cross/gl/texture_gl.cc
@@ -209,9 +209,9 @@ Texture2DGL *Texture2DGL::Create(unsigned int width,
texture::Format format,
unsigned int flags,
bool enable_render_surfaces) {
- DCHECK_GT(width, 0);
- DCHECK_GT(height, 0);
- DCHECK_GT(levels, 0);
+ DCHECK_GT(width, 0U);
+ DCHECK_GT(height, 0U);
+ DCHECK_GT(levels, 0U);
GLenum gl_internal_format = 0;
GLenum gl_format = 0;
GLenum gl_type = 0;
@@ -347,10 +347,10 @@ Texture3DGL *Texture3DGL::Create(unsigned int width,
texture::Format format,
unsigned int flags,
bool enable_render_surfaces) {
- DCHECK_GT(width, 0);
- DCHECK_GT(height, 0);
- DCHECK_GT(depth, 0);
- DCHECK_GT(levels, 0);
+ DCHECK_GT(width, 0U);
+ DCHECK_GT(height, 0U);
+ DCHECK_GT(depth, 0U);
+ DCHECK_GT(levels, 0U);
GLenum gl_internal_format = 0;
GLenum gl_format = 0;
GLenum gl_type = 0;
@@ -474,8 +474,8 @@ TextureCubeGL *TextureCubeGL::Create(unsigned int side,
texture::Format format,
unsigned int flags,
bool enable_render_surfaces) {
- DCHECK_GT(side, 0);
- DCHECK_GT(levels, 0);
+ DCHECK_GT(side, 0U);
+ DCHECK_GT(levels, 0U);
GLenum gl_internal_format = 0;
GLenum gl_format = 0;
GLenum gl_type = 0;
--
GitLab