AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

silence the error test to be a better citizen

Browse Source 
BUG=
R=caryclark@google.com, bsalomon@google.com, tfarina@chromium.org, mtklein@google.com

Author: humper@google.com

Review URL: https://chromiumcodereview.appspot.com/23481012

git-svn-id: http://skia.googlecode.com/svn/trunk@11409 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-09-19 22:11:38 +00:00
parent 191eaeb916
commit c5e57bd0a3
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gpu/SkGpuDevice.cpp
View File

@ -1209,10 +1209,7 @@ void SkGpuDevice::drawBitmapCommon(const SkDraw& draw,
textureFilterMode = GrTextureParams::kMipMap_FilterMode;
break;
case SkPaint::kHigh_FilterLevel:
SkErrorInternals::SetError( kInvalidPaint_SkError,
"Sorry, I don't yet support high quality "
"filtering on the GPU. Falling back to "
"MIPMaps.");
// Fall back to mips for now
textureFilterMode = GrTextureParams::kMipMap_FilterMode;
break;
default:

26
tests/ErrorTest.cpp
View File

@ -10,21 +10,32 @@
#include "SkPath.h"
#include "SkRect.h"
typedef struct {
skiatest::Reporter *fReporter;
unsigned int *fIntPointer;
} ErrorContext;
#define CHECK(errcode) \
REPORTER_ASSERT( reporter, (err = SkGetLastError()) == errcode); \
if (err != kNoError_SkError) \
{ \
SkDebugf("Last error string: %s\n", SkGetLastErrorString()); \
SkClearLastError(); \
}
static void cb(SkError err, void *context) {
int *context_ptr = static_cast<int *>(context);
SkDebugf("CB (0x%x): %s\n", *context_ptr, SkGetLastErrorString());
ErrorContext *context_ptr = static_cast<ErrorContext *>(context);
REPORTER_ASSERT( context_ptr->fReporter, (*(context_ptr->fIntPointer) == 0xdeadbeef) );
}
static void ErrorTest(skiatest::Reporter* reporter) {
SkError err;
unsigned int test_value = 0xdeadbeef;
ErrorContext context;
context.fReporter = reporter;
context.fIntPointer = &test_value;
SkSetErrorCallback(cb, &context);
CHECK(kNoError_SkError);
@ -43,19 +54,10 @@ static void ErrorTest(skiatest::Reporter* reporter) {
CHECK(kInvalidArgument_SkError);
CHECK(kNoError_SkError);
int test_value = 0xdeadbeef;
SkSetErrorCallback(cb, &test_value);
// should trigger *our* callback.
path.addRoundRect(r, -10, -10);
CHECK(kInvalidArgument_SkError);
CHECK(kNoError_SkError);
// Should trigger the default one again.
SkSetErrorCallback(NULL, NULL);
path.addRoundRect(r, -10, -10);
CHECK(kInvalidArgument_SkError);
CHECK(kNoError_SkError);
}
#include "TestClassDef.h"