diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 12:08:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 12:08:25 +0200 |
| commit | d7df65954a585e97ccee21fa9cb50cb116efddcc (patch) | |
| tree | 9ed9a1f46f5d2e8373dcab553bad55b54bb8103b /gfx/gl/GLTextureImage.cpp | |
| parent | ba71cc45fef6dfaecef8f5edf65ce1f1ff457624 (diff) | |
| parent | 9135a11e8c8f0837738fd976b28d36a53fd1de27 (diff) | |
| download | UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.gz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.lz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.xz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'gfx/gl/GLTextureImage.cpp')
| -rw-r--r-- | gfx/gl/GLTextureImage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gfx/gl/GLTextureImage.cpp b/gfx/gl/GLTextureImage.cpp index c91d558af..65678432d 100644 --- a/gfx/gl/GLTextureImage.cpp +++ b/gfx/gl/GLTextureImage.cpp @@ -149,6 +149,9 @@ BasicTextureImage::DirectUpdate(gfx::DataSourceSurface* aSurf, const nsIntRegion &uploadSize, needInit, aFrom); + if (mTextureFormat == SurfaceFormat::UNKNOWN) { + return false; + } if (uploadSize > 0) { UpdateUploadSize(uploadSize); |