diff options
| author | Chris Craik <ccraik@google.com> | 2016-06-10 16:08:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 16:08:38 +0000 |
| commit | 715691302185d12bcbb2769715a536cb22581c5b (patch) | |
| tree | 9b1093756ca353e97e2fa99e6ee2bdf0bad01b31 /libs/hwui/RenderProperties.h | |
| parent | ae903e100f567f934e2b1c9522960f4464dcbeb2 (diff) | |
| parent | 4bcf66030d2c28dd307a0b03522f24a58b0e2084 (diff) | |
Merge \"Fix framebuffer incomplete errors\" into nyc-dev
am: 4bcf66030d
Change-Id: I478d99bc0b1f1f10fef38505282711e95b7f5a09
Diffstat (limited to 'libs/hwui/RenderProperties.h')
| -rw-r--r-- | libs/hwui/RenderProperties.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/RenderProperties.h b/libs/hwui/RenderProperties.h index 6a6e8dbb3fcd..c1221f7f7981 100644 --- a/libs/hwui/RenderProperties.h +++ b/libs/hwui/RenderProperties.h @@ -611,7 +611,9 @@ public: bool fitsOnLayer() const { const DeviceInfo* deviceInfo = DeviceInfo::get(); return mPrimitiveFields.mWidth <= deviceInfo->maxTextureSize() - && mPrimitiveFields.mHeight <= deviceInfo->maxTextureSize(); + && mPrimitiveFields.mHeight <= deviceInfo->maxTextureSize() + && mPrimitiveFields.mWidth > 0 + && mPrimitiveFields.mHeight > 0; } bool promotedToLayer() const { |