Update more tests to use the GrDirectContext/GrRecordingContext pair
This should be the last batch of tests. All the remaining uses of
GrContext should be resolved when SkImage no longer requires a context.
Change-Id: I47eeb3b74c28f483c20d9bec4daecbdb6d2cb982
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305541
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/tests/VkDrawableTest.cpp b/tests/VkDrawableTest.cpp
index b1214fc..38378dc 100644
--- a/tests/VkDrawableTest.cpp
+++ b/tests/VkDrawableTest.cpp
@@ -94,9 +94,9 @@
const SkImageInfo&, const GrVkDrawableInfo&);
typedef void (*SubmitProc)(TestDrawable*);
- // Exercises the exporting of a secondary command buffer from one GrContext and then importing
- // it into a second GrContext. We then draw to the secondary command buffer from the second
- // GrContext.
+ // Exercises the exporting of a secondary command buffer from one context and then importing
+ // it into a second context. We then draw to the secondary command buffer from the second
+ // context.
class DrawHandlerImport : public GpuDrawHandler {
public:
DrawHandlerImport(TestDrawable* td, DrawProc drawProc, SubmitProc submitProc,
@@ -132,7 +132,7 @@
};
// Helper function to test drawing to a secondary command buffer that we imported into the
- // GrContext using a GrVkSecondaryCBDrawContext.
+ // context using a GrVkSecondaryCBDrawContext.
static void ImportDraw(TestDrawable* td, const SkMatrix& matrix, const SkIRect& clipBounds,
const SkImageInfo& bufferInfo, const GrVkDrawableInfo& info) {
td->fDrawContext = GrVkSecondaryCBDrawContext::Make(td->fDContext, bufferInfo,
@@ -164,7 +164,7 @@
}
// Helper function to test waiting for the imported secondary command buffer to be submitted on
- // its original context and then cleaning up the GrVkSecondaryCBDrawContext from this GrContext.
+ // its original context and then cleaning up the GrVkSecondaryCBDrawContext from this context.
static void ImportSubmitted(TestDrawable* td) {
// Typical use case here would be to create a fence that we submit to the gpu and then wait
// on before releasing the GrVkSecondaryCBDrawContext resources. To simulate that for this
@@ -173,10 +173,10 @@
td->fDContext->priv().getGpu()->testingOnly_flushGpuAndSync();
td->fDrawContext->releaseResources();
- // We release the GrContext here manually to test that we waited long enough before
+ // We release the context here manually to test that we waited long enough before
// releasing the GrVkSecondaryCBDrawContext. This simulates when a client is able to delete
- // the GrContext it used to imported the secondary command buffer. If we had released the
- // GrContext's resources earlier (before waiting on the gpu above), we would get vulkan
+ // the context it used to imported the secondary command buffer. If we had released the
+ // context's resources earlier (before waiting on the gpu above), we would get vulkan
// validation layer errors saying we freed some vulkan objects while they were still in use
// on the GPU.
td->fDContext->releaseResourcesAndAbandonContext();