diff options
| author | 2015-01-05 15:51:13 -0800 | |
|---|---|---|
| committer | 2015-01-05 16:49:13 -0800 | |
| commit | d41c4d8c732095ae99c955b6b82f7306633004b1 (patch) | |
| tree | dbb2e26c6c5a80c7ccf43e5cd5fb1554cc603555 /libs/hwui/Caches.cpp | |
| parent | 8dfaa4904205772cdceee63ef3989bcdedf1a914 (diff) | |
Add overrides and switch to nullptr keyword for all files
Adds remaining missing overrides and nullptr usages, missed due to
an extreme failure in tool usage.
Change-Id: I56abd72975a3999ad13330003c348db40f59aebf
Diffstat (limited to 'libs/hwui/Caches.cpp')
| -rw-r--r-- | libs/hwui/Caches.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp index ebeb845e77f6..107eb08b2ca6 100644 --- a/libs/hwui/Caches.cpp +++ b/libs/hwui/Caches.cpp @@ -49,7 +49,7 @@ namespace uirenderer { /////////////////////////////////////////////////////////////////////////////// Caches::Caches(): Singleton<Caches>(), - mExtensions(Extensions::getInstance()), mInitialized(false), mRenderState(NULL) { + mExtensions(Extensions::getInstance()), mInitialized(false), mRenderState(nullptr) { init(); initFont(); initConstraints(); @@ -87,13 +87,13 @@ bool Caches::init() { glActiveTexture(gTextureUnits[0]); mTextureUnit = 0; - mRegionMesh = NULL; + mRegionMesh = nullptr; mMeshIndices = 0; mShadowStripsIndices = 0; blend = false; lastSrcMode = GL_ZERO; lastDstMode = GL_ZERO; - currentProgram = NULL; + currentProgram = nullptr; mFunctorsCount = 0; @@ -163,7 +163,7 @@ bool Caches::initProperties() { StencilClipDebug prevDebugStencilClip = debugStencilClip; char property[PROPERTY_VALUE_MAX]; - if (property_get(PROPERTY_DEBUG_LAYERS_UPDATES, property, NULL) > 0) { + if (property_get(PROPERTY_DEBUG_LAYERS_UPDATES, property, nullptr) > 0) { INIT_LOGD(" Layers updates debug enabled: %s", property); debugLayersUpdates = !strcmp(property, "true"); } else { @@ -171,7 +171,7 @@ bool Caches::initProperties() { } debugOverdraw = false; - if (property_get(PROPERTY_DEBUG_OVERDRAW, property, NULL) > 0) { + if (property_get(PROPERTY_DEBUG_OVERDRAW, property, nullptr) > 0) { INIT_LOGD(" Overdraw debug enabled: %s", property); if (!strcmp(property, "show")) { debugOverdraw = true; @@ -183,7 +183,7 @@ bool Caches::initProperties() { } // See Properties.h for valid values - if (property_get(PROPERTY_DEBUG_STENCIL_CLIP, property, NULL) > 0) { + if (property_get(PROPERTY_DEBUG_STENCIL_CLIP, property, nullptr) > 0) { INIT_LOGD(" Stencil clip debug enabled: %s", property); if (!strcmp(property, "hide")) { debugStencilClip = kStencilHide; @@ -233,7 +233,7 @@ void Caches::terminate() { fboCache.clear(); programCache.clear(); - currentProgram = NULL; + currentProgram = nullptr; patchCache.clear(); |