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

Commit 0cc792d8 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Fix some compiler warnings in libpixelflinger." am: 5643f809 

am: 998bd12c

* commit '998bd12c':
  Fix some compiler warnings in libpixelflinger.
parents 1eb75435 998bd12c

libpixelflinger/include/private/pixelflinger/ggl_context.h

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ enum { 


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



class needs_filter_t;

struct needs_filter_t;

struct needs_t {

    inline int match(const needs_filter_t& filter);

    inline bool operator == (const needs_t& rhs) const {

libpixelflinger/trap.cpp

+4 −4
Original line number Diff line number Diff line
@@ -563,10 +563,10 @@ void trianglex_small(void* con, 
    

    c->init_y(c, miny);

    for (int32_t y = miny; y < maxy; y++) {

        register int32_t ex0 = ey0;

        register int32_t ex1 = ey1;

        register int32_t ex2 = ey2;    

        register int32_t xl, xr;

        int32_t ex0 = ey0;

        int32_t ex1 = ey1;

        int32_t ex2 = ey2;    

        int32_t xl, xr;

        for (xl=minx ; xl<maxx ; xl++) {

            if (ex0>0 && ex1>0 && ex2>0)

                break; // all strictly positive