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

Commit 4464572a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "OpenGL: Use more inclusive terms" am: 303d4ecd 

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

Change-Id: I2f73123211a77b5e73da3f192d322c9236ef0ee8
parents de50a745 303d4ecd

opengl/libs/EGL/BlobCache.cpp

+8 −8
Original line number Diff line number Diff line
@@ -78,12 +78,12 @@ void BlobCache::set(const void* key, size_t keySize, const void* value, 
        return;

    }



    std::shared_ptr<Blob> dummyKey(new Blob(key, keySize, false));

    CacheEntry dummyEntry(dummyKey, nullptr);

    std::shared_ptr<Blob> cacheKey(new Blob(key, keySize, false));

    CacheEntry cacheEntry(cacheKey, nullptr);



    while (true) {

        auto index = std::lower_bound(mCacheEntries.begin(), mCacheEntries.end(), dummyEntry);

        if (index == mCacheEntries.end() || dummyEntry < *index) {

        auto index = std::lower_bound(mCacheEntries.begin(), mCacheEntries.end(), cacheEntry);

        if (index == mCacheEntries.end() || cacheEntry < *index) {

            // Create a new cache entry.

            std::shared_ptr<Blob> keyBlob(new Blob(key, keySize, true));

            std::shared_ptr<Blob> valueBlob(new Blob(value, valueSize, true));
@@ -138,10 +138,10 @@ size_t BlobCache::get(const void* key, size_t keySize, void* value, 
                keySize, mMaxKeySize);

        return 0;

    }

    std::shared_ptr<Blob> dummyKey(new Blob(key, keySize, false));

    CacheEntry dummyEntry(dummyKey, nullptr);

    auto index = std::lower_bound(mCacheEntries.begin(), mCacheEntries.end(), dummyEntry);

    if (index == mCacheEntries.end() || dummyEntry < *index) {

    std::shared_ptr<Blob> cacheKey(new Blob(key, keySize, false));

    CacheEntry cacheEntry(cacheKey, nullptr);

    auto index = std::lower_bound(mCacheEntries.begin(), mCacheEntries.end(), cacheEntry);

    if (index == mCacheEntries.end() || cacheEntry < *index) {

        ALOGV("get: no cache entry found for key of size %zu", keySize);

        return 0;

    }

opengl/libs/EGL/FileBlobCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ FileBlobCache::FileBlobCache(size_t maxKeySize, size_t maxValueSize, size_t maxT 
            return;

        }



        // Sanity check the size before trying to mmap it.

        // Check the size before trying to mmap it.

        size_t fileSize = statBuf.st_size;

        if (fileSize > mMaxTotalSize * 2) {

            ALOGE("cache file is too large: %#" PRIx64,

opengl/tests/EGLTest/EGL_test.cpp

+25 −25
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ TEST_F(EGLTest, EGLTerminateSucceedsWithRemainingObjects) { 
    };

    EXPECT_TRUE(eglChooseConfig(mEglDisplay, attrs, &config, 1, &numConfigs));



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -149,7 +149,7 @@ TEST_F(EGLTest, EGLTerminateSucceedsWithRemainingObjects) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;
@@ -259,7 +259,7 @@ TEST_F(EGLTest, EGLDisplayP3) { 
    EXPECT_EQ(components[2], 8);

    EXPECT_EQ(components[3], 8);



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -269,7 +269,7 @@ TEST_F(EGLTest, EGLDisplayP3) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;

    EGLint winAttrs[] = {
@@ -307,7 +307,7 @@ TEST_F(EGLTest, EGLDisplayP3Passthrough) { 


    get8BitConfig(config);



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -317,7 +317,7 @@ TEST_F(EGLTest, EGLDisplayP3Passthrough) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;

    EGLint winAttrs[] = {
@@ -399,7 +399,7 @@ TEST_F(EGLTest, EGLDisplayP31010102) { 
    EXPECT_EQ(components[2], 10);

    EXPECT_EQ(components[3], 2);



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -409,7 +409,7 @@ TEST_F(EGLTest, EGLDisplayP31010102) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;

    EGLint winAttrs[] = {
@@ -571,7 +571,7 @@ TEST_F(EGLTest, EGLBT2020Linear) { 


    ASSERT_NO_FATAL_FAILURE(get8BitConfig(config));



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -581,7 +581,7 @@ TEST_F(EGLTest, EGLBT2020Linear) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;
@@ -623,7 +623,7 @@ TEST_F(EGLTest, EGLBT2020PQ) { 


    ASSERT_NO_FATAL_FAILURE(get8BitConfig(config));



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -633,7 +633,7 @@ TEST_F(EGLTest, EGLBT2020PQ) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;

    std::vector<EGLint> winAttrs;
@@ -706,7 +706,7 @@ TEST_F(EGLTest, EGLConfigFP16) { 
    EXPECT_GE(components[2], 16);

    EXPECT_GE(components[3], 16);



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -715,7 +715,7 @@ TEST_F(EGLTest, EGLConfigFP16) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;
@@ -735,7 +735,7 @@ TEST_F(EGLTest, EGLNoConfigContext) { 


    ASSERT_TRUE(hasEglExtension(mEglDisplay, "EGL_KHR_no_config_context"));



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -810,7 +810,7 @@ TEST_F(EGLTest, EGLConfig1010102) { 
    EXPECT_EQ(components[2], 10);

    EXPECT_EQ(components[3], 2);



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -820,7 +820,7 @@ TEST_F(EGLTest, EGLConfig1010102) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;
@@ -836,7 +836,7 @@ TEST_F(EGLTest, EGLInvalidColorspaceAttribute) { 


    ASSERT_NO_FATAL_FAILURE(get8BitConfig(config));



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -846,7 +846,7 @@ TEST_F(EGLTest, EGLInvalidColorspaceAttribute) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;
@@ -883,7 +883,7 @@ TEST_F(EGLTest, EGLUnsupportedColorspaceFormatCombo) { 
    ASSERT_EQ(EGL_UNSIGNED_TRUE, success);

    ASSERT_EQ(1, numConfigs);



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -893,7 +893,7 @@ TEST_F(EGLTest, EGLUnsupportedColorspaceFormatCombo) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;
@@ -914,7 +914,7 @@ TEST_F(EGLTest, EGLCreateWindowFailAndSucceed) { 


    ASSERT_NO_FATAL_FAILURE(get8BitConfig(config));



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -924,7 +924,7 @@ TEST_F(EGLTest, EGLCreateWindowFailAndSucceed) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;
@@ -954,7 +954,7 @@ TEST_F(EGLTest, EGLCreateWindowTwoColorspaces) { 


    ASSERT_NO_FATAL_FAILURE(get8BitConfig(config));



    struct DummyConsumer : public BnConsumerListener {

    struct MockConsumer : public BnConsumerListener {

        void onFrameAvailable(const BufferItem& /* item */) override {}

        void onBuffersReleased() override {}

        void onSidebandStreamChanged() override {}
@@ -964,7 +964,7 @@ TEST_F(EGLTest, EGLCreateWindowTwoColorspaces) { 
    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    consumer->consumerConnect(new DummyConsumer, false);

    consumer->consumerConnect(new MockConsumer, false);

    sp<Surface> mSTC = new Surface(producer);

    sp<ANativeWindow> mANW = mSTC;

opengl/tools/glgen/gen

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ rm -rf out generated 


mkdir out



# Create dummy Java files for Android APIs that are used by the code we generate.

# Create stub Java files for Android APIs that are used by the code we generate.

# This allows us to test the generated code without building the rest of Android.



mkdir -p out/javax/microedition/khronos/opengles