Save layered multiview end-point's arguments into attachment's state

src/libANGLE/Context.cpp

@@ -3142,7 +3142,23 @@ void Context::framebufferTextureMultiviewLayeredANGLE(GLenum target,
                                                       GLint baseViewIndex,
                                                       GLsizei numViews)
 {
-    UNIMPLEMENTED();
+    Framebuffer *framebuffer = mGLState.getTargetFramebuffer(target);
+    ASSERT(framebuffer);
+
+    if (texture != 0)
+    {
+        Texture *textureObj = getTexture(texture);
+
+        ImageIndex index = ImageIndex::Make2DArray(level, baseViewIndex);
+        framebuffer->setAttachmentMultiviewLayered(this, GL_TEXTURE, attachment, index, textureObj,
+                                                   numViews, baseViewIndex);
+    }
+    else
+    {
+        framebuffer->resetAttachment(this, attachment);
+    }
+
+    mGLState.setObjectDirty(target);
 }
 
 void Context::framebufferTextureMultiviewSideBySideANGLE(GLenum target,

src/libANGLE/Framebuffer.cpp

@@ -1244,6 +1244,19 @@ void Framebuffer::setAttachment(const Context *context,
                                          viewportOffsets);
 }
 
+void Framebuffer::setAttachmentMultiviewLayered(const Context *context,
+                                                GLenum type,
+                                                GLenum binding,
+                                                const ImageIndex &textureIndex,
+                                                FramebufferAttachmentObject *resource,
+                                                GLsizei numViews,
+                                                GLint baseViewIndex)
+{
+    setAttachment(context, type, binding, textureIndex, resource, numViews, baseViewIndex,
+                  GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE,
+                  FramebufferAttachment::kDefaultViewportOffsets);
+}
+
 void Framebuffer::setAttachmentMultiviewSideBySide(const Context *context,
                                                    GLenum type,
                                                    GLenum binding,

src/libANGLE/Framebuffer.h

@@ -148,6 +148,13 @@ class Framebuffer final : public LabeledObject, public OnAttachmentDirtyReceiver
                        GLenum binding,
                        const ImageIndex &textureIndex,
                        FramebufferAttachmentObject *resource);
+    void setAttachmentMultiviewLayered(const Context *context,
+                                       GLenum type,
+                                       GLenum binding,
+                                       const ImageIndex &textureIndex,
+                                       FramebufferAttachmentObject *resource,
+                                       GLsizei numViews,
+                                       GLint baseViewIndex);
     void setAttachmentMultiviewSideBySide(const Context *context,
                                           GLenum type,
                                           GLenum binding,

src/libANGLE/FramebufferAttachment.cpp

@@ -161,7 +161,14 @@ void FramebufferAttachment::attach(const Context *context,
     mNumViews        = numViews;
     mBaseViewIndex   = baseViewIndex;
     mMultiviewLayout = multiviewLayout;
-    mViewportOffsets = TransformViewportOffsetArrayToVectorOfOffsets(viewportOffsets, numViews);
+    if (multiviewLayout == GL_FRAMEBUFFER_MULTIVIEW_SIDE_BY_SIDE_ANGLE)
+    {
+        mViewportOffsets = TransformViewportOffsetArrayToVectorOfOffsets(viewportOffsets, numViews);
+    }
+    else
+    {
+        mViewportOffsets = GetDefaultViewportOffsetVector();
+    }
     resource->onAttach(context);
 
     if (mResource != nullptr)

src/tests/gl_tests/FramebufferMultiviewTest.cpp

@@ -281,7 +281,7 @@ TEST_P(FramebufferMultiviewTest, IncompleteViewTargetsSideBySide)
     const GLint kOtherViewportOffsets[4] = {2, 0, 4, 0};
 
     // Set the 0th attachment and keep it as it is till the end of the test. The 1st or depth
-    // attachment will me modified to change the framebuffer's status.
+    // attachment will be modified to change the framebuffer's status.
     glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 2,
                                                  &kViewportOffsets[0]);
     ASSERT_GL_NO_ERROR();
@@ -526,4 +526,109 @@ TEST_P(FramebufferMultiviewTest, SideBySideClear)
     EXPECT_PIXEL_EQ(3, 1, 255, 0, 0, 0);
 }
 
+// Test that glFramebufferTextureMultiviewLayeredANGLE modifies the internal multiview state.
+TEST_P(FramebufferMultiviewTest, ModifyLayeredState)
+{
+    if (!requestMultiviewExtension())
+    {
+        return;
+    }
+
+    GLFramebuffer multiviewFBO;
+    glBindFramebuffer(GL_FRAMEBUFFER, multiviewFBO);
+
+    GLTexture tex;
+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+    ASSERT_GL_NO_ERROR();
+
+    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 1, 2);
+    ASSERT_GL_NO_ERROR();
+
+    GLint numViews = -1;
+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_ANGLE,
+                                          &numViews);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(2, numViews);
+
+    GLint baseViewIndex = -1;
+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_ANGLE,
+                                          &baseViewIndex);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(1, baseViewIndex);
+
+    GLint multiviewLayout = GL_NONE;
+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_MULTIVIEW_LAYOUT_ANGLE,
+                                          &multiviewLayout);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(GL_FRAMEBUFFER_MULTIVIEW_LAYERED_ANGLE, multiviewLayout);
+
+    GLint internalViewportOffsets[2] = {-1};
+    glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                          GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_VIEWPORT_OFFSETS_ANGLE,
+                                          &internalViewportOffsets[0]);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_EQ(0, internalViewportOffsets[0]);
+    EXPECT_EQ(0, internalViewportOffsets[1]);
+}
+
+// Test framebuffer completeness status of a layered framebuffer with color attachments.
+TEST_P(FramebufferMultiviewTest, IncompleteViewTargetsLayered)
+{
+    if (!requestMultiviewExtension())
+    {
+        return;
+    }
+
+    GLFramebuffer fbo;
+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+
+    GLTexture tex;
+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex);
+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+    // Set the 0th attachment and keep it as it is till the end of the test. The 1st color
+    // attachment will be modified to change the framebuffer's status.
+    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex, 0, 0, 2);
+    ASSERT_GL_NO_ERROR();
+
+    GLTexture otherTexLayered;
+    glBindTexture(GL_TEXTURE_2D_ARRAY, otherTexLayered);
+    glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+
+    // Test framebuffer completeness when the base view index differs.
+    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered,
+                                              0, 1, 2);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
+                     glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
+    // Test framebuffer completeness when the 1st attachment has a side-by-side layout.
+    const int kViewportOffsets[4] = {0, 0, 0, 0};
+    GLTexture otherTex2D;
+    glBindTexture(GL_TEXTURE_2D, otherTex2D);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+    glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTex2D,
+                                                 0, 2, kViewportOffsets);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
+                     glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
+    // Test framebuffer completeness when the 1st attachment has a normal layout.
+    glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered, 0, 0);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_ANGLE,
+                     glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
+    // Test that framebuffer is complete when the number of views, base view index and layouts are
+    // the same.
+    glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, otherTexLayered,
+                                              0, 0, 2);
+    ASSERT_GL_NO_ERROR();
+    EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+}
+
 ANGLE_INSTANTIATE_TEST(FramebufferMultiviewTest, ES3_OPENGL());
\ No newline at end of file