commit 2eb54074af3d79bc7612b9244377958badde2ff7
author Yuly Novikov <ynovikov@chromium.org> Wed Aug 22 16:41:26 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Aug 31 18:07:27 2018 +0000
tree 735cfd051aab3e262d33d4b56a78800cf76b7247
parent abcb2b3b3662618fd39007f15649e647d82fd02b

Fix EGLImage pixel format validation

This fixes the scenario when EGLImage source and target have different types.
For example, a texture is created with unsigned format using glTexImage2D,
it is used as a source of EGLImage with eglCreateImageKHR,
and then the EGLImage is used to create a renderbuffer target with
glEGLImageTargetRenderbufferStorageOES.

OES_EGL_image doesn't specify what should happen in this case,
but GL implementations (Nexus 5X) seem to allow using this renderbuffer in
glFramebufferRenderbuffer and the resulting framebuffer is complete.
Thus, in this case, instead of checking whether the renderbuffer format
can be used in glFramebufferRenderbuffer, we need to check whether the
original texture can be used in glFramebufferTexture2D.
Similarly in reverse direction.

Also, for the case of source renderbuffer and target texture,
presume that glEGLImageTargetTexture2DOES will succeed regardless of
renderbuffer format.

1. Add isRenderable and isTexturable checks to egl::Image class,
   and perform different checks depending on source type.
2. Add isRenderable check to FramebufferAttachment and delegate EGLImage
   attachments check to egl::Image.
3. Use these checks in validation of EGLImageTargetTexture2D,
   EGLImageTargetRenderbufferStorage and when checking attachment completeness

Bug: angleproject:2567

Change-Id: I8e9f4a2930a4075a4d8464f62582c6825270187e
Reviewed-on: https://chromium-review.googlesource.com/1192585
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/Image.cpp

diff --git a/src/libANGLE/Image.cpp b/src/libANGLE/Image.cpp
index 69c7cb2..7a86733 100644
--- a/src/libANGLE/Image.cpp
+++ b/src/libANGLE/Image.cpp
@@ -123,6 +123,14 @@
     mTargetOf->setInitState(initState);
 }
 
+bool ImageSibling::isRenderable(const gl::Context *context,
+                                GLenum binding,
+                                const gl::ImageIndex &imageIndex) const
+{
+    ASSERT(isEGLImageTarget());
+    return mTargetOf->isRenderable(context);
+}
+
 ImageState::ImageState(EGLenum target, ImageSibling *buffer, const AttributeMap &attribs)
     : label(nullptr),
       imageIndex(GetImageIndex(target, attribs)),
@@ -130,7 +138,8 @@
       targets(),
       format(buffer->getAttachmentFormat(GL_NONE, imageIndex)),
       size(buffer->getAttachmentSize(imageIndex)),
-      samples(buffer->getAttachmentSamples(imageIndex))
+      samples(buffer->getAttachmentSamples(imageIndex)),
+      sourceType(target)
 {
 }
 
@@ -217,6 +226,39 @@
     return mState.format;
 }
 
+bool Image::isRenderable(const gl::Context *context) const
+{
+    if (IsTextureTarget(mState.sourceType))
+    {
+        return mState.format.info->textureAttachmentSupport(context->getClientVersion(),
+                                                            context->getExtensions());
+    }
+    if (IsRenderbufferTarget(mState.sourceType))
+    {
+        return mState.format.info->renderbufferSupport(context->getClientVersion(),
+                                                       context->getExtensions());
+    }
+
+    UNREACHABLE();
+    return false;
+}
+
+bool Image::isTexturable(const gl::Context *context) const
+{
+    if (IsTextureTarget(mState.sourceType))
+    {
+        return mState.format.info->textureSupport(context->getClientVersion(),
+                                                  context->getExtensions());
+    }
+    if (IsRenderbufferTarget(mState.sourceType))
+    {
+        return true;
+    }
+
+    UNREACHABLE();
+    return false;
+}
+
 size_t Image::getWidth() const
 {
     return mState.size.width;