summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2015-10-22 17:15:31 -0500
committerandroid-build-merger2015-10-22 17:15:31 -0500
commit998bd12c3fcd2e4bd36b2138017cd8f45bf64f88 (patch)
tree00e58959ca30a45a9d43fa9dae04f9107f350af3 /libpixelflinger
parenteea68c6f980133675ebecbfd620938a1380caf89 (diff)
parent5643f8094753e4672cb64ff9b4a7b307d43a80ac (diff)
downloadplatform-system-core-998bd12c3fcd2e4bd36b2138017cd8f45bf64f88.tar.gz
platform-system-core-998bd12c3fcd2e4bd36b2138017cd8f45bf64f88.tar.xz
platform-system-core-998bd12c3fcd2e4bd36b2138017cd8f45bf64f88.zip
Merge "Fix some compiler warnings in libpixelflinger."
am: 5643f80947 * commit '5643f8094753e4672cb64ff9b4a7b307d43a80ac': Fix some compiler warnings in libpixelflinger.
Diffstat (limited to 'libpixelflinger')
-rw-r--r--libpixelflinger/include/private/pixelflinger/ggl_context.h2
-rw-r--r--libpixelflinger/trap.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/libpixelflinger/include/private/pixelflinger/ggl_context.h b/libpixelflinger/include/private/pixelflinger/ggl_context.h
index d43655cbb..a18b2f769 100644
--- a/libpixelflinger/include/private/pixelflinger/ggl_context.h
+++ b/libpixelflinger/include/private/pixelflinger/ggl_context.h
@@ -234,7 +234,7 @@ enum {
234 234
235// ---------------------------------------------------------------------------- 235// ----------------------------------------------------------------------------
236 236
237class needs_filter_t; 237struct needs_filter_t;
238struct needs_t { 238struct needs_t {
239 inline int match(const needs_filter_t& filter); 239 inline int match(const needs_filter_t& filter);
240 inline bool operator == (const needs_t& rhs) const { 240 inline bool operator == (const needs_t& rhs) const {
diff --git a/libpixelflinger/trap.cpp b/libpixelflinger/trap.cpp
index 80efeff71..ea5362553 100644
--- a/libpixelflinger/trap.cpp
+++ b/libpixelflinger/trap.cpp
@@ -563,10 +563,10 @@ void trianglex_small(void* con,
563 563
564 c->init_y(c, miny); 564 c->init_y(c, miny);
565 for (int32_t y = miny; y < maxy; y++) { 565 for (int32_t y = miny; y < maxy; y++) {
566 register int32_t ex0 = ey0; 566 int32_t ex0 = ey0;
567 register int32_t ex1 = ey1; 567 int32_t ex1 = ey1;
568 register int32_t ex2 = ey2; 568 int32_t ex2 = ey2;
569 register int32_t xl, xr; 569 int32_t xl, xr;
570 for (xl=minx ; xl<maxx ; xl++) { 570 for (xl=minx ; xl<maxx ; xl++) {
571 if (ex0>0 && ex1>0 && ex2>0) 571 if (ex0>0 && ex1>0 && ex2>0)
572 break; // all strictly positive 572 break; // all strictly positive