Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77c75944 authored by Tom Murphy's avatar Tom Murphy Committed by Automerger Merge Worker
Browse files

Merge "Fix GetPhysicalDeviceSurfaceFormats2KHR for compression control struct... 

Merge "Fix GetPhysicalDeviceSurfaceFormats2KHR for compression control struct handling" into main am: 351a8df9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3242198



Change-Id: I0a5ae4151c9efd4823898bf7ffac3e7a2e357828
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eba33c37 351a8df9

vulkan/libvulkan/swapchain.cpp

+8 −1
Original line number Original line Diff line number Diff line
@@ -1215,8 +1215,15 @@ VkResult GetPhysicalDeviceSurfaceFormats2KHR( 
                            surfaceCompressionProps

                            surfaceCompressionProps

                                ->imageCompressionFixedRateFlags =

                                ->imageCompressionFixedRateFlags =

                                compressionProps.imageCompressionFixedRateFlags;

                                compressionProps.imageCompressionFixedRateFlags;

                        } else {

                        } else if (compressionRes ==

                                       VK_ERROR_OUT_OF_HOST_MEMORY ||

                                   compressionRes ==

                                       VK_ERROR_OUT_OF_DEVICE_MEMORY) {

                            return compressionRes;

                            return compressionRes;

                        } else {

                            // For any of the *_NOT_SUPPORTED errors we continue

                            // onto the next format

                            continue;

                        }

                        }

                    }

                    }

                } break;

                } break;