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

Commit e310f83d authored by Chris Craik's avatar Chris Craik
Browse files

Fix unsafety in SkiaShader storage, and texture unit accounting 

bug:22390304

Fixes two issues:

1) The max texture unit wasn't large enough to handle the most complex
ComposeShader case (1 for draw primitive, 2 for gradient shader, 1 for
bitmap shader).

2) If a shader isn't supported by SkiaShader::store, the shader data
needs to be explicitly disabled, so we won't read uninitilized data
from it when trying to read shader information out.

Change-Id: I29ee7b7c1e07f67db88c1707bdc857daa305e713
parent 208934ff

libs/hwui/SkiaShader.cpp

+4 −0
Original line number Diff line number Diff line
@@ -370,7 +370,11 @@ void SkiaShader::store(Caches& caches, const SkShader& shader, const Matrix4& mo 
    if (tryStoreLayer(caches, shader, modelViewMatrix,

            textureUnit, description, &outData->layerData)) {

        outData->skiaShaderType = kLayer_SkiaShaderType;

        return;

    }



    // Unknown/unsupported type, so explicitly ignore shader

    outData->skiaShaderType = kNone_SkiaShaderType;

}



void SkiaShader::apply(Caches& caches, const SkiaShaderData& data) {

libs/hwui/renderstate/TextureState.cpp

+6 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ namespace uirenderer { 
const GLenum kTextureUnits[] = {

    GL_TEXTURE0,

    GL_TEXTURE1,

    GL_TEXTURE2

    GL_TEXTURE2,

    GL_TEXTURE3

};



TextureState::TextureState()
@@ -37,6 +38,9 @@ TextureState::TextureState() 
}



void TextureState::activateTexture(GLuint textureUnit) {

    LOG_ALWAYS_FATAL_IF(textureUnit >= kTextureUnitsCount,

            "Tried to use texture unit index %d, only %d exist",

            textureUnit, kTextureUnitsCount);

    if (mTextureUnit != textureUnit) {

        glActiveTexture(kTextureUnits[textureUnit]);

        mTextureUnit = textureUnit;

libs/hwui/renderstate/TextureState.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public: 
    void unbindTexture(GLuint texture);

private:

    // total number of texture units available for use

    static const int kTextureUnitsCount = 3;

    static const int kTextureUnitsCount = 4;



    TextureState();

    GLuint mTextureUnit;