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

Commit fb10ffe4 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Add null egl/gles stub support"

parents 72aec2a9 041b985d

libs/hwui/Android.common.mk

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,14 @@ ifdef HWUI_COMPILE_FOR_PERF 
    LOCAL_CFLAGS += -fno-omit-frame-pointer -marm -mapcs

endif



ifeq (true, $(HWUI_NULL_GPU))

    LOCAL_SRC_FILES += \

        tests/nullegl.cpp \

        tests/nullgles.cpp



    LOCAL_CFLAGS += -DHWUI_NULL_GPU

endif



# Defaults for ATRACE_TAG and LOG_TAG for libhwui

LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"

libs/hwui/Caches.cpp

+0 −8
Original line number Diff line number Diff line
@@ -107,14 +107,6 @@ void Caches::initExtensions() { 
        startMark = startMarkNull;

        endMark = endMarkNull;

    }



    if (mExtensions.hasDebugLabel() && (drawDeferDisabled || drawReorderDisabled)) {

        setLabel = glLabelObjectEXT;

        getLabel = glGetObjectLabelEXT;

    } else {

        setLabel = setLabelNull;

        getLabel = getLabelNull;

    }

}



void Caches::initConstraints() {

libs/hwui/Caches.h

+0 −11
Original line number Diff line number Diff line
@@ -207,9 +207,6 @@ public: 
    PFNGLPUSHGROUPMARKEREXTPROC startMark;

    PFNGLPOPGROUPMARKEREXTPROC endMark;



    PFNGLLABELOBJECTEXTPROC setLabel;

    PFNGLGETOBJECTLABELEXTPROC getLabel;



    // TEMPORARY properties

    void initTempProperties();

    void setTempProperty(const char* name, const char* value);
@@ -244,14 +241,6 @@ private: 
    static void startMarkNull(GLsizei length, const GLchar* marker) { }

    static void endMarkNull() { }



    static void setLabelNull(GLenum type, uint object, GLsizei length,

            const char* label) { }

    static void getLabelNull(GLenum type, uint object, GLsizei bufferSize,

            GLsizei* length, char* label) {

        if (length) *length = 0;

        if (label) *label = '\0';

    }



    RenderState* mRenderState;



    // Used to render layers

libs/hwui/Extensions.cpp

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ Extensions::Extensions() { 
    mHasFramebufferFetch = hasGlExtension("GL_NV_shader_framebuffer_fetch");

    mHasDiscardFramebuffer = hasGlExtension("GL_EXT_discard_framebuffer");

    mHasDebugMarker = hasGlExtension("GL_EXT_debug_marker");

    mHasDebugLabel = hasGlExtension("GL_EXT_debug_label");

    mHasTiledRendering = hasGlExtension("GL_QCOM_tiled_rendering");

    mHas1BitStencil = hasGlExtension("GL_OES_stencil1");

    mHas4BitStencil = hasGlExtension("GL_OES_stencil4");

libs/hwui/Extensions.h

+0 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ public: 
    inline bool hasFramebufferFetch() const { return mHasFramebufferFetch; }

    inline bool hasDiscardFramebuffer() const { return mHasDiscardFramebuffer; }

    inline bool hasDebugMarker() const { return mHasDebugMarker; }

    inline bool hasDebugLabel() const { return mHasDebugLabel; }

    inline bool hasTiledRendering() const { return mHasTiledRendering; }

    inline bool has1BitStencil() const { return mHas1BitStencil; }

    inline bool has4BitStencil() const { return mHas4BitStencil; }
@@ -68,7 +67,6 @@ private: 
    bool mHasFramebufferFetch;

    bool mHasDiscardFramebuffer;

    bool mHasDebugMarker;

    bool mHasDebugLabel;

    bool mHasTiledRendering;

    bool mHas1BitStencil;

    bool mHas4BitStencil;