am 16627347: Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev

    INIT_LOGD("    Maximum texture dimension is %d pixels", mMaxTextureSize);

    mDebugEnabled = readDebugLevel() & kDebugCaches;

    mHasNPot = false; //Caches::getInstance().extensions.hasNPot();

}

///////////////////////////////////////////////////////////////////////////////

        return;

    }

    // We could also enable mipmapping if both bitmap dimensions are powers

    // of 2 but we'd have to deal with size changes. Let's keep this simple

    const bool canMipMap = Caches::getInstance().extensions.hasNPot();

    // If the texture had mipmap enabled but not anymore,

    // force a glTexImage2D to discard the mipmap levels

    const bool resize = !regenerate || bitmap->width() != int(texture->width) ||

            bitmap->height() != int(texture->height) ||

            (regenerate && mHasNPot && texture->mipMap && !bitmap->hasHardwareMipMap());

            (regenerate && canMipMap && texture->mipMap && !bitmap->hasHardwareMipMap());

    if (!regenerate) {

        glGenTextures(1, &texture->id);

        break;

    }

    if (mHasNPot) {

    if (canMipMap) {

        texture->mipMap = bitmap->hasHardwareMipMap();

        if (texture->mipMap) {

            glGenerateMipmap(GL_TEXTURE_2D);

    float mFlushRate;

    bool mHasNPot;

    bool mDebugEnabled;

    Vector<SkBitmap*> mGarbage;