diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-08 06:51:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-08 06:51:43 -0700 |
| commit | 8ca93e7c733ab064c8a9e03715ac405ae739cf51 (patch) | |
| tree | 5423fe8631957bf363453c8c5f7ce3e19a6e51e4 /src/gpu | |
| parent | 2f19b551ac10b96a1a35a147063cd4300d6fe07a (diff) | |
Initial CL to create dummy GrShaderDataManager and thread it through
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1225673007
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrShaderDataManager.cpp | 8 | ||||
| -rw-r--r-- | src/gpu/SkGr.cpp | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/gpu/GrShaderDataManager.cpp b/src/gpu/GrShaderDataManager.cpp new file mode 100644 index 0000000000..8497f31463 --- /dev/null +++ b/src/gpu/GrShaderDataManager.cpp @@ -0,0 +1,8 @@ +/* + * Copyright 2015 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "GrShaderDataManager.h" diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 332f084c5b..4c71093e44 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -770,7 +770,8 @@ bool SkPaint2GrPaint(GrContext* context, GrRenderTarget* rt, const SkPaint& skPa // Allow the shader to modify paintColor and also create an effect to be installed as // the first color effect on the GrPaint. GrFragmentProcessor* fp = NULL; - if (!shader->asFragmentProcessor(context, skPaint, viewM, NULL, &paintColor, &fp)) { + if (!shader->asFragmentProcessor(context, skPaint, viewM, NULL, &paintColor, + grPaint->getShaderDataManager(), &fp)) { return false; } if (fp) { |