Replace GR_*_BUILD by their SK_BUILD_FOR_* equivalents.
BUG=None
TEST=None, no functional changes.
R=bsalomon@google.com, robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/24253009
git-svn-id: http://skia.googlecode.com/svn/trunk/include@11457 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/GrConfig.h b/gpu/GrConfig.h
index e3fa1a4..29c483f 100644
--- a/gpu/GrConfig.h
+++ b/gpu/GrConfig.h
@@ -32,63 +32,14 @@
* Gr defines are set to 0 or 1, rather than being undefined or defined
*/
-#if !defined(GR_ANDROID_BUILD)
- #define GR_ANDROID_BUILD 0
-#endif
-#if !defined(GR_IOS_BUILD)
- #define GR_IOS_BUILD 0
-#endif
-#if !defined(GR_LINUX_BUILD)
- #define GR_LINUX_BUILD 0
-#endif
-#if !defined(GR_MAC_BUILD)
- #define GR_MAC_BUILD 0
-#endif
-#if !defined(GR_WIN32_BUILD)
- #define GR_WIN32_BUILD 0
-#endif
-#if !defined(GR_QNX_BUILD)
- #define GR_QNX_BUILD 0
-#endif
#if !defined(GR_CACHE_STATS)
#define GR_CACHE_STATS 0
#endif
-/**
- * If no build target has been defined, attempt to infer.
- */
-#if !GR_ANDROID_BUILD && !GR_IOS_BUILD && !GR_LINUX_BUILD && !GR_MAC_BUILD && !GR_WIN32_BUILD && !GR_QNX_BUILD
- #if defined(_WIN32)
- #undef GR_WIN32_BUILD
- #define GR_WIN32_BUILD 1
-// #error "WIN"
- #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
- #undef GR_IOS_BUILD
- #define GR_IOS_BUILD 1
-// #error "IOS"
- #elif defined(SK_BUILD_FOR_ANDROID)
- #undef GR_ANDROID_BUILD
- #define GR_ANDROID_BUILD 1
-// #error "ANDROID"
- #elif TARGET_OS_MAC
- #undef GR_MAC_BUILD
- #define GR_MAC_BUILD 1
-// #error "MAC"
- #elif TARGET_OS_QNX || defined(__QNXNTO__)
- #undef GR_QNX_BUILD
- #define GR_QNX_BUILD 1
-// #error "QNX"
- #else
- #undef GR_LINUX_BUILD
- #define GR_LINUX_BUILD 1
-// #error "LINUX"
- #endif
-#endif
-
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-#if GR_WIN32_BUILD
+#if defined(SK_BUILD_FOR_WIN32)
// VC8 doesn't support stdint.h, so we define those types here.
typedef signed char int8_t;
typedef unsigned char uint8_t;
@@ -176,7 +127,7 @@
* GR_ALWAYSBREAK is an unconditional break in all builds.
*/
#if !defined(GR_ALWAYSBREAK)
- #if GR_WIN32_BUILD
+ #if defined(SK_BUILD_FOR_WIN32)
#define GR_ALWAYSBREAK SkNO_RETURN_HINT(); __debugbreak()
#else
// TODO: do other platforms really not have continuable breakpoints?
@@ -281,43 +232,4 @@
#define GR_STROKE_PATH_RENDERING 0
#endif
-///////////////////////////////////////////////////////////////////////////////
-// tail section:
-//
-// Now we just assert if we are missing some required define, or if we detect
-// and inconsistent combination of defines
-//
-
-
-/**
- * Only one build target macro should be 1 and the rest should be 0.
- */
-#define GR_BUILD_SUM (GR_WIN32_BUILD + GR_MAC_BUILD + GR_IOS_BUILD + GR_ANDROID_BUILD + GR_LINUX_BUILD + GR_QNX_BUILD)
-#if 0 == GR_BUILD_SUM
- #error "Missing a GR_BUILD define"
-#elif 1 != GR_BUILD_SUM
- #error "More than one GR_BUILD defined"
-#endif
-
-#if 0
-#if GR_WIN32_BUILD
-// #pragma message GR_WARN("GR_WIN32_BUILD")
-#endif
-#if GR_MAC_BUILD
-// #pragma message GR_WARN("GR_MAC_BUILD")
-#endif
-#if GR_IOS_BUILD
-// #pragma message GR_WARN("GR_IOS_BUILD")
-#endif
-#if GR_ANDROID_BUILD
-// #pragma message GR_WARN("GR_ANDROID_BUILD")
-#endif
-#if GR_LINUX_BUILD
-// #pragma message GR_WARN("GR_LINUX_BUILD")
-#endif
-#if GR_QNX_BUILD
-// #pragma message GR_WARN("GR_QNX_BUILD")
-#endif
-#endif
-
#endif
diff --git a/gpu/gl/GrGLConfig.h b/gpu/gl/GrGLConfig.h
index 0da2c0b..490ad0a 100644
--- a/gpu/gl/GrGLConfig.h
+++ b/gpu/gl/GrGLConfig.h
@@ -205,7 +205,7 @@
* OS/driver level fix.
*/
#define GR_GL_MAC_BUFFER_OBJECT_PERFOMANCE_WORKAROUND \
- (GR_MAC_BUILD && \
+ (defined(SK_BUILD_FOR_MAC) && \
!GR_GL_USE_BUFFER_DATA_NULL_HINT)
#endif
diff --git a/gpu/gl/GrGLConfig_chrome.h b/gpu/gl/GrGLConfig_chrome.h
index fe35783..acad904 100644
--- a/gpu/gl/GrGLConfig_chrome.h
+++ b/gpu/gl/GrGLConfig_chrome.h
@@ -11,14 +11,20 @@
// glGetError() forces a sync with gpu process on chrome
#define GR_GL_CHECK_ERROR_START 0
+#if defined(SK_BUILD_FOR_WIN32)
// ANGLE creates a temp VB for vertex attributes not specified per-vertex.
-#define GR_GL_NO_CONSTANT_ATTRIBUTES GR_WIN32_BUILD
+#define GR_GL_NO_CONSTANT_ATTRIBUTES 1
// For RGBA teximage/readpixels ANGLE will sw-convert to/from BGRA.
-#define GR_GL_RGBA_8888_PIXEL_OPS_SLOW GR_WIN32_BUILD
+#define GR_GL_RGBA_8888_PIXEL_OPS_SLOW 1
// ANGLE can go faster if the entire fbo is read rather than a subrect
-#define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL GR_WIN32_BUILD
+#define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL 1
+#else
+#define GR_GL_NO_CONSTANT_ATTRIBUTES 0
+#define GR_GL_RGBA_8888_PIXEL_OPS_SLOW 0
+#define GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL 0
+#endif
// cmd buffer allocates memory and memsets it to zero when it sees glBufferData
// with NULL.
