@@ -1515,7 +1515,7 @@ bool GPUSink::readBack(SkSurface* surface, SkBitmap* dst) const {
1515
1515
1516
1516
Result GPUSink::onDraw (const Src& src, SkBitmap* dst, SkWStream*, SkString* log,
1517
1517
const GrContextOptions& baseOptions,
1518
- std::function<void (GrContext *)> initContext) const {
1518
+ std::function<void (GrDirectContext *)> initContext) const {
1519
1519
GrContextOptions grOptions = baseOptions;
1520
1520
1521
1521
// We don't expect the src to mess with the persistent cache or the executor.
@@ -1675,9 +1675,11 @@ Result GPUPrecompileTestingSink::draw(const Src& src, SkBitmap* dst, SkWStream*
1675
1675
return result;
1676
1676
}
1677
1677
1678
- auto precompileShaders = [&memoryCache](GrContext* context) {
1679
- memoryCache.foreach ([context](sk_sp<const SkData> key, sk_sp<SkData> data, int /* count*/ ) {
1680
- SkAssertResult (context->precompileShader (*key, *data));
1678
+ auto precompileShaders = [&memoryCache](GrDirectContext* dContext) {
1679
+ memoryCache.foreach ([dContext](sk_sp<const SkData> key,
1680
+ sk_sp<SkData> data,
1681
+ int /* count*/ ) {
1682
+ SkAssertResult (dContext->precompileShader (*key, *data));
1681
1683
});
1682
1684
};
1683
1685
@@ -1911,7 +1913,7 @@ Result GPUDDLSink::draw(const Src& src, SkBitmap* dst, SkWStream*, SkString* log
1911
1913
// with the main context
1912
1914
ContextInfo otherCtxInfo = factory.getSharedContextInfo(mainCtx);
1913
1915
sk_gpu_test::TestContext* otherTestCtx = otherCtxInfo.testContext();
1914
- GrContext* otherCtx = otherCtxInfo.grContext ();
1916
+ auto otherCtx = otherCtxInfo.directContext ();
1915
1917
if (!otherCtx) {
1916
1918
return Result::Fatal("Cound not create shared context.");
1917
1919
}
0 commit comments