more threading of GrShaderDataManager

src/core/SkXfermode.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkXfermode.h"
 #include "SkXfermode_opts_SSE2.h"
@@ skipping 640 matching lines @@
     { color_modeproc,       CANNOT_USE_COEFF,       CANNOT_USE_COEFF },
     { luminosity_modeproc,  CANNOT_USE_COEFF,       CANNOT_USE_COEFF },
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkXfermode::asMode(Mode* mode) const {
     return false;
 }
 
-bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrTexture*) const {
+bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrShaderDataManager*,
+                                     GrTexture*) const {
     return false;
 }
 
 bool SkXfermode::asXPFactory(GrXPFactory**) const {
     return false;
 }
 
 
 #if SK_SUPPORT_GPU
 #include "effects/GrPorterDuffXferProcessor.h"
@@ skipping 249 matching lines @@
                 }
             }
         }
     }
 }
 
 #if SK_SUPPORT_GPU
 #include "effects/GrCustomXfermode.h"
 
 bool SkProcCoeffXfermode::asFragmentProcessor(GrFragmentProcessor** fp,
+                                              GrShaderDataManager* shaderDataManager,
                                               GrTexture* background) const {
     if (GrCustomXfermode::IsSupportedMode(fMode)) {
         if (fp) {
-            *fp = GrCustomXfermode::CreateFP(fMode, background);
+            SkASSERT(shaderDataManager);
+            *fp = GrCustomXfermode::CreateFP(shaderDataManager, fMode, background);
             SkASSERT(*fp);
         }
         return true;
     }
     return false;
 }
 
 bool SkProcCoeffXfermode::asXPFactory(GrXPFactory** xp) const {
     if (CANNOT_USE_COEFF != fSrcCoeff) {
         if (xp) {
@@ skipping 585 matching lines @@
         } else {
             proc16 = rec.fProc16_General;
         }
     }
     return proc16;
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkXfermode)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkProcCoeffXfermode)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END