commit b5f880a3f6f87eb93a85fa16a9426b5c36be5b03
author Brian Salomon <bsalomon@google.com> Mon Dec 07 11:30:16 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 07 20:31:10 2020 +0000
tree e448bf9298efc0f6bcaaff94ccb2181e573e41c9
parent 011a77357ec4a6b583417a875a337dc3ae34a416

Take origin when creating/updating backend texture using pixmaps.

Bug: skia:11042

Change-Id: I511c7556f97f19d7f162031c245019d2da33c129
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/341005
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

tests/BackendAllocationTest.cpp

diff --git a/tests/BackendAllocationTest.cpp b/tests/BackendAllocationTest.cpp
index 1519752..75d2178 100644
--- a/tests/BackendAllocationTest.cpp
+++ b/tests/BackendAllocationTest.cpp
@@ -464,11 +464,13 @@
 // Test initialization of GrBackendObjects using SkPixmaps
 static void test_pixmap_init(GrDirectContext* dContext,
                              skiatest::Reporter* reporter,
-                             std::function<GrBackendTexture (GrDirectContext*,
-                                                             const SkPixmap srcData[],
-                                                             int numLevels,
-                                                             GrRenderable)> create,
+                             std::function<GrBackendTexture(GrDirectContext*,
+                                                            const SkPixmap srcData[],
+                                                            int numLevels,
+                                                            GrSurfaceOrigin,
+                                                            GrRenderable)> create,
                              SkColorType skColorType,
+                             GrSurfaceOrigin origin,
                              GrMipmapped mipMapped,
                              GrRenderable renderable,
                              bool* finishedBECreate) {
@@ -491,7 +493,7 @@
         pixmaps[i].reset(pixmapMem[i].info(), pixmapMem[i].addr(), pixmapMem[i].rowBytes());
     }
 
-    GrBackendTexture backendTex = create(dContext, pixmaps, numMipLevels, renderable);
+    GrBackendTexture backendTex = create(dContext, pixmaps, numMipLevels, origin, renderable);
     if (!backendTex.isValid()) {
         // errors here should be reported by the test_wrapping test
         return;
@@ -541,7 +543,7 @@
     }
 
     // Upload new data and make sure everything still works
-    dContext->updateBackendTexture(backendTex, pixmaps, numMipLevels, mark_signaled,
+    dContext->updateBackendTexture(backendTex, pixmaps, numMipLevels, origin, mark_signaled,
                                    finishedBECreate);
 
     checkBackendTexture(colorsNew);
@@ -712,14 +714,19 @@
                                     renderable, finishedPtr);
                 }
 
-                {
+                for (auto origin : {kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin}) {
                     auto createWithSrcDataMtd = [finishedPtr](GrDirectContext* dContext,
                                                               const SkPixmap srcData[],
                                                               int numLevels,
+                                                              GrSurfaceOrigin origin,
                                                               GrRenderable renderable) {
                         SkASSERT(srcData && numLevels);
-                        auto result = dContext->createBackendTexture(srcData, numLevels, renderable,
-                                                                     GrProtected::kNo, mark_signaled,
+                        auto result = dContext->createBackendTexture(srcData,
+                                                                     numLevels,
+                                                                     origin,
+                                                                     renderable,
+                                                                     GrProtected::kNo,
+                                                                     mark_signaled,
                                                                      finishedPtr);
                         check_vk_layout(result, VkLayout::kReadOnlyOptimal);
 #ifdef SK_DEBUG
@@ -732,8 +739,14 @@
                         return result;
                     };
 
-                    test_pixmap_init(context, reporter, createWithSrcDataMtd, colorType, mipMapped,
-                                     renderable, finishedPtr);
+                    test_pixmap_init(context,
+                                     reporter,
+                                     createWithSrcDataMtd,
+                                     colorType,
+                                     origin,
+                                     mipMapped,
+                                     renderable,
+                                     finishedPtr);
                 }
             }
         }