Move skPaint2GrPaint to SkGr.h/cpp

include/gpu/SkGr.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 58 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
 bool GrIsBitmapInCache(const GrContext*, const SkBitmap&, const GrTextureParams*);
 
 GrTexture* GrLockAndRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams*);
 
 void GrUnlockAndUnrefCachedBitmapTexture(GrTexture*);
 
 ////////////////////////////////////////////////////////////////////////////////
+
+class SkGpuDevice;
+

[robertphillips, 2014/05/13 16:24:11]

converts -> Converts ?
"skPaint's shader" -> "SkPaint's shader." ?
Add "Return true on success; false on failure. Upon failure grPaint ..." ?

[egdaniel, 2014/05/13 17:35:54]

As of now we always fall back to src-over for the xfermode and never return
false. Does it still make sense for this function to even return a bool instead
of being void? In the Shader version, we only return false if we have
SkColorShader. Once that is implemented at some point, we really don't need a
return value on either of these functions.

On 2014/05/13 16:24:11, robertphillips wrote:

+// converts a SkPaint to a GrPaint, ignoring the skPaint's shader
+// justAlpha indicates that skPaint's alpha should be used rather than the color
+// Callers may subsequently modify the GrPaint. Setting constantColor indicates
+// that the final paint will draw the same color at every pixel. This allows
+// an optimization where the the color filter can be applied to the skPaint's
+// color once while converting to GrPaint and then ignored.
+bool SkPaint2GrPaintNoShader(SkGpuDevice* dev, const SkPaint& skPaint, bool justAlpha,
+                             bool constantColor, GrPaint* grPaint);
+
+// This function is similar to skPaint2GrPaintNoShader but also converts
+// skPaint's shader to a GrTexture/GrEffectStage if possible. The texture to

[robertphillips, 2014/05/13 16:24:11]

There is no param 'act'
Add "Return true on success; false on failure. Upon failure grPaint ..." ?

+// be used is set on grPaint and returned in param act. constantColor has the
+// same meaning as in skPaint2GrPaintNoShader.
+bool SkPaint2GrPaintShader(SkGpuDevice* dev, const SkPaint& skPaint,
+                           bool constantColor, GrPaint* grPaint);
+
+////////////////////////////////////////////////////////////////////////////////
 // Classes
 
 class SkGlyphCache;
 
 class SkGrFontScaler : public GrFontScaler {
 public:
     explicit SkGrFontScaler(SkGlyphCache* strike);
     virtual ~SkGrFontScaler();
 
     // overrides
     virtual const GrKey* getKey();
     virtual GrMaskFormat getMaskFormat();
     virtual bool getPackedGlyphBounds(GrGlyph::PackedID, SkIRect* bounds) SK_OVERRIDE;
     virtual bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height,
                                      int rowBytes, void* image) SK_OVERRIDE;
     virtual bool getPackedGlyphDFBounds(GrGlyph::PackedID, SkIRect* bounds) SK_OVERRIDE;
     virtual bool getPackedGlyphDFImage(GrGlyph::PackedID, int width, int height,
                                        void* image) SK_OVERRIDE;
     virtual bool getGlyphPath(uint16_t glyphID, SkPath*);
 
 private:
     SkGlyphCache* fStrike;
     GrKey*  fKey;
 //    DECLARE_INSTANCE_COUNTER(SkGrFontScaler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif