summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-11-26 08:42:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-26 08:42:23 -0800
commit7d2db03ef7eb12fdf33562c37d47f803b32c12f1 (patch)
tree09ba4bdfb03832cfbb7b5a979a72ab8faebb824e
parenta3afb4c6172b03243bcb140620b1e62786df132d (diff)
parentf4083caec07ba6569865de40904e6776d2db3cfa (diff)
downloadsystem_core-7d2db03ef7eb12fdf33562c37d47f803b32c12f1.zip
system_core-7d2db03ef7eb12fdf33562c37d47f803b32c12f1.tar.gz
system_core-7d2db03ef7eb12fdf33562c37d47f803b32c12f1.tar.bz2
am f4083cae: am e456d420: Merge "libpixelflinger: do not use anonymous structs"
* commit 'f4083caec07ba6569865de40904e6776d2db3cfa': libpixelflinger: do not use anonymous structs
-rw-r--r--libpixelflinger/scanline.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libpixelflinger/scanline.cpp b/libpixelflinger/scanline.cpp
index a5d28b2..9663a2b 100644
--- a/libpixelflinger/scanline.cpp
+++ b/libpixelflinger/scanline.cpp
@@ -1877,7 +1877,7 @@ void scanline_perspective(context_t* c)
struct {
int32_t s, sq;
int32_t t, tq;
- };
+ } sqtq;
struct {
int32_t v, q;
} st[2];
@@ -1916,10 +1916,10 @@ void scanline_perspective(context_t* c)
int32_t t = tmu.shade.it0 +
(tmu.shade.idtdy * ys) + (tmu.shade.idtdx * xs) +
((tmu.shade.idtdx + tmu.shade.idtdy)>>1);
- tc[i].s = s;
- tc[i].t = t;
- tc[i].sq = gglMulx(s, q0, iwscale);
- tc[i].tq = gglMulx(t, q0, iwscale);
+ tc[i].sqtq.s = s;
+ tc[i].sqtq.t = t;
+ tc[i].sqtq.sq = gglMulx(s, q0, iwscale);
+ tc[i].sqtq.tq = gglMulx(t, q0, iwscale);
}
int32_t span = 0;