Commit 551022eb by apatrick@chromium.org

Rename IslTextureTarget to IsInternalTextureTarget.

TEXTURE_EXTERNAL is not considered an internal texture target. Review URL: https://codereview.appspot.com/5556067 git-svn-id: https://angleproject.googlecode.com/svn/trunk@955 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 77b95e1c
#define MAJOR_VERSION 1
#define MINOR_VERSION 0
#define BUILD_VERSION 0
#define BUILD_REVISION 954
#define BUILD_REVISION 955
#define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x)
......
......@@ -44,7 +44,7 @@ Renderbuffer *Framebuffer::lookupRenderbuffer(GLenum type, GLuint handle) const
{
buffer = context->getRenderbuffer(handle);
}
else if (IsTextureTarget(type))
else if (IsInternalTextureTarget(type))
{
buffer = context->getTexture(handle)->getRenderbuffer(type);
}
......@@ -76,19 +76,19 @@ void Framebuffer::setStencilbuffer(GLenum type, GLuint stencilbuffer)
void Framebuffer::detachTexture(GLuint texture)
{
if (mColorbufferPointer.id() == texture && IsTextureTarget(mColorbufferType))
if (mColorbufferPointer.id() == texture && IsInternalTextureTarget(mColorbufferType))
{
mColorbufferType = GL_NONE;
mColorbufferPointer.set(NULL);
}
if (mDepthbufferPointer.id() == texture && IsTextureTarget(mDepthbufferType))
if (mDepthbufferPointer.id() == texture && IsInternalTextureTarget(mDepthbufferType))
{
mDepthbufferType = GL_NONE;
mDepthbufferPointer.set(NULL);
}
if (mStencilbufferPointer.id() == texture && IsTextureTarget(mStencilbufferType))
if (mStencilbufferPointer.id() == texture && IsInternalTextureTarget(mStencilbufferType))
{
mStencilbufferType = GL_NONE;
mStencilbufferPointer.set(NULL);
......@@ -268,7 +268,7 @@ GLenum Framebuffer::completeness()
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
}
}
else if (IsTextureTarget(mColorbufferType))
else if (IsInternalTextureTarget(mColorbufferType))
{
if (IsCompressed(colorbuffer->getInternalFormat()))
{
......
......@@ -1022,7 +1022,7 @@ void __stdcall glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffs
try
{
if (!gl::IsTextureTarget(target))
if (!gl::IsInternalTextureTarget(target))
{
return error(GL_INVALID_ENUM);
}
......@@ -1311,7 +1311,7 @@ void __stdcall glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GL
try
{
if (!gl::IsTextureTarget(target))
if (!gl::IsInternalTextureTarget(target))
{
return error(GL_INVALID_ENUM);
}
......@@ -2976,7 +2976,7 @@ void __stdcall glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attac
{
attachmentObjectType = attachmentType;
}
else if (gl::IsTextureTarget(attachmentType))
else if (gl::IsInternalTextureTarget(attachmentType))
{
attachmentObjectType = GL_TEXTURE;
}
......@@ -5392,7 +5392,7 @@ void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint
try
{
if (!gl::IsTextureTarget(target))
if (!gl::IsInternalTextureTarget(target))
{
return error(GL_INVALID_ENUM);
}
......
......@@ -328,7 +328,7 @@ bool IsCubemapTextureTarget(GLenum target)
return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X && target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);
}
bool IsTextureTarget(GLenum target)
bool IsInternalTextureTarget(GLenum target)
{
return target == GL_TEXTURE_2D || IsCubemapTextureTarget(target);
}
......
......@@ -37,7 +37,7 @@ GLsizei ComputeCompressedPitch(GLsizei width, GLenum format);
GLsizei ComputeCompressedSize(GLsizei width, GLsizei height, GLenum format);
bool IsCompressed(GLenum format);
bool IsCubemapTextureTarget(GLenum target);
bool IsTextureTarget(GLenum target);
bool IsInternalTextureTarget(GLenum target);
bool CheckTextureFormatType(GLenum format, GLenum type);
GLenum ExtractFormat(GLenum internalformat);
GLenum ExtractType(GLenum internalformat);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment