Commit 6be3d4cd by Geoff Lang

Fix incorrect format set being used for destination copy formats.

This validation matches Chrome's. BUG=angleproject:1932 Change-Id: I2dc75c21924231ab75000dff92ef92cbc12adf55 Reviewed-on: https://chromium-review.googlesource.com/538956Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent e7bd218c
...@@ -232,11 +232,6 @@ bool IsValidCopySubTextureSourceInternalFormat(GLenum internalFormat) ...@@ -232,11 +232,6 @@ bool IsValidCopySubTextureSourceInternalFormat(GLenum internalFormat)
return IsValidCopyTextureSourceInternalFormatEnum(internalFormat); return IsValidCopyTextureSourceInternalFormatEnum(internalFormat);
} }
bool IsValidCopySubTextureDestionationInternalFormat(GLenum internalFormat)
{
return IsValidCopyTextureSourceInternalFormatEnum(internalFormat);
}
bool IsValidCopyTextureDestinationInternalFormatEnum(GLint internalFormat) bool IsValidCopyTextureDestinationInternalFormatEnum(GLint internalFormat)
{ {
// Table 1.0 from the CHROMIUM_copy_texture spec // Table 1.0 from the CHROMIUM_copy_texture spec
...@@ -257,6 +252,7 @@ bool IsValidCopyTextureDestinationInternalFormatEnum(GLint internalFormat) ...@@ -257,6 +252,7 @@ bool IsValidCopyTextureDestinationInternalFormatEnum(GLint internalFormat)
case GL_SRGB8: case GL_SRGB8:
case GL_RGB565: case GL_RGB565:
case GL_RGB8UI: case GL_RGB8UI:
case GL_RGB10_A2:
case GL_SRGB8_ALPHA8: case GL_SRGB8_ALPHA8:
case GL_RGB5_A1: case GL_RGB5_A1:
case GL_RGBA4: case GL_RGBA4:
...@@ -278,6 +274,11 @@ bool IsValidCopyTextureDestinationInternalFormatEnum(GLint internalFormat) ...@@ -278,6 +274,11 @@ bool IsValidCopyTextureDestinationInternalFormatEnum(GLint internalFormat)
} }
} }
bool IsValidCopySubTextureDestionationInternalFormat(GLenum internalFormat)
{
return IsValidCopyTextureDestinationInternalFormatEnum(internalFormat);
}
bool IsValidCopyTextureDestinationFormatType(Context *context, GLint internalFormat, GLenum type) bool IsValidCopyTextureDestinationFormatType(Context *context, GLint internalFormat, GLenum type)
{ {
if (!IsValidCopyTextureDestinationInternalFormatEnum(internalFormat)) if (!IsValidCopyTextureDestinationInternalFormatEnum(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