diff options
author | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-09 23:24:46 +0000 |
commit | 03f1910431433f3a35f1445aa0bba2b00417f0cc (patch) | |
tree | 3b74e3c04d9b15fad533b1e0eb380ddcdd93b181 /rsScriptC_LibGL.cpp | |
parent | c0a65425f8eb3573b1abd2a48292ca953c0a8590 (diff) | |
parent | af12ac6a08651464f8d823add667c706f993b587 (diff) | |
download | rs-03f1910431433f3a35f1445aa0bba2b00417f0cc.tar.gz |
resolved conflicts for merge of 08289f55 to graphics-dev
Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
Diffstat (limited to 'rsScriptC_LibGL.cpp')
-rw-r--r-- | rsScriptC_LibGL.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rsScriptC_LibGL.cpp b/rsScriptC_LibGL.cpp index a79c3cbb..742da96b 100644 --- a/rsScriptC_LibGL.cpp +++ b/rsScriptC_LibGL.cpp @@ -147,11 +147,11 @@ void rsrDrawQuadTexCoords(Context *rsc, Script *sc, return; } - //LOGE("Quad"); - //LOGE("%4.2f, %4.2f, %4.2f", x1, y1, z1); - //LOGE("%4.2f, %4.2f, %4.2f", x2, y2, z2); - //LOGE("%4.2f, %4.2f, %4.2f", x3, y3, z3); - //LOGE("%4.2f, %4.2f, %4.2f", x4, y4, z4); + //ALOGE("Quad"); + //ALOGE("%4.2f, %4.2f, %4.2f", x1, y1, z1); + //ALOGE("%4.2f, %4.2f, %4.2f", x2, y2, z2); + //ALOGE("%4.2f, %4.2f, %4.2f", x3, y3, z3); + //ALOGE("%4.2f, %4.2f, %4.2f", x4, y4, z4); float vtx[] = {x1,y1,z1, x2,y2,z2, x3,y3,z3, x4,y4,z4}; const float tex[] = {u1,v1, u2,v2, u3,v3, u4,v4}; @@ -196,7 +196,7 @@ void rsrDrawSpriteScreenspace(Context *rsc, Script *sc, } void rsrDrawRect(Context *rsc, Script *sc, float x1, float y1, float x2, float y2, float z) { - //LOGE("SC_drawRect %f,%f %f,%f %f", x1, y1, x2, y2, z); + //ALOGE("SC_drawRect %f,%f %f,%f %f", x1, y1, x2, y2, z); rsrDrawQuad(rsc, sc, x1, y2, z, x2, y2, z, x2, y1, z, x1, y1, z); } |