summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libs/gui/SurfaceTexture.cpp4
-rw-r--r--services/surfaceflinger/Layer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 09c114e..5a6236a 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -858,8 +858,8 @@ status_t SurfaceTexture::updateTexImage() {
EGLDisplay dpy = eglGetCurrentDisplay();
#ifdef QCOM_HARDWARE
if (isGPUSupportedFormat(mSlots[buf].mGraphicBuffer->format) &&
- (avoidBindTexture == false) ||
- (isGPUSupportedFormatInHW(mSlots[buf].mGraphicBuffer->format))) {
+ ((avoidBindTexture == false) ||
+ (isGPUSupportedFormatInHW(mSlots[buf].mGraphicBuffer->format)))) {
#endif
if (image == EGL_NO_IMAGE_KHR) {
if (mSlots[buf].mGraphicBuffer == 0) {
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 1383874..474e03e 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -447,7 +447,7 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions)
#ifdef QCOM_HARDWARE
const DisplayHardware& hw(graphicPlane(0).displayHardware());
- bool avoidTex = (hw.getFlags() | DisplayHardware::C2D_COMPOSITION) ?
+ bool avoidTex = (hw.getFlags() & DisplayHardware::C2D_COMPOSITION) ?
true : false;
if (mSurfaceTexture->updateTexImage(avoidTex) < NO_ERROR) {