commit 4277f01736574293d6e858341b6bbebe7b8b7978
author Robert Phillips <robertphillips@google.com> Tue Jan 21 14:28:34 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 21 20:11:13 2020 +0000
tree 8a92e74dba7937f905f78c5faa6042679cf061ac
parent cc4520387305a773484fa9ab785770fbf7206524

mv BackendTextureData to end of parameter list

This is split out the parameter reordering CL - which has become too large

Change-Id: I2574985bff3cc6e9825a45a92ac531f00c33e28d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265578
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index bdc71ee..0a1e2f5 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -385,8 +385,8 @@
         numMipLevels = SkMipMap::ComputeLevelCount(width, height) + 1;
     }
 
-    return fGpu->createBackendTexture({width, height}, backendFormat, renderable, nullptr,
-                                      numMipLevels, isProtected);
+    return fGpu->createBackendTexture({width, height}, backendFormat, renderable,
+                                      numMipLevels, isProtected, nullptr);
 }
 
 GrBackendTexture GrContext::createBackendTexture(int width, int height,
@@ -490,8 +490,8 @@
         numMipLevels = SkMipMap::ComputeLevelCount(width, height) + 1;
     }
     GrGpu::BackendTextureData data(color);
-    return fGpu->createBackendTexture({width, height}, backendFormat, renderable, &data,
-                                      numMipLevels, isProtected);
+    return fGpu->createBackendTexture({width, height}, backendFormat, renderable,
+                                      numMipLevels, isProtected, &data);
 }
 
 GrBackendTexture GrContext::createBackendTexture(int width, int height,
@@ -543,8 +543,8 @@
     GrBackendFormat backendFormat = this->defaultBackendFormat(colorType, renderable);
 
     GrGpu::BackendTextureData data(srcData);
-    return fGpu->createBackendTexture({baseWidth, baseHeight}, backendFormat, renderable, &data,
-                                      numLevels, isProtected);
+    return fGpu->createBackendTexture({baseWidth, baseHeight}, backendFormat, renderable,
+                                      numLevels, isProtected, &data);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -564,8 +564,8 @@
     }
 
     GrGpu::BackendTextureData data(color);
-    return fGpu->createCompressedBackendTexture({width, height}, backendFormat, &data,
-                                                mipMapped, isProtected);
+    return fGpu->createCompressedBackendTexture({width, height}, backendFormat,
+                                                mipMapped, isProtected, &data);
 }
 
 GrBackendTexture GrContext::createCompressedBackendTexture(int width, int height,
@@ -603,8 +603,8 @@
     }
 
     GrGpu::BackendTextureData data(compressedData, dataSize);
-    return fGpu->createCompressedBackendTexture({width, height}, backendFormat, &data,
-                                                mipMapped, isProtected);
+    return fGpu->createCompressedBackendTexture({width, height}, backendFormat,
+                                                mipMapped, isProtected, &data);
 }
 
 GrBackendTexture GrContext::createCompressedBackendTexture(int width, int height,