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

Commit 42209896 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by android-build-merger
Browse files

Merge "Disable Vulkan backend when running hwui_unit_tests." into oc-dev am: f9dc09f4 

am: 1c9c7b86

Change-Id: I9550af0105210cdf24483f8dfe219833ff7812c8
parents 153da0d8 1c9c7b86

libs/hwui/tests/common/TestUtils.h

+4 −2
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ namespace uirenderer { 
    }; \

    INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, OpenGL); \

    INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaGL); \

    INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); \

    /* Temporarily disabling Vulkan until we can figure out a way to stub out the driver */ \

    /* INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); */ \

    void test_case_name##_##test_name##_RenderThreadTest::doTheThing(renderthread::RenderThread& renderThread)



/**
@@ -111,7 +112,8 @@ namespace uirenderer { 
        static void doTheThing(renderthread::RenderThread& renderThread); \

    }; \

    INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaGL); \

    INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); \

    /* Temporarily disabling Vulkan until we can figure out a way to stub out the driver */ \

    /* INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); */ \

    void test_case_name##_##test_name##_RenderThreadTest::doTheThing(renderthread::RenderThread& renderThread)



/**