Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 41c4963..c2da238 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -655,7 +655,7 @@
if (oldActiveBuffer == NULL) {
// the first time we receive a buffer, we need to trigger a
// geometry invalidation.
- mFlinger->invalidateHwcGeometry();
+ recomputeVisibleRegions = true;
}
Rect crop(mSurfaceTexture->getCurrentCrop());
@@ -668,7 +668,7 @@
mCurrentCrop = crop;
mCurrentTransform = transform;
mCurrentScalingMode = scalingMode;
- mFlinger->invalidateHwcGeometry();
+ recomputeVisibleRegions = true;
}
if (oldActiveBuffer != NULL) {
@@ -676,7 +676,7 @@
uint32_t bufHeight = mActiveBuffer->getHeight();
if (bufWidth != uint32_t(oldActiveBuffer->width) ||
bufHeight != uint32_t(oldActiveBuffer->height)) {
- mFlinger->invalidateHwcGeometry();
+ recomputeVisibleRegions = true;
}
}