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

Commit 8a7f4b1b authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents f3abd17c b77145f0

include/ui/GraphicBufferAllocator.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ private: 
    GraphicBufferAllocator();

    ~GraphicBufferAllocator();

    

    mutable Mutex mLock;

    alloc_device_t  *mAllocDev;

};

libs/ui/GraphicBufferAllocator.cpp

+0 −4
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ static inline uint32_t clamp(uint32_t c) { 
status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat format,

        int usage, buffer_handle_t* handle, int32_t* stride)

{

    Mutex::Autolock _l(mLock);



    // make sure to not allocate a 0 x 0 buffer

    w = clamp(w);

    h = clamp(h);
@@ -118,8 +116,6 @@ status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat forma 


status_t GraphicBufferAllocator::free(buffer_handle_t handle)

{

    Mutex::Autolock _l(mLock);



    status_t err;

    if (sw_gralloc_handle_t::validate(handle) < 0) {

        err = mAllocDev->free(mAllocDev, handle);

opengl/libagl/state.cpp

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



static char const * const gVendorString     = "Android";

static char const * const gRendererString   = "Android PixelFlinger 1.2";

static char const * const gRendererString   = "Android PixelFlinger 1.3";

static char const * const gVersionString    = "OpenGL ES-CM 1.0";

static char const * const gExtensionsString =

    "GL_OES_byte_coordinates "              // OK