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

Commit 473d7b68 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[native] Use newer GrDirectContexts::MakeGL" into main

parents e5288f1d d19875ff

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <GrTypes.h>

#include <GrTypes.h>

#include <android-base/stringprintf.h>

#include <android-base/stringprintf.h>

#include <gl/GrGLInterface.h>

#include <gl/GrGLInterface.h>

#include <include/gpu/ganesh/gl/GrGLDirectContext.h>

#include <gui/TraceUtils.h>

#include <gui/TraceUtils.h>

#include <sync/sync.h>

#include <sync/sync.h>

#include <ui/DebugUtils.h>

#include <ui/DebugUtils.h>
@@ -299,10 +300,10 @@ SkiaRenderEngine::Contexts SkiaGLRenderEngine::createDirectContexts( 
    LOG_ALWAYS_FATAL_IF(!glInterface.get(), "GrGLMakeNativeInterface() failed");

    LOG_ALWAYS_FATAL_IF(!glInterface.get(), "GrGLMakeNativeInterface() failed");





    SkiaRenderEngine::Contexts contexts;

    SkiaRenderEngine::Contexts contexts;

    contexts.first = GrDirectContext::MakeGL(glInterface, options);

    contexts.first = GrDirectContexts::MakeGL(glInterface, options);

    if (supportsProtectedContentImpl()) {

    if (supportsProtectedContentImpl()) {

        useProtectedContextImpl(GrProtected::kYes);

        useProtectedContextImpl(GrProtected::kYes);

        contexts.second = GrDirectContext::MakeGL(glInterface, options);

        contexts.second = GrDirectContexts::MakeGL(glInterface, options);

        useProtectedContextImpl(GrProtected::kNo);

        useProtectedContextImpl(GrProtected::kNo);

    }

    }