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 /rsProgramVertex.cpp | |
| parent | 4bb773ef75eeff5960852b733bcca5834020ee9e (diff) | |
| download | rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.gz | |
Replace NULL macros with nullptr literals.
Change-Id: I918c40879aa547438f77e7d1a95fa2aa33bec398
Diffstat (limited to 'rsProgramVertex.cpp')
| -rw-r--r-- | rsProgramVertex.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rsProgramVertex.cpp b/rsProgramVertex.cpp index 9c0f7fbe..baf1fffc 100644 --- a/rsProgramVertex.cpp +++ b/rsProgramVertex.cpp @@ -41,7 +41,7 @@ void ProgramVertex::setup(Context *rsc, ProgramVertexState *state) { } if (!isUserProgram()) { - if (mHal.state.constants[0] == NULL) { + if (mHal.state.constants[0] == nullptr) { rsc->setError(RS_ERROR_FATAL_UNKNOWN, "Unable to set fixed function emulation matrices because allocation is missing"); return; @@ -70,7 +70,7 @@ void ProgramVertex::setProjectionMatrix(Context *rsc, const rsc_Matrix *m) const "Attempting to set fixed function emulation matrix projection on user program"); return; } - if (mHal.state.constants[0] == NULL) { + if (mHal.state.constants[0] == nullptr) { rsc->setError(RS_ERROR_FATAL_UNKNOWN, "Unable to set fixed function emulation matrix projection because allocation is missing"); return; @@ -88,7 +88,7 @@ void ProgramVertex::setModelviewMatrix(Context *rsc, const rsc_Matrix *m) const "Attempting to set fixed function emulation matrix modelview on user program"); return; } - if (mHal.state.constants[0] == NULL) { + if (mHal.state.constants[0] == nullptr) { rsc->setError(RS_ERROR_FATAL_UNKNOWN, "Unable to set fixed function emulation matrix modelview because allocation is missing"); return; @@ -106,7 +106,7 @@ void ProgramVertex::setTextureMatrix(Context *rsc, const rsc_Matrix *m) const { "Attempting to set fixed function emulation matrix texture on user program"); return; } - if (mHal.state.constants[0] == NULL) { + if (mHal.state.constants[0] == nullptr) { rsc->setError(RS_ERROR_FATAL_UNKNOWN, "Unable to set fixed function emulation matrix texture because allocation is missing"); return; @@ -124,7 +124,7 @@ void ProgramVertex::getProjectionMatrix(Context *rsc, rsc_Matrix *m) const { "Attempting to get fixed function emulation matrix projection on user program"); return; } - if (mHal.state.constants[0] == NULL) { + if (mHal.state.constants[0] == nullptr) { rsc->setError(RS_ERROR_FATAL_UNKNOWN, "Unable to get fixed function emulation matrix projection because allocation is missing"); return; @@ -152,7 +152,7 @@ void ProgramVertex::serialize(Context *rsc, OStream *stream) const { } ProgramVertex *ProgramVertex::createFromStream(Context *rsc, IStream *stream) { - return NULL; + return nullptr; } @@ -203,7 +203,7 @@ void ProgramVertexState::init(Context *rsc) { tmp[3] = (uintptr_t)attrElem.get(); ProgramVertex *pv = new ProgramVertex(rsc, shaderString, strlen(shaderString), - NULL, 0, NULL, tmp, 4); + nullptr, 0, nullptr, tmp, 4); Allocation *alloc = Allocation::createAllocation(rsc, inputType.get(), RS_ALLOCATION_USAGE_SCRIPT | RS_ALLOCATION_USAGE_GRAPHICS_CONSTANTS); pv->bindAllocation(rsc, alloc, 0); |