diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 22:00:29 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 22:00:29 +0000 |
| commit | 85983288ba8f4abc1fba4c54da827d2b089472e0 (patch) | |
| tree | 3276c3ed59920948c82093c3ac9c49036b295e3c /include/gpu/GrConfig.h | |
| parent | edbd21aa39fa706d38910bd9c14bef56c381409a (diff) | |
Remove compile time option to use different types for text vertices.
Review URL: https://codereview.appspot.com/7309060
git-svn-id: http://skia.googlecode.com/svn/trunk@7658 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrConfig.h')
| -rw-r--r-- | include/gpu/GrConfig.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index 27484811b6..d929d580ac 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -315,16 +315,6 @@ inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); } #endif #endif -#if !defined(GR_TEXT_SCALAR_TYPE_IS_USHORT) - #define GR_TEXT_SCALAR_TYPE_IS_USHORT 0 -#endif -#if !defined(GR_TEXT_SCALAR_TYPE_IS_FLOAT) - #define GR_TEXT_SCALAR_TYPE_IS_FLOAT 0 -#endif -#if !defined(GR_TEXT_SCALAR_TYPE_IS_FIXED) - #define GR_TEXT_SCALAR_TYPE_IS_FIXED 0 -#endif - /** * GR_GEOM_BUFFER_LOCK_THRESHOLD gives a threshold (in bytes) for when Gr should * lock a GrGeometryBuffer to update its contents. It will use lock() if the @@ -379,15 +369,6 @@ inline void GrCrash(const char* msg) { GrPrintf(msg); GrAlwaysAssert(false); } #error "More than one GR_BUILD defined" #endif - -#if !GR_TEXT_SCALAR_IS_FLOAT && \ - !GR_TEXT_SCALAR_IS_FIXED && \ - !GR_TEXT_SCALAR_IS_USHORT - #undef GR_TEXT_SCALAR_IS_FLOAT - #define GR_TEXT_SCALAR_IS_FLOAT 1 - #pragma message GR_WARN("Text scalar type not defined, defaulting to float") -#endif - #if 0 #if GR_WIN32_BUILD // #pragma message GR_WARN("GR_WIN32_BUILD") |