aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2015-07-08 07:58:18 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-08 07:58:18 -0700
commit2cff176fa25e962f7ae53ebeefa833f0eed276cc (patch)
tree545ff9876e92d4ad8c177c82cc2b2ee6babdaa1c /tests
parentf5179a4c490bc787190321bd8ffdb0e6a4efa9ac (diff)
More threading of GrShaderDataManager
TBR=bsalomon@google.com BUG=skia: Review URL: https://codereview.chromium.org/1213613016
Diffstat (limited to 'tests')
-rw-r--r--tests/GpuColorFilterTest.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp
index 037734eebc..3d7f89ed53 100644
--- a/tests/GpuColorFilterTest.cpp
+++ b/tests/GpuColorFilterTest.cpp
@@ -6,15 +6,16 @@
* found in the LICENSE file.
*/
+#include "SkColorFilter.h"
+#include "Test.h"
+
#if SK_SUPPORT_GPU
#include "GrContext.h"
#include "GrContextFactory.h"
#include "GrFragmentProcessor.h"
#include "GrInvariantOutput.h"
-#include "SkColorFilter.h"
#include "SkGr.h"
-#include "Test.h"
static GrColor filterColor(const GrColor& color, uint32_t flags) {
uint32_t mask = 0;
@@ -96,11 +97,12 @@ static void test_getConstantColorComponents(skiatest::Reporter* reporter, GrCont
{ kR|kA , gr_whiteTrans, SkColorSetARGB(128, 200, 200, 200), SkXfermode::kModulate_Mode, kR|kA, GrColorPackRGBA(50, 0, 0, 64) }
};
+ GrPaint paint;
for (size_t i = 0; i < SK_ARRAY_COUNT(filterTests); ++i) {
const GetConstantComponentTestCase& test = filterTests[i];
SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(test.filterColor, test.filterMode));
SkTDArray<GrFragmentProcessor*> array;
- bool hasFrag = cf->asFragmentProcessors(grContext, &array);
+ bool hasFrag = cf->asFragmentProcessors(grContext, paint.getShaderDataManager(), &array);
REPORTER_ASSERT(reporter, hasFrag);
REPORTER_ASSERT(reporter, 1 == array.count());
GrInvariantOutput inout(test.inputColor,