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

Commit 48baf1b7 authored by Cody Northrop's avatar Cody Northrop Committed by android-build-merger
Browse files

Merge "GPU Debug Layers: Allow multiple layer apps" into qt-dev am: 3432b6df

am: b652195c

Change-Id: I947ceeac53b48bf197cffccb236077a746a983f9
parents 9a1e764f b652195c
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -188,13 +188,18 @@ public class GraphicsEnvironment {

                    if (gpuDebugLayerApp != null && !gpuDebugLayerApp.isEmpty()) {
                        Log.i(TAG, "GPU debug layer app: " + gpuDebugLayerApp);
                        final String paths = getDebugLayerAppPaths(pm, gpuDebugLayerApp);
                        // If a colon is present, treat this as multiple apps, so Vulkan and GLES
                        // layer apps can be provided at the same time.
                        String[] layerApps = gpuDebugLayerApp.split(":");
                        for (int i = 0; i < layerApps.length; i++) {
                            String paths = getDebugLayerAppPaths(pm, layerApps[i]);
                            if (paths != null) {
                                // Append the path so files placed in the app's base directory will
                                // override the external path
                                layerPaths += paths + ":";
                            }
                        }
                    }

                    final String layers = coreSettings.getString(Settings.Global.GPU_DEBUG_LAYERS);