diff options
| author | Chris Wailes <chriswailes@google.com> | 2014-08-12 13:51:10 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-20 18:14:27 -0700 |
| commit | 44bef6fba6244292b751387f3d6c31cca96c28ad (patch) | |
| tree | a9dd48535a1f3343315bc75f7751cf042c05dc67 /rsProgramFragment.cpp | |
| parent | 4bb773ef75eeff5960852b733bcca5834020ee9e (diff) | |
| download | android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.gz android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.bz2 android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.zip | |
Replace NULL macros with nullptr literals.
Change-Id: I918c40879aa547438f77e7d1a95fa2aa33bec398
Diffstat (limited to 'rsProgramFragment.cpp')
| -rw-r--r-- | rsProgramFragment.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp index 360d3ab3..7af67388 100644 --- a/rsProgramFragment.cpp +++ b/rsProgramFragment.cpp @@ -45,7 +45,7 @@ void ProgramFragment::setConstantColor(Context *rsc, float r, float g, float b, rsc->setError(RS_ERROR_BAD_SHADER, "Cannot set fixed function emulation color on user program"); return; } - if (mHal.state.constants[0] == NULL) { + if (mHal.state.constants[0] == nullptr) { ALOGE("Unable to set fixed function emulation color because allocation is missing"); rsc->setError(RS_ERROR_BAD_SHADER, "Unable to set fixed function emulation color because allocation is missing"); return; @@ -81,16 +81,16 @@ void ProgramFragment::serialize(Context *rsc, OStream *stream) const { } ProgramFragment *ProgramFragment::createFromStream(Context *rsc, IStream *stream) { - return NULL; + return nullptr; } ProgramFragmentState::ProgramFragmentState() { - mPF = NULL; + mPF = nullptr; } ProgramFragmentState::~ProgramFragmentState() { ObjectBase::checkDelete(mPF); - mPF = NULL; + mPF = nullptr; } void ProgramFragmentState::init(Context *rsc) { @@ -118,7 +118,7 @@ void ProgramFragmentState::init(Context *rsc) { Allocation *constAlloc = Allocation::createAllocation(rsc, inputType.get(), RS_ALLOCATION_USAGE_SCRIPT | RS_ALLOCATION_USAGE_GRAPHICS_CONSTANTS); ProgramFragment *pf = new ProgramFragment(rsc, shaderString, strlen(shaderString), - NULL, 0, NULL, tmp, 2); + nullptr, 0, nullptr, tmp, 2); pf->bindAllocation(rsc, constAlloc, 0); pf->setConstantColor(rsc, 1.0f, 1.0f, 1.0f, 1.0f); |