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

Unified Diff: src/gpu/gl/GrGpuGL.cpp

Issue 800993002: Even more win64 warning fixes (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: more Created 6 years 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
« no previous file with comments | « no previous file | src/images/SkImageDecoder_libico.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGpuGL.cpp
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index c6cdbfab84c7991d7a871861b9895b9ae5c83aa2..a22988b01bbb8a117ea1262099dc8a934c076b25 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -718,7 +718,7 @@ bool GrGpuGL::uploadCompressedTexData(const GrSurfaceDesc& desc,
// Make sure that the width and height that we pass to OpenGL
// is a multiple of the block size.
- int dataSize = GrCompressedFormatDataSize(desc.fConfig, width, height);
+ size_t dataSize = GrCompressedFormatDataSize(desc.fConfig, width, height);
// We only need the internal format for compressed 2D textures.
GrGLenum internalFormat = 0;
@@ -734,7 +734,7 @@ bool GrGpuGL::uploadCompressedTexData(const GrSurfaceDesc& desc,
internalFormat,
width, height,
0, // border
- dataSize,
+ SkToInt(dataSize),
data));
GrGLenum error = check_alloc_error(desc, this->glInterface());
if (error != GR_GL_NO_ERROR) {
@@ -750,7 +750,7 @@ bool GrGpuGL::uploadCompressedTexData(const GrSurfaceDesc& desc,
left, top,
width, height,
internalFormat,
- dataSize,
+ SkToInt(dataSize),
data));
}
« no previous file with comments | « no previous file | src/images/SkImageDecoder_libico.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698