commit bb94f341d22734ab581d718513de0ce30a03440f
author Jamie Madill <jmadill@chromium.org> Mon Jun 23 15:23:02 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Jun 25 17:49:18 2014 +0000
tree 9bf3196f6f8b7fc79503127f5fe3df18b743b97b
parent e261b44af7631c31ddca8601490e7445af5a3341

Remove gl::IsInternalTextureTarget.

This function was a duplicate of ValidTexture2DDestinationTarget.
Also clean up a bit of the code in Framebuffer::completeness.

BUG=angle:660

Change-Id: Iee8d011274bfb2e426346e3ccdde7342fbb7ef44
Reviewed-on: https://chromium-review.googlesource.com/202595
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/common/utilities.cpp

diff --git a/src/common/utilities.cpp b/src/common/utilities.cpp
index 06ac723..b46bef6 100644
--- a/src/common/utilities.cpp
+++ b/src/common/utilities.cpp
@@ -392,24 +392,6 @@
     return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);
 }
 
-bool IsInternalTextureTarget(GLenum target, GLuint clientVersion)
-{
-    if (clientVersion == 2)
-    {
-        return target == GL_TEXTURE_2D || IsCubemapTextureTarget(target);
-    }
-    else if (clientVersion == 3)
-    {
-        return target == GL_TEXTURE_2D || IsCubemapTextureTarget(target) ||
-               target == GL_TEXTURE_3D || target == GL_TEXTURE_2D_ARRAY;
-    }
-    else
-    {
-        UNREACHABLE();
-        return false;
-    }
-}
-
 bool IsTriangleMode(GLenum drawMode)
 {
     switch (drawMode)

src/common/utilities.h

diff --git a/src/common/utilities.h b/src/common/utilities.h
index f69e33a..39ebfc8 100644
--- a/src/common/utilities.h
+++ b/src/common/utilities.h
@@ -38,7 +38,6 @@
 int AllocateFirstFreeBits(unsigned int *bits, unsigned int allocationSize, unsigned int bitsSize);
 
 bool IsCubemapTextureTarget(GLenum target);
-bool IsInternalTextureTarget(GLenum target, GLuint clientVersion);
 
 bool IsTriangleMode(GLenum drawMode);
 

src/libGLESv2/Framebuffer.cpp

diff --git a/src/libGLESv2/Framebuffer.cpp b/src/libGLESv2/Framebuffer.cpp
index 5fc8232..a69bf7a 100644
--- a/src/libGLESv2/Framebuffer.cpp
+++ b/src/libGLESv2/Framebuffer.cpp
@@ -416,15 +416,10 @@
 
     for (unsigned int colorAttachment = 0; colorAttachment < IMPLEMENTATION_MAX_DRAW_BUFFERS; colorAttachment++)
     {
-        if (mColorbuffers[colorAttachment])
+        const FramebufferAttachment *colorbuffer = mColorbuffers[colorAttachment];
+
+        if (colorbuffer)
         {
-            const FramebufferAttachment *colorbuffer = mColorbuffers[colorAttachment];
-
-            if (colorbuffer->type() == GL_NONE)
-            {
-                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
-            }
-
             if (colorbuffer->getWidth() == 0 || colorbuffer->getHeight() == 0)
             {
                 return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
@@ -432,14 +427,7 @@
 
             GLenum internalformat = colorbuffer->getInternalFormat();
             const TextureCaps &formatCaps = mRenderer->getCaps().textureCaps.get(internalformat);
-            if (colorbuffer->type() == GL_RENDERBUFFER)
-            {
-                if (!formatCaps.colorRendering)
-                {
-                    return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
-                }
-            }
-            else if (IsInternalTextureTarget(colorbuffer->type(), mRenderer->getCurrentClientVersion()))
+            if (colorbuffer->isTexture())
             {
                 if (!formatCaps.colorRendering)
                 {
@@ -454,8 +442,10 @@
             }
             else
             {
-                UNREACHABLE();
-                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+                if (!formatCaps.colorRendering)
+                {
+                    return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+                }
             }
 
             if (!missingAttachment)
@@ -513,14 +503,7 @@
 
         GLenum internalformat = mDepthbuffer->getInternalFormat();
         const TextureCaps &formatCaps = mRenderer->getCaps().textureCaps.get(internalformat);
-        if (mDepthbuffer->type() == GL_RENDERBUFFER)
-        {
-            if (!formatCaps.depthRendering)
-            {
-                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
-            }
-        }
-        else if (IsInternalTextureTarget(mDepthbuffer->type(), mRenderer->getCurrentClientVersion()))
+        if (mDepthbuffer->isTexture())
         {
             GLenum internalformat = mDepthbuffer->getInternalFormat();
 
@@ -542,8 +525,10 @@
         }
         else
         {
-            UNREACHABLE();
-            return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+            if (!formatCaps.depthRendering)
+            {
+                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+            }
         }
 
         if (missingAttachment)
@@ -572,14 +557,7 @@
 
         GLenum internalformat = mStencilbuffer->getInternalFormat();
         const TextureCaps &formatCaps = mRenderer->getCaps().textureCaps.get(internalformat);
-        if (mStencilbuffer->type() == GL_RENDERBUFFER)
-        {
-            if (!formatCaps.stencilRendering)
-            {
-                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
-            }
-        }
-        else if (IsInternalTextureTarget(mStencilbuffer->type(), mRenderer->getCurrentClientVersion()))
+        if (mStencilbuffer->isTexture())
         {
             GLenum internalformat = mStencilbuffer->getInternalFormat();
 
@@ -602,8 +580,10 @@
         }
         else
         {
-            UNREACHABLE();
-            return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+            if (!formatCaps.stencilRendering)
+            {
+                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
+            }
         }
 
         if (missingAttachment)

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 6be355a..a87ff60 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2709,7 +2709,7 @@
             {
                 attachmentObjectType = attachmentType;
             }
-            else if (gl::IsInternalTextureTarget(attachmentType, context->getClientVersion()))
+            else if (gl::ValidTexture2DDestinationTarget(context, attachmentType))
             {
                 attachmentObjectType = GL_TEXTURE;
             }