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

Commit 3330b203 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix [2167050] glTexImage2D code path buggy in SurfaceFlinger 

When EGLImage extension is not available, SurfaceFlinger will fallback to using
glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an
extra copy. However this code path has never been exercised and had some bugs
which this patch fix.

Mainly the scale factor wasn't computed right when falling back on glDrawElements.
We also fallback to this mode of operation if a buffer doesn't have the adequate
usage bits for EGLImage usage.

This changes only code that is currently not executed. Some refactoring was needed to
keep the change clean. This doesn't change anything functionaly.
parent 0ad3f9f4

include/private/ui/SurfaceBuffer.h

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_UI_PRIVATE_SURFACE_BUFFER_H

#define ANDROID_UI_PRIVATE_SURFACE_BUFFER_H



#include <stdint.h>

#include <sys/types.h>



#include <utils/RefBase.h>



#include <private/ui/android_natives_priv.h>



namespace android {



// ---------------------------------------------------------------------------



class BufferMapper;

class Parcel;

class Rect;

class Surface;

class SurfaceBuffer;



// ---------------------------------------------------------------------------



class SurfaceBuffer 

    : public EGLNativeBase<

        android_native_buffer_t, 

        SurfaceBuffer, 

        LightRefBase<SurfaceBuffer> >

{

public:

    status_t lock(uint32_t usage, void** vaddr);

    status_t lock(uint32_t usage, const Rect& rect, void** vaddr);

    status_t unlock();



    void setIndex(int index);

    int getIndex() const;

    

protected:

            SurfaceBuffer();

            SurfaceBuffer(const Parcel& reply);

    virtual ~SurfaceBuffer();

    bool mOwner;



    inline const BufferMapper& getBufferMapper() const { return mBufferMapper; }

    inline BufferMapper& getBufferMapper() { return mBufferMapper; }

    

private:

    friend class Surface;

    friend class BpSurface;

    friend class BnSurface;

    friend class LightRefBase<SurfaceBuffer>;    



    SurfaceBuffer& operator = (const SurfaceBuffer& rhs);

    const SurfaceBuffer& operator = (const SurfaceBuffer& rhs) const;



    static status_t writeToParcel(Parcel* reply, 

            android_native_buffer_t const* buffer);

    

    BufferMapper& mBufferMapper;

    int mIndex;

};



}; // namespace android



#endif // ANDROID_UI_PRIVATE_SURFACE_BUFFER_H

include/private/ui/android_natives_priv.h

+1 −46
Original line number Diff line number Diff line
@@ -14,49 +14,4 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_ANDROID_NATIVES_PRIV_H

#define ANDROID_ANDROID_NATIVES_PRIV_H



#include <ui/egl/android_natives.h>



#ifdef __cplusplus

extern "C" {

#endif



/*****************************************************************************/



typedef struct android_native_buffer_t

{

#ifdef __cplusplus

    android_native_buffer_t() { 

        common.magic = ANDROID_NATIVE_BUFFER_MAGIC;

        common.version = sizeof(android_native_buffer_t);

        memset(common.reserved, 0, sizeof(common.reserved));

    }

#endif



    struct android_native_base_t common;



    int width;

    int height;

    int stride;

    int format;

    int usage;

    

    void* reserved[2];



    buffer_handle_t handle;



    void* reserved_proc[8];

} android_native_buffer_t;





/*****************************************************************************/



#ifdef __cplusplus

}

#endif



/*****************************************************************************/



#endif /* ANDROID_ANDROID_NATIVES_PRIV_H */
 
#include <ui/android_native_buffer.h>

libs/surfaceflinger/Buffer.h→include/ui/GraphicBuffer.h

+124 −0
Original line number Diff line number Diff line
@@ -14,38 +14,59 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_LAYER_BITMAP_H

#define ANDROID_LAYER_BITMAP_H

#ifndef ANDROID_GRAPHIC_BUFFER_H

#define ANDROID_GRAPHIC_BUFFER_H



#include <stdint.h>

#include <sys/types.h>



#include <ui/android_native_buffer.h>

#include <ui/PixelFormat.h>

#include <ui/Rect.h>

#include <pixelflinger/pixelflinger.h>

#include <private/ui/SurfaceBuffer.h>



struct android_native_buffer_t;



namespace android {



class GraphicBufferMapper;

class Parcel;



// ===========================================================================

// Buffer

// GraphicBuffer

// ===========================================================================



class Buffer : public SurfaceBuffer

class GraphicBuffer

    : public EGLNativeBase<

        android_native_buffer_t, 

        GraphicBuffer, 

        LightRefBase<GraphicBuffer> >

{

public:



    enum {

        DONT_CLEAR  = 0x00000001,

        SECURE      = 0x00000004

        USAGE_SW_READ_NEVER     = GRALLOC_USAGE_SW_READ_NEVER,

        USAGE_SW_READ_RARELY    = GRALLOC_USAGE_SW_READ_RARELY,

        USAGE_SW_READ_OFTEN     = GRALLOC_USAGE_SW_READ_OFTEN,

        USAGE_SW_READ_MASK      = GRALLOC_USAGE_SW_READ_MASK,

        

        USAGE_SW_WRITE_NEVER    = GRALLOC_USAGE_SW_WRITE_NEVER,

        USAGE_SW_WRITE_RARELY   = GRALLOC_USAGE_SW_WRITE_RARELY,

        USAGE_SW_WRITE_OFTEN    = GRALLOC_USAGE_SW_WRITE_OFTEN,

        USAGE_SW_WRITE_MASK     = GRALLOC_USAGE_SW_WRITE_MASK,

        

        USAGE_SOFTWARE_MASK     = USAGE_SW_READ_MASK|USAGE_SW_WRITE_MASK,

        

        USAGE_HW_TEXTURE        = GRALLOC_USAGE_HW_TEXTURE,

        USAGE_HW_RENDER         = GRALLOC_USAGE_HW_RENDER,

        USAGE_HW_2D             = GRALLOC_USAGE_HW_2D,

        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK

    };



    Buffer();

    GraphicBuffer();



    // creates w * h buffer

    Buffer(uint32_t w, uint32_t h, PixelFormat format,

            uint32_t reqUsage, uint32_t flags = 0);

    GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t ssage);



    // return status

    status_t initCheck() const;
@@ -57,27 +78,47 @@ public: 
    PixelFormat getPixelFormat() const  { return format; }

    Rect getBounds() const              { return Rect(width, height); }

    

    status_t reallocate(uint32_t w, uint32_t h, PixelFormat f, uint32_t usage);



    status_t lock(uint32_t usage, void** vaddr);

    status_t lock(uint32_t usage, const Rect& rect, void** vaddr);

    status_t lock(GGLSurface* surface, uint32_t usage);

    status_t unlock();

    

    android_native_buffer_t* getNativeBuffer() const;

    

    status_t reallocate(uint32_t w, uint32_t h, PixelFormat f,

            uint32_t reqUsage, uint32_t flags);

    void setIndex(int index);

    int getIndex() const;



protected:

    GraphicBuffer(const Parcel& reply);

    virtual ~GraphicBuffer();



    inline const GraphicBufferMapper& getBufferMapper() const { return mBufferMapper; }

    inline GraphicBufferMapper& getBufferMapper() { return mBufferMapper; }

    bool mOwner;



private:

    friend class LightRefBase<Buffer>;

    Buffer(const Buffer& rhs);

    virtual ~Buffer();

    Buffer& operator = (const Buffer& rhs);

    const Buffer& operator = (const Buffer& rhs) const;

    friend class Surface;

    friend class BpSurface;

    friend class BnSurface;

    friend class LightRefBase<GraphicBuffer>;

    GraphicBuffer(const GraphicBuffer& rhs);

    GraphicBuffer& operator = (const GraphicBuffer& rhs);

    const GraphicBuffer& operator = (const GraphicBuffer& rhs) const;



    status_t initSize(uint32_t w, uint32_t h, PixelFormat format, 

            uint32_t reqUsage, uint32_t flags);

            uint32_t usage);



    static status_t writeToParcel(Parcel* reply, 

            android_native_buffer_t const* buffer);



    GraphicBufferMapper& mBufferMapper;

    ssize_t mInitCheck;

    uint32_t mVStride;

    int mIndex;

};



}; // namespace android



#endif // ANDROID_LAYER_BITMAP_H
 
#endif // ANDROID_GRAPHIC_BUFFER_H

opengl/tests/gralloc/BufferAllocator.h→include/ui/GraphicBufferAllocator.h

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace android { 


class String8;



class BufferAllocator : public Singleton<BufferAllocator>

class GraphicBufferAllocator : public Singleton<GraphicBufferAllocator>

{

public:

    enum {
@@ -59,7 +59,7 @@ public: 
        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK

    };



    static inline BufferAllocator& get() { return getInstance(); }

    static inline GraphicBufferAllocator& get() { return getInstance(); }

    



    status_t alloc(uint32_t w, uint32_t h, PixelFormat format, int usage,
@@ -82,9 +82,9 @@ private: 
    static Mutex sLock;

    static KeyedVector<buffer_handle_t, alloc_rec_t> sAllocList;

    

    friend class Singleton<BufferAllocator>;

    BufferAllocator();

    ~BufferAllocator();

    friend class Singleton<GraphicBufferAllocator>;

    GraphicBufferAllocator();

    ~GraphicBufferAllocator();

    

    mutable Mutex mLock;

    alloc_device_t  *mAllocDev;

include/ui/BufferMapper.h→include/ui/GraphicBufferMapper.h

+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ namespace android { 


class Rect;



class BufferMapper : public Singleton<BufferMapper>

class GraphicBufferMapper : public Singleton<GraphicBufferMapper>

{

public:

    static inline BufferMapper& get() { return getInstance(); }

    static inline GraphicBufferMapper& get() { return getInstance(); }



    status_t registerBuffer(buffer_handle_t handle);
@@ -51,8 +51,8 @@ public: 
    void dump(buffer_handle_t handle);



private:

    friend class Singleton<BufferMapper>;

    BufferMapper();

    friend class Singleton<GraphicBufferMapper>;

    GraphicBufferMapper();

    gralloc_module_t const *mAllocMod;

};