зеркало из https://github.com/AvaloniaUI/angle.git
Ensure RGB10A2 format properly uses 4 pixel bytes.
This fixes a problem with capture/replay where using pixelBytes was returning a 3 byte stride for this 4 byte format. Note this format is a bit odd, because it forces the alpha to 1.0, but the format is specified as using 4 byte upload width, with 2 bits unused. Also adds compile and run-time checking to ensure our bits are always multiples of 8. This flushed out an issue with 565 formats which were using an extra 1 bit for alpha. Test: TexureUploadFormatTest Bug: angleproject:5133 Change-Id: Ia41e86a4980fc041bb1a19b548c32329fa486d03 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3104686 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>
This commit is contained in:
Jamie Madill
Angle LUCI CQ
Родитель
fc09350ab0
Коммит
0adaabfc49
|
|
@ -743,6 +743,79 @@ void GetSubSampleFactor(GLenum format, int *horizontalSubsampleFactor, int *vert
|
|||
}
|
||||
}
|
||||
|
||||
struct FormatBits
|
||||
{
|
||||
constexpr GLuint pixelBytes() const
|
||||
{
|
||||
return (red + green + blue + alpha + shared + unused) / 8;
|
||||
}
|
||||
constexpr GLuint componentCount() const
|
||||
{
|
||||
return ((red > 0) ? 1 : 0) + ((green > 0) ? 1 : 0) + ((blue > 0) ? 1 : 0) +
|
||||
((alpha > 0) ? 1 : 0);
|
||||
}
|
||||
constexpr bool valid() const
|
||||
{
|
||||
return ((red + green + blue + alpha + shared + unused) % 8) == 0;
|
||||
}
|
||||
|
||||
GLuint red;
|
||||
GLuint green;
|
||||
GLuint blue;
|
||||
GLuint alpha;
|
||||
GLuint unused;
|
||||
GLuint shared;
|
||||
};
|
||||
|
||||
template <GLuint red, GLuint green, GLuint blue, GLuint alpha, GLuint unused, GLuint shared>
|
||||
constexpr FormatBits FB()
|
||||
{
|
||||
constexpr FormatBits formatBits = {red, green, blue, alpha, unused, shared};
|
||||
static_assert(formatBits.valid(), "Invalid FormatBits");
|
||||
return formatBits;
|
||||
}
|
||||
|
||||
void AddRGBAXFormat(InternalFormatInfoMap *map,
|
||||
GLenum internalFormat,
|
||||
bool sized,
|
||||
const FormatBits &formatBits,
|
||||
GLenum format,
|
||||
GLenum type,
|
||||
GLenum componentType,
|
||||
bool srgb,
|
||||
InternalFormat::SupportCheckFunction textureSupport,
|
||||
InternalFormat::SupportCheckFunction filterSupport,
|
||||
InternalFormat::SupportCheckFunction textureAttachmentSupport,
|
||||
InternalFormat::SupportCheckFunction renderbufferSupport,
|
||||
InternalFormat::SupportCheckFunction blendSupport)
|
||||
{
|
||||
ASSERT(formatBits.valid());
|
||||
|
||||
InternalFormat formatInfo;
|
||||
formatInfo.internalFormat = internalFormat;
|
||||
formatInfo.sized = sized;
|
||||
formatInfo.sizedInternalFormat =
|
||||
sized ? internalFormat : GetSizedFormatInternal(internalFormat, type);
|
||||
formatInfo.redBits = formatBits.red;
|
||||
formatInfo.greenBits = formatBits.green;
|
||||
formatInfo.blueBits = formatBits.blue;
|
||||
formatInfo.alphaBits = formatBits.alpha;
|
||||
formatInfo.sharedBits = formatBits.shared;
|
||||
formatInfo.pixelBytes = formatBits.pixelBytes();
|
||||
formatInfo.componentCount = formatBits.componentCount();
|
||||
formatInfo.format = format;
|
||||
formatInfo.type = type;
|
||||
formatInfo.componentType = componentType;
|
||||
formatInfo.colorEncoding = (srgb ? GL_SRGB : GL_LINEAR);
|
||||
formatInfo.textureSupport = textureSupport;
|
||||
formatInfo.filterSupport = filterSupport;
|
||||
formatInfo.textureAttachmentSupport = textureAttachmentSupport;
|
||||
formatInfo.renderbufferSupport = renderbufferSupport;
|
||||
formatInfo.blendSupport = blendSupport;
|
||||
|
||||
InsertFormatInfo(map, formatInfo);
|
||||
}
|
||||
|
||||
void AddRGBAFormat(InternalFormatInfoMap *map,
|
||||
GLenum internalFormat,
|
||||
bool sized,
|
||||
|
|
@ -761,30 +834,9 @@ void AddRGBAFormat(InternalFormatInfoMap *map,
|
|||
InternalFormat::SupportCheckFunction renderbufferSupport,
|
||||
InternalFormat::SupportCheckFunction blendSupport)
|
||||
{
|
||||
InternalFormat formatInfo;
|
||||
formatInfo.internalFormat = internalFormat;
|
||||
formatInfo.sized = sized;
|
||||
formatInfo.sizedInternalFormat =
|
||||
sized ? internalFormat : GetSizedFormatInternal(internalFormat, type);
|
||||
formatInfo.redBits = red;
|
||||
formatInfo.greenBits = green;
|
||||
formatInfo.blueBits = blue;
|
||||
formatInfo.alphaBits = alpha;
|
||||
formatInfo.sharedBits = shared;
|
||||
formatInfo.pixelBytes = (red + green + blue + alpha + shared) / 8;
|
||||
formatInfo.componentCount =
|
||||
((red > 0) ? 1 : 0) + ((green > 0) ? 1 : 0) + ((blue > 0) ? 1 : 0) + ((alpha > 0) ? 1 : 0);
|
||||
formatInfo.format = format;
|
||||
formatInfo.type = type;
|
||||
formatInfo.componentType = componentType;
|
||||
formatInfo.colorEncoding = (srgb ? GL_SRGB : GL_LINEAR);
|
||||
formatInfo.textureSupport = textureSupport;
|
||||
formatInfo.filterSupport = filterSupport;
|
||||
formatInfo.textureAttachmentSupport = textureAttachmentSupport;
|
||||
formatInfo.renderbufferSupport = renderbufferSupport;
|
||||
formatInfo.blendSupport = blendSupport;
|
||||
|
||||
InsertFormatInfo(map, formatInfo);
|
||||
return AddRGBAXFormat(map, internalFormat, sized, {red, green, blue, alpha, 0, shared}, format,
|
||||
type, componentType, srgb, textureSupport, filterSupport,
|
||||
textureAttachmentSupport, renderbufferSupport, blendSupport);
|
||||
}
|
||||
|
||||
static void AddLUMAFormat(InternalFormatInfoMap *map,
|
||||
|
|
@ -1016,7 +1068,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMap()
|
|||
|
||||
// Special format which is not really supported, so always false for all supports.
|
||||
AddRGBAFormat(&map, GL_BGRX8_ANGLEX, true, 8, 8, 8, 0, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_BGR565_ANGLEX, true, 5, 6, 5, 1, 0, GL_BGRA_EXT, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_BGR565_ANGLEX, true, 5, 6, 5, 0, 0, GL_BGRA_EXT, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_BGR10_A2_ANGLEX, true, 10, 10, 10, 2, 0, GL_BGRA_EXT, GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
|
||||
// Floating point formats
|
||||
|
|
@ -1206,25 +1258,25 @@ static InternalFormatInfoMap BuildInternalFormatInfoMap()
|
|||
AddRGBAFormat(&map, GL_SRG8_EXT, true, 8, 8, 0, 0, 0, GL_RG, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, true, RequireExt<&Extensions::sRGBRG8EXT>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
|
||||
// Unsized formats
|
||||
// | Internal format |sized | R | G | B | A |S | Format | Type | Component type | SRGB | Texture supported | Filterable | Texture attachment | Renderbuffer | Blend
|
||||
AddRGBAFormat(&map, GL_RED, false, 8, 0, 0, 0, 0, GL_RED, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>, AlwaysSupported, RequireExt<&Extensions::textureRG>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RED, false, 8, 0, 0, 0, 0, GL_RED, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RED, false, 16, 0, 0, 0, 0, GL_RED, GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RG, false, 8, 8, 0, 0, 0, GL_RG, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>, AlwaysSupported, RequireExt<&Extensions::textureRG>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RG, false, 8, 8, 0, 0, 0, GL_RG, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RG, false, 16, 16, 0, 0, 0, GL_RG, GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGB, false, 8, 8, 8, 0, 0, GL_RGB, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGB, false, 5, 6, 5, 0, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGB, false, 8, 8, 8, 0, 0, GL_RGB, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGB, false, 10, 10, 10, 0, 0, GL_RGB, GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormat2101010REV>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGBA, false, 4, 4, 4, 4, 0, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGBA, false, 5, 5, 5, 1, 0, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGBA, false, 8, 8, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGBA, false, 16, 16, 16, 16, 0, GL_RGBA, GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGBA, false, 10, 10, 10, 2, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormat2101010REV>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_RGBA, false, 8, 8, 8, 8, 0, GL_RGBA, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_SRGB, false, 8, 8, 8, 0, 0, GL_SRGB, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, true, RequireExt<&Extensions::sRGB>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAFormat(&map, GL_SRGB_ALPHA_EXT, false, 8, 8, 8, 8, 0, GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, true, RequireExt<&Extensions::sRGB>, AlwaysSupported, RequireExt<&Extensions::sRGB>, NeverSupported, NeverSupported);
|
||||
// | Internal format |sized | R | G | B | A |S |X | Format | Type | Component type | SRGB | Texture supported | Filterable | Texture attachment | Renderbuffer | Blend
|
||||
AddRGBAXFormat(&map, GL_RED, false, FB< 8, 0, 0, 0, 0, 0>(), GL_RED, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>, AlwaysSupported, RequireExt<&Extensions::textureRG>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RED, false, FB< 8, 0, 0, 0, 0, 0>(), GL_RED, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RED, false, FB<16, 0, 0, 0, 0, 0>(), GL_RED, GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RG, false, FB< 8, 8, 0, 0, 0, 0>(), GL_RG, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureRG>, AlwaysSupported, RequireExt<&Extensions::textureRG>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RG, false, FB< 8, 8, 0, 0, 0, 0>(), GL_RG, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RG, false, FB<16, 16, 0, 0, 0, 0>(), GL_RG, GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGB, false, FB< 8, 8, 8, 0, 0, 0>(), GL_RGB, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGB, false, FB< 5, 6, 5, 0, 0, 0>(), GL_RGB, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGB, false, FB< 8, 8, 8, 0, 0, 0>(), GL_RGB, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGB, false, FB<10, 10, 10, 0, 0, 2>(), GL_RGB, GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormat2101010REV>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGBA, false, FB< 4, 4, 4, 4, 0, 0>(), GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGBA, false, FB< 5, 5, 5, 1, 0, 0>(), GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGBA, false, FB< 8, 8, 8, 8, 0, 0>(), GL_RGBA, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, AlwaysSupported, AlwaysSupported, RequireESOrExt<2, 0, &Extensions::framebufferObjectOES>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGBA, false, FB<16, 16, 16, 16, 0, 0>(), GL_RGBA, GL_UNSIGNED_SHORT, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureNorm16>, AlwaysSupported, RequireExt<&Extensions::textureNorm16>, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGBA, false, FB<10, 10, 10, 2, 0, 0>(), GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::textureFormat2101010REV>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_RGBA, false, FB< 8, 8, 8, 8, 0, 0>(), GL_RGBA, GL_BYTE, GL_SIGNED_NORMALIZED, false, NeverSupported, NeverSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_SRGB, false, FB< 8, 8, 8, 0, 0, 0>(), GL_SRGB, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, true, RequireExt<&Extensions::sRGB>, AlwaysSupported, NeverSupported, NeverSupported, NeverSupported);
|
||||
AddRGBAXFormat(&map, GL_SRGB_ALPHA_EXT, false, FB< 8, 8, 8, 8, 0, 0>(), GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, true, RequireExt<&Extensions::sRGB>, AlwaysSupported, RequireExt<&Extensions::sRGB>, NeverSupported, NeverSupported);
|
||||
#if (defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)) || (defined(ANGLE_PLATFORM_MACCATALYST) && defined(ANGLE_CPU_ARM64))
|
||||
angle::SystemInfo info;
|
||||
if (angle::GetSystemInfo(&info))
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче