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

Commit c312141a authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Clean up warnings in EGL."

parents 2be113a2 eacd31f4

opengl/libs/EGL/egl_cache.cpp

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "egldefs.h"



#include <fcntl.h>

#include <inttypes.h>

#include <sys/mman.h>

#include <sys/stat.h>

#include <sys/types.h>
@@ -306,7 +307,8 @@ void egl_cache_t::loadBlobCacheLocked() { 
        // Sanity check the size before trying to mmap it.

        size_t fileSize = statBuf.st_size;

        if (fileSize > maxTotalSize * 2) {

            ALOGE("cache file is too large: %#llx", statBuf.st_size);

            ALOGE("cache file is too large: %#" PRIx64,

                  static_cast<off64_t>(statBuf.st_size));

            close(fd);

            return;

        }

opengl/libs/EGL/egl_display.cpp

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ EGLBoolean egl_display_t::terminate() { 
        // there are no reference to them, it which case, we're free to

        // delete them.

        size_t count = objects.size();

        ALOGW_IF(count, "eglTerminate() called w/ %d objects remaining", count);

        ALOGW_IF(count, "eglTerminate() called w/ %zu objects remaining", count);

        for (size_t i=0 ; i<count ; i++) {

            egl_object_t* o = objects.itemAt(i);

            o->destroy();

opengl/libs/EGL/egl_object.h

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

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



struct egl_display_t;

class egl_display_t;



class egl_object_t {

    egl_display_t *display;