diff options
author | Yahan Zhou <yahan@google.com> | 2022-06-10 19:57:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-10 19:57:32 +0000 |
commit | cc48b89c0a4184c375d65886c8eb809e23446796 (patch) | |
tree | 9f7f106a27c82511f9d18d72a0e734bea084e698 | |
parent | ef8778a609108985745ab3b94cbbc64f6a763f5c (diff) | |
parent | 48fdca93e7d1c8d183baf0bf5c83aefa2ef9fd83 (diff) | |
download | goldfish-opengl-cc48b89c0a4184c375d65886c8eb809e23446796.tar.gz |
Clean up RBO destroy code and fix regression am: 48fdca93e7
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/18820341
Change-Id: I3dadc757203306d84baae87ca809fdbcb9c5e014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | shared/OpenglCodecCommon/GLClientState.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/shared/OpenglCodecCommon/GLClientState.cpp b/shared/OpenglCodecCommon/GLClientState.cpp index 852f36ae..3e32bbfb 100644 --- a/shared/OpenglCodecCommon/GLClientState.cpp +++ b/shared/OpenglCodecCommon/GLClientState.cpp @@ -2101,7 +2101,6 @@ void GLClientState::addRenderbuffers(GLsizei n, GLuint* renderbuffers) { } void GLClientState::removeRenderbuffers(GLsizei n, const GLuint* renderbuffers) { - std::vector<std::shared_ptr<RboProps>> to_remove; bool unbindCurrent = false; { RenderbufferInfo::ScopedView view(mRboState.rboData); @@ -2111,18 +2110,12 @@ void GLClientState::removeRenderbuffers(GLsizei n, const GLuint* renderbuffers) if (!rboPtr) { continue; } - to_remove.push_back(rboPtr); + unbindCurrent |= + (mRboState.boundRenderbuffer == rboPtr); setFboCompletenessDirtyForRbo(rboPtr); + view.remove(renderbuffers[i]); } } - - for (size_t i = 0; i < to_remove.size(); i++) { - if (mRboState.boundRenderbuffer == to_remove[i]) { - unbindCurrent = true; - break; - } - view.remove(to_remove[i]->id); - } } if (unbindCurrent) { |