1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 6cf5d050a8..dd4f3218fa 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -85,10 +85,12 @@ bool GrContext::initCommon(const GrContextOptions& options) {
         fResourceCache = new GrResourceCache(fCaps.get(), fUniqueID);
         fResourceProvider = new GrResourceProvider(fGpu.get(), fResourceCache, &fSingleOwner,
                                                    options.fExplicitlyAllocateGPUResources);
+        fProxyProvider =
+                new GrProxyProvider(fResourceProvider, fResourceCache, fCaps, &fSingleOwner);
+    } else {
+        fProxyProvider = new GrProxyProvider(this->uniqueID(), fCaps, &fSingleOwner);
     }
 
-    fProxyProvider = new GrProxyProvider(fResourceProvider, fResourceCache, fCaps, &fSingleOwner);
-
     if (fResourceCache) {
         fResourceCache->setProxyProvider(fProxyProvider);
     }