From 178d41e750b31248575752c8824c6035e234982f Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 16 Aug 2011 18:48:48 +0000 Subject: Remove unneeded sk/gr conversion code Review URL: http://codereview.appspot.com/4876055/ git-svn-id: http://skia.googlecode.com/svn/trunk@2123 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/SkGr.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'include/gpu/SkGr.h') diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index 4cf19ec911..f7a56615c4 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -32,37 +32,9 @@ // #error "inconsistent GR_DEBUG and SK_DEBUG" #endif -#if GR_SCALAR_IS_FIXED - #ifdef SK_SCALAR_IS_FIXED - #define SK_SCALAR_IS_GR_SCALAR 1 - #else - #define SK_SCALAR_IS_GR_SCALAR 0 - #endif - #define SkScalarToGrScalar(x) SkScalarToFixed(x) - -#elif GR_SCALAR_IS_FLOAT - - #ifdef SK_SCALAR_IS_FLOAT - #define SK_SCALAR_IS_GR_SCALAR 1 - #else - #define SK_SCALAR_IS_GR_SCALAR 0 - #endif - #define SkScalarToGrScalar(x) SkScalarToFloat(x) - -#else - #error "Ganesh scalar type not defined" -#endif - //////////////////////////////////////////////////////////////////////////////// // Sk to Gr Type conversions -// Verify that SkPoint and GrPoint are compatible if using the same scalar type -#if 0/*SK_SCALAR_IS_GR_SCALAR*/ - GR_STATIC_ASSERT(sizeof(SkPoint) == sizeof(GrPoint)); - GR_STATIC_ASSERT(offsetof(SkPoint,fX) == offsetof(GrPoint,fX))); - GR_STATIC_ASSERT(offsetof(SkPoint,fY) == offsetof(GrPoint,fY))); -#endif - GR_STATIC_ASSERT((int)GrSamplerState::kClamp_WrapMode == (int)SkShader::kClamp_TileMode); GR_STATIC_ASSERT((int)GrSamplerState::kRepeat_WrapMode ==( int)SkShader::kRepeat_TileMode); -- cgit v1.2.3