| Index: tests/FloatingPointTextureTest.cpp
|
| diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
|
| index a20b8a2efaf1e58cb6197ad81f0db0a7babb610a..0880ef67bb52fea3c8ce82f5891f543212b0926d 100644
|
| --- a/tests/FloatingPointTextureTest.cpp
|
| +++ b/tests/FloatingPointTextureTest.cpp
|
| @@ -60,8 +60,8 @@ void runFPTest(skiatest::Reporter* reporter, GrContext* context,
|
| static const int FP_CONTROL_ARRAY_SIZE = DEV_W * DEV_H * 4/*RGBA*/;
|
| static const float kMaxIntegerRepresentableInSPFloatingPoint = 16777216; // 2 ^ 24
|
|
|
| -DEF_GPUTEST_FOR_RENDERING_CONTEXTS(FloatingPointTextureTest, reporter, context) {
|
| - runFPTest<float>(reporter, context, FLT_MIN, FLT_MAX, FLT_EPSILON,
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(FloatingPointTextureTest, reporter, ctxInfo) {
|
| + runFPTest<float>(reporter, ctxInfo.fGrContext, FLT_MIN, FLT_MAX, FLT_EPSILON,
|
| kMaxIntegerRepresentableInSPFloatingPoint,
|
| FP_CONTROL_ARRAY_SIZE, kRGBA_float_GrPixelConfig);
|
| }
|
| @@ -69,16 +69,16 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(FloatingPointTextureTest, reporter, context)
|
| static const int HALF_ALPHA_CONTROL_ARRAY_SIZE = DEV_W * DEV_H * 1 /*alpha-only*/;
|
| static const SkHalf kMaxIntegerRepresentableInHalfFloatingPoint = 0x6800; // 2 ^ 11
|
|
|
| -DEF_GPUTEST_FOR_RENDERING_CONTEXTS(HalfFloatAlphaTextureTest, reporter, context) {
|
| - runFPTest<SkHalf>(reporter, context, SK_HalfMin, SK_HalfMax, SK_HalfEpsilon,
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(HalfFloatAlphaTextureTest, reporter, ctxInfo) {
|
| + runFPTest<SkHalf>(reporter, ctxInfo.fGrContext, SK_HalfMin, SK_HalfMax, SK_HalfEpsilon,
|
| kMaxIntegerRepresentableInHalfFloatingPoint,
|
| HALF_ALPHA_CONTROL_ARRAY_SIZE, kAlpha_half_GrPixelConfig);
|
| }
|
|
|
| static const int HALF_RGBA_CONTROL_ARRAY_SIZE = DEV_W * DEV_H * 4 /*RGBA*/;
|
|
|
| -DEF_GPUTEST_FOR_RENDERING_CONTEXTS(HalfFloatRGBATextureTest, reporter, context) {
|
| - runFPTest<SkHalf>(reporter, context, SK_HalfMin, SK_HalfMax, SK_HalfEpsilon,
|
| +DEF_GPUTEST_FOR_RENDERING_CONTEXTS(HalfFloatRGBATextureTest, reporter, ctxInfo) {
|
| + runFPTest<SkHalf>(reporter, ctxInfo.fGrContext, SK_HalfMin, SK_HalfMax, SK_HalfEpsilon,
|
| kMaxIntegerRepresentableInHalfFloatingPoint,
|
| HALF_RGBA_CONTROL_ARRAY_SIZE, kRGBA_half_GrPixelConfig);
|
| }
|
|
|