| commit | 749f7ecfa99a814a64549db2a0524d2190719d66 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Mon Mar 04 10:27:33 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Mon Mar 04 10:27:33 2024 +0000 |
| tree | 610c5daec84e17b6819a56f24949efe1aedc1992 | |
| parent | 42745e63e150a23741033ee7eba8bbdda07358a1 [diff] | |
| parent | 354fba5714077e9e476f784d7d55815b31c0e660 [diff] |
Merge "Try not to crash when gl interop fails" into main am: 388ecd5f4f am: 354fba5714 Original change: https://android-review.googlesource.com/c/platform/hardware/google/gfxstream/+/2984052 Change-Id: I6f6596da9274804d6fa7e27a58afdde8b0bca55a Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/host/ColorBuffer.cpp b/host/ColorBuffer.cpp index 3cdecbf..2a9bcd1 100644 --- a/host/ColorBuffer.cpp +++ b/host/ColorBuffer.cpp
@@ -99,7 +99,6 @@ colorBuffer->mGlAndVkAreSharingExternalMemory = true; } else { ERR("Failed to import memory to ColorBufferGl:%d", handle); - return nullptr; } } }