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

Commit 56c4b15a authored by John Reck's avatar John Reck
Browse files

Remove obsolete DONT_USE_FENCE_SYNC option 

Unable to find any recent uses of DONT_USE_FENCE_SYNC
and EGL_KHR_fence_sync is a CDD required extension, so
device support must be present.

So remove this last config option from libgui, and then
also remove the dump methods that just return the library name.

Test: builds
Change-Id: I29362d6cb7ce9ef9f2338dcbf55814973abd6c3d
parent 1b66d525

libs/gui/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ cc_library_shared { 
        "DisplayEventDispatcher.cpp",

        "DisplayEventReceiver.cpp",

        "GLConsumer.cpp",

        "GuiConfig.cpp",

        "IConsumerListener.cpp",

        "IDisplayEventConnection.cpp",

        "IGraphicBufferConsumer.cpp",

libs/gui/GuiConfig.cpp

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <gui/GuiConfig.h>



namespace android {



void appendGuiConfigString(std::string& configStr) {

    static const char* config =

            " [libgui"

#ifdef DONT_USE_FENCE_SYNC

            " DONT_USE_FENCE_SYNC"

#endif

            "]";

    configStr.append(config);

}



}; // namespace android

libs/gui/SyncFeatures.cpp

+0 −8
Original line number Diff line number Diff line
@@ -71,15 +71,7 @@ bool SyncFeatures::useNativeFenceSync() const { 
    return mHasNativeFenceSync;

}

bool SyncFeatures::useFenceSync() const {

#ifdef DONT_USE_FENCE_SYNC

    // on some devices it's better to not use EGL_KHR_fence_sync

    // even if they have it

    return false;

#else

    // currently we shall only attempt to use EGL_KHR_fence_sync if

    // USE_FENCE_SYNC is set in our makefile

    return !mHasNativeFenceSync && mHasFenceSync;

#endif

}

bool SyncFeatures::useWaitSync() const {

    return (useNativeFenceSync() || useFenceSync()) && mHasWaitSync;

libs/gui/include/gui/GuiConfig.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_GUI_CONFIG_H

#define ANDROID_GUI_CONFIG_H



#include <string>



namespace android {



// Append the libgui configuration details to configStr.

void appendGuiConfigString(std::string& configStr);



}; // namespace android



#endif /*ANDROID_GUI_CONFIG_H*/

libs/ui/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ cc_library_shared { 
        "PixelFormat.cpp",

        "PublicFormat.cpp",

        "Size.cpp",

        "UiConfig.cpp",

    ],



    include_dirs: [