Fix cube map rendertargets.

src/libANGLE/ImageIndex.h

@@ -16,13 +16,14 @@
 namespace gl
 {
 
+class ImageIndexIterator;
+
 struct ImageIndex
 {
     GLenum type;
     GLint mipIndex;
     GLint layerIndex;
 
-    ImageIndex(GLenum typeIn, GLint mipIndexIn, GLint layerIndexIn);
     ImageIndex(const ImageIndex &other);
     ImageIndex &operator=(const ImageIndex &other);
 
@@ -35,6 +36,11 @@ struct ImageIndex
     static ImageIndex MakeInvalid();
 
     static const GLint ENTIRE_LEVEL = static_cast<GLint>(-1);
+
+  private:
+    friend class ImageIndexIterator;
+
+    ImageIndex(GLenum typeIn, GLint mipIndexIn, GLint layerIndexIn);
 };
 
 class ImageIndexIterator

src/libANGLE/renderer/d3d/TextureD3D.cpp

@@ -1157,14 +1157,14 @@ TextureD3D_Cube::~TextureD3D_Cube()
 Image *TextureD3D_Cube::getImage(int level, int layer) const
 {
     ASSERT(level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
-    ASSERT(layer < 6);
+    ASSERT(layer >= 0 && layer < 6);
     return mImageArray[layer][level];
 }
 
 Image *TextureD3D_Cube::getImage(const gl::ImageIndex &index) const
 {
     ASSERT(index.mipIndex < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS);
-    ASSERT(index.layerIndex < 6);
+    ASSERT(index.layerIndex >= 0 && index.layerIndex < 6);
     return mImageArray[index.layerIndex][index.mipIndex];
 }
 

src/libGLESv2/entry_points_gles_2_0.cpp

@@ -1473,7 +1473,19 @@ void GL_APIENTRY FramebufferTexture2D(GLenum target, GLenum attachment, GLenum t
         if (texture != 0)
         {
             Texture *textureObj = context->getTexture(texture);
-            ImageIndex index(textarget, level, ImageIndex::ENTIRE_LEVEL);
+
+            ImageIndex index = ImageIndex::MakeInvalid();
+
+            if (textarget == GL_TEXTURE_2D)
+            {
+                index = ImageIndex::Make2D(level);
+            }
+            else
+            {
+                ASSERT(IsCubemapTextureTarget(textarget));
+                index = ImageIndex::MakeCube(textarget, level);
+            }
+
             framebuffer->setTextureAttachment(attachment, textureObj, index);
         }
         else

src/libGLESv2/entry_points_gles_3_0.cpp

@@ -821,7 +821,19 @@ void GL_APIENTRY FramebufferTextureLayer(GLenum target, GLenum attachment, GLuin
         if (texture != 0)
         {
             Texture *textureObject = context->getTexture(texture);
-            ImageIndex index(textureObject->getTarget(), level, layer);
+
+            ImageIndex index = ImageIndex::MakeInvalid();
+
+            if (textureObject->getTarget() == GL_TEXTURE_3D)
+            {
+                index = ImageIndex::Make3D(level, layer);
+            }
+            else
+            {
+                ASSERT(textureObject->getTarget() == GL_TEXTURE_2D_ARRAY);
+                index = ImageIndex::Make2DArray(level, layer);
+            }
+
             framebuffer->setTextureAttachment(attachment, textureObject, index);
         }
         else

tests/angle_tests/TextureTest.cpp

@@ -390,3 +390,21 @@ TYPED_TEST(TextureTestES3, MipmapsForTextureArray)
     EXPECT_GL_NO_ERROR();
     EXPECT_PIXEL_EQ(px, py, 0, 0, 255, 255);
 }
+
+// Test creating a FBO with a cube map render target, to test an ANGLE bug
+// https://code.google.com/p/angleproject/issues/detail?id=849
+TYPED_TEST(TextureTest, CubeMapFBO)
+{
+    GLuint fbo;
+    glGenFramebuffers(1, &fbo);
+    glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+
+    glBindTexture(GL_TEXTURE_CUBE_MAP, mTextureCube);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, mTextureCube, 0);
+
+    EXPECT_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
+
+    glDeleteFramebuffers(1, &fbo);
+
+    EXPECT_GL_NO_ERROR();
+}