summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2012-09-21 15:08:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-21 15:08:12 -0700
commit059aedf808c8b9b3da1457eef52f3d477878d50b (patch)
tree7d980afc55e8df8050a0077f88e2df7db0c51de7 /libs
parentf98db0de2248ad286b207eed6a826373cc60b786 (diff)
parentf7e52d92b41adf460089625ea47bfea2ed7e6296 (diff)
downloadframeworks_base-059aedf808c8b9b3da1457eef52f3d477878d50b.zip
frameworks_base-059aedf808c8b9b3da1457eef52f3d477878d50b.tar.gz
frameworks_base-059aedf808c8b9b3da1457eef52f3d477878d50b.tar.bz2
Merge "Finish this bit before I forget." into jb-mr1-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/Stencil.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/Stencil.cpp b/libs/hwui/Stencil.cpp
index 9d2c86f..7dfdf0e 100644
--- a/libs/hwui/Stencil.cpp
+++ b/libs/hwui/Stencil.cpp
@@ -37,9 +37,10 @@ void Stencil::clear() {
void Stencil::enableTest() {
if (mState != kTest) {
enable();
- glStencilFunc(GL_LESS, 0x0, 0x1);
+ glStencilFunc(GL_EQUAL, 0x0, 0x1);
// We only want to test, let's keep everything
glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+ glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
mState = kTest;
}
}
@@ -50,6 +51,7 @@ void Stencil::enableWrite() {
glStencilFunc(GL_ALWAYS, 0x1, 0x1);
// The test always passes so the first two values are meaningless
glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+ glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
mState = kWrite;
}
}