diff options
| author |  fmalita <fmalita@chromium.org> | 2015-01-31 07:02:18 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-31 07:02:18 -0800 |
| commit | 6bfef2dfec3253efa48aec0b5ea108e0dc041d15 (patch) | |
| tree | 7402cf0046bfa6077cb3e732e57e63f2f7927f63 /include/gpu/GrPaint.h | |
| parent | 6726e78cd971e7dce42f8b5904284f744f55cb36 (diff) | |
Revert of Move npot resizing out of GrContext and simplify GrContext texture functions. (patchset #9 id:160001 of https://codereview.chromium.org/882223003/)
Reason for revert:
webGL conformance failures:
WebglConformance.conformance_textures_tex_image_and_sub_image_2d_with_video
WebglConformance.conformance_textures_texture_npot_video
https://codereview.chromium.org/892773003/
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_ng/builds/29272
Original issue's description:
> Move npot resizing out of GrContext and simplify GrContext texture functions.
>
> Committed: https://skia.googlesource.com/skia/+/8a8100349105c8c6de39fcb34e47679da7a67f54
TBR=robertphillips@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/868233005
Diffstat (limited to 'include/gpu/GrPaint.h')
| -rw-r--r-- | include/gpu/GrPaint.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h index 64b51d2c65..8163f6e4d8 100644 --- a/include/gpu/GrPaint.h +++ b/include/gpu/GrPaint.h @@ -25,15 +25,23 @@ * created by subclassing GrProcessor. * * The primitive color computation starts with the color specified by setColor(). This color is the - * input to the first color stage. Each color stage feeds its output to the next color stage. + * input to the first color stage. Each color stage feeds its output to the next color stage. The + * final color stage's output color is input to the color filter specified by + * setXfermodeColorFilter which produces the final source color, S. * * Fractional pixel coverage follows a similar flow. The coverage is initially the value specified * by setCoverage(). This is input to the first coverage stage. Coverage stages are chained * together in the same manner as color stages. The output of the last stage is modulated by any * fractional coverage produced by anti-aliasing. This last step produces the final coverage, C. * - * setXPFactory is used to control blending between the output color and dest. It also implements - * the application of fractional coverage from the coverage pipeline. + * setBlendFunc() specifies blending coefficients for S (described above) and D, the initial value + * of the destination pixel, labeled Bs and Bd respectively. The final value of the destination + * pixel is then D' = (1-C)*D + C*(Bd*D + Bs*S). + * + * Note that the coverage is applied after the blend. This is why they are computed as distinct + * values. + * + * TODO: Encapsulate setXfermodeColorFilter in a GrProcessor and remove from GrPaint. */ class GrPaint { public: |