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

Unified Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 2762014: Mac: clang build (Closed)
Patch Set: comments Created 10 years, 3 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/client/gles2_implementation.cc
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index 6dad4e22d8a46a362d867e2e9a10116a8c51123b..58ddd2b2b75d6f085c4ce8e4113fefea3c56a8cb 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -311,8 +311,8 @@ class ClientSideBufferHelper {
size_t bytes_per_element =
GLES2Util::GetGLTypeSizeForTexturesAndBuffers(info.type()) *
info.size();
- GLsizei real_stride =
- info.stride() ? info.stride() : bytes_per_element;
+ GLsizei real_stride = info.stride() ?
+ info.stride() : static_cast<GLsizei>(bytes_per_element);
GLsizei bytes_collected = CollectData(
info.pointer(), bytes_per_element, real_stride, num_elements);
gl->BufferSubData(
@@ -814,8 +814,8 @@ void GLES2Implementation::ShaderSource(
uint32 total_size = 1;
for (GLsizei ii = 0; ii < count; ++ii) {
if (source[ii]) {
- total_size +=
- (length && length[ii] >= 0) ? length[ii] : strlen(source[ii]);
+ total_size += (length && length[ii] >= 0) ?
+ static_cast<size_t>(length[ii]) : strlen(source[ii]);
}
}
@@ -826,7 +826,8 @@ void GLES2Implementation::ShaderSource(
for (GLsizei ii = 0; ii <= count; ++ii) {
const char* src = ii < count ? source[ii] : "";
if (src) {
- uint32 size = ii < count ? (length ? length[ii] : strlen(src)) : 1;
+ uint32 size = ii < count ?
+ (length ? static_cast<size_t>(length[ii]) : strlen(src)) : 1;
while (size) {
uint32 part_size = std::min(size, max_size);
void* buffer = transfer_buffer_.Alloc(part_size);

Powered by Google App Engine
This is Rietveld 408576698