Diff
Modified: trunk/Source/WebCore/ChangeLog (281620 => 281621)
--- trunk/Source/WebCore/ChangeLog 2021-08-26 12:30:46 UTC (rev 281620)
+++ trunk/Source/WebCore/ChangeLog 2021-08-26 12:45:55 UTC (rev 281621)
@@ -1,3 +1,40 @@
+2021-08-26 Kimmo Kinnunen <[email protected]>
+
+ WebGL calls into static GraphicsContextGLOpenGL functions needlessly
+ https://bugs.webkit.org/show_bug.cgi?id=229402
+
+ Reviewed by Kenneth Russell.
+
+ The calls are problematic:
+ - No other call sites than WebGL layer
+ - The functionality is not needed for ANGLE, but present
+ - GraphicsContextGL is now an interface with multiple implementations,
+ GraphicsContextGLOpenGL is just one implementation
+
+ Move the functions into WebGL, inside #if !USE(ANGLE) blocks.
+ From there, they're simpler to move into !ANGLE specific files,
+ if possible.
+
+ This is work towards making it possible to remove ANGLE specific #if
+ blocks from WebGL implementation.
+
+ No new tests, refactor.
+
+ * html/canvas/WebGLFramebuffer.cpp:
+ (WebCore::getClearBitsByAttachmentType):
+ (WebCore::getClearBitsByFormat):
+ (WebCore::isAttachmentComplete):
+ (WebCore::WebGLFramebuffer::initializeAttachments):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::getChannelBitsByFormat):
+ (WebCore::possibleFormatAndTypeForInternalFormat):
+ (WebCore::WebGLRenderingContextBase::copyTexSubImage2D):
+ (WebCore::WebGLRenderingContextBase::isTexInternalFormatColorBufferCombinationValid):
+ * platform/graphics/GraphicsContextGL.cpp:
+ * platform/graphics/GraphicsContextGL.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.cpp:
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+
2021-08-26 Enrique Ocaña González <[email protected]>
[GStreamer][MSE] Implement the "sequence" mode in SourceBuffer for the GStreamer ports
Modified: trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp (281620 => 281621)
--- trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2021-08-26 12:30:46 UTC (rev 281620)
+++ trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2021-08-26 12:45:55 UTC (rev 281621)
@@ -272,34 +272,141 @@
visitor.addOpaqueRoot(m_texture.get());
}
+} // anonymous namespace
+
#if !USE(ANGLE)
- bool isAttachmentComplete(WebGLFramebuffer::WebGLAttachment* attachedObject, GCGLenum attachment, const char** reason)
- {
- ASSERT(attachedObject && attachedObject->isValid());
- ASSERT(reason);
- GCGLenum format = attachedObject->getFormat();
- unsigned need = GraphicsContextGLOpenGL::getClearBitsByAttachmentType(attachment);
- unsigned have = GraphicsContextGLOpenGL::getClearBitsByFormat(format);
+static unsigned getClearBitsByAttachmentType(GCGLenum attachment)
+{
+ switch (attachment) {
+ case GraphicsContextGL::COLOR_ATTACHMENT0:
+ case ExtensionsGL::COLOR_ATTACHMENT1_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT2_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT3_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT4_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT5_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT6_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT7_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT8_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT9_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT10_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT11_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT12_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT13_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT14_EXT:
+ case ExtensionsGL::COLOR_ATTACHMENT15_EXT:
+ return GraphicsContextGL::COLOR_BUFFER_BIT;
+ case GraphicsContextGL::DEPTH_ATTACHMENT:
+ return GraphicsContextGL::DEPTH_BUFFER_BIT;
+ case GraphicsContextGL::STENCIL_ATTACHMENT:
+ return GraphicsContextGL::STENCIL_BUFFER_BIT;
+ case GraphicsContextGL::DEPTH_STENCIL_ATTACHMENT:
+ return GraphicsContextGL::DEPTH_BUFFER_BIT | GraphicsContextGL::STENCIL_BUFFER_BIT;
+ default:
+ return 0;
+ }
+}
- if ((need & have) != need) {
- *reason = "attachment type is not correct for attachment";
- return false;
- }
- if (!attachedObject->getWidth() || !attachedObject->getHeight()) {
- *reason = "attachment has a 0 dimension";
- return false;
- }
- if ((attachment == GraphicsContextGL::DEPTH_ATTACHMENT || attachment == GraphicsContextGL::STENCIL_ATTACHMENT)
- && format == GraphicsContextGL::DEPTH_STENCIL) {
- *reason = "attachment DEPTH_STENCIL not allowed on DEPTH or STENCIL attachment";
- return false;
- }
- return true;
+static unsigned getClearBitsByFormat(GCGLenum format)
+{
+ switch (format) {
+ case GraphicsContextGL::RGB:
+ case GraphicsContextGL::RGBA:
+ case GraphicsContextGL::LUMINANCE_ALPHA:
+ case GraphicsContextGL::LUMINANCE:
+ case GraphicsContextGL::ALPHA:
+ case GraphicsContextGL::R8:
+ case GraphicsContextGL::R8_SNORM:
+ case GraphicsContextGL::R16F:
+ case GraphicsContextGL::R32F:
+ case GraphicsContextGL::R8UI:
+ case GraphicsContextGL::R8I:
+ case GraphicsContextGL::R16UI:
+ case GraphicsContextGL::R16I:
+ case GraphicsContextGL::R32UI:
+ case GraphicsContextGL::R32I:
+ case GraphicsContextGL::RG8:
+ case GraphicsContextGL::RG8_SNORM:
+ case GraphicsContextGL::RG16F:
+ case GraphicsContextGL::RG32F:
+ case GraphicsContextGL::RG8UI:
+ case GraphicsContextGL::RG8I:
+ case GraphicsContextGL::RG16UI:
+ case GraphicsContextGL::RG16I:
+ case GraphicsContextGL::RG32UI:
+ case GraphicsContextGL::RG32I:
+ case GraphicsContextGL::RGB8:
+ case GraphicsContextGL::SRGB8:
+ case GraphicsContextGL::RGB565:
+ case GraphicsContextGL::RGB8_SNORM:
+ case GraphicsContextGL::R11F_G11F_B10F:
+ case GraphicsContextGL::RGB9_E5:
+ case GraphicsContextGL::RGB16F:
+ case GraphicsContextGL::RGB32F:
+ case GraphicsContextGL::RGB8UI:
+ case GraphicsContextGL::RGB8I:
+ case GraphicsContextGL::RGB16UI:
+ case GraphicsContextGL::RGB16I:
+ case GraphicsContextGL::RGB32UI:
+ case GraphicsContextGL::RGB32I:
+ case GraphicsContextGL::RGBA8:
+ case GraphicsContextGL::SRGB8_ALPHA8:
+ case GraphicsContextGL::RGBA8_SNORM:
+ case GraphicsContextGL::RGB5_A1:
+ case GraphicsContextGL::RGBA4:
+ case GraphicsContextGL::RGB10_A2:
+ case GraphicsContextGL::RGBA16F:
+ case GraphicsContextGL::RGBA32F:
+ case GraphicsContextGL::RGBA8UI:
+ case GraphicsContextGL::RGBA8I:
+ case GraphicsContextGL::RGB10_A2UI:
+ case GraphicsContextGL::RGBA16UI:
+ case GraphicsContextGL::RGBA16I:
+ case GraphicsContextGL::RGBA32I:
+ case GraphicsContextGL::RGBA32UI:
+ case ExtensionsGL::SRGB_EXT:
+ case ExtensionsGL::SRGB_ALPHA_EXT:
+ return GraphicsContextGL::COLOR_BUFFER_BIT;
+ case GraphicsContextGL::DEPTH_COMPONENT16:
+ case GraphicsContextGL::DEPTH_COMPONENT24:
+ case GraphicsContextGL::DEPTH_COMPONENT32F:
+ case GraphicsContextGL::DEPTH_COMPONENT:
+ return GraphicsContextGL::DEPTH_BUFFER_BIT;
+ case GraphicsContextGL::STENCIL_INDEX8:
+ return GraphicsContextGL::STENCIL_BUFFER_BIT;
+ case GraphicsContextGL::DEPTH_STENCIL:
+ case GraphicsContextGL::DEPTH24_STENCIL8:
+ case GraphicsContextGL::DEPTH32F_STENCIL8:
+ return GraphicsContextGL::DEPTH_BUFFER_BIT | GraphicsContextGL::STENCIL_BUFFER_BIT;
+ default:
+ return 0;
}
-#endif
+}
-} // anonymous namespace
+static bool isAttachmentComplete(WebGLFramebuffer::WebGLAttachment* attachedObject, GCGLenum attachment, const char** reason)
+{
+ ASSERT(attachedObject && attachedObject->isValid());
+ ASSERT(reason);
+ GCGLenum format = attachedObject->getFormat();
+ unsigned need = getClearBitsByAttachmentType(attachment);
+ unsigned have = getClearBitsByFormat(format);
+ if ((need & have) != need) {
+ *reason = "attachment type is not correct for attachment";
+ return false;
+ }
+ if (!attachedObject->getWidth() || !attachedObject->getHeight()) {
+ *reason = "attachment has a 0 dimension";
+ return false;
+ }
+ if ((attachment == GraphicsContextGL::DEPTH_ATTACHMENT || attachment == GraphicsContextGL::STENCIL_ATTACHMENT)
+ && format == GraphicsContextGL::DEPTH_STENCIL) {
+ *reason = "attachment DEPTH_STENCIL not allowed on DEPTH or STENCIL attachment";
+ return false;
+ }
+ return true;
+}
+
+#endif
WebGLFramebuffer::WebGLAttachment::WebGLAttachment() = default;
WebGLFramebuffer::WebGLAttachment::~WebGLAttachment() = default;
@@ -611,7 +718,7 @@
GCGLenum attachmentType = entry.key;
RefPtr<WebGLAttachment> attachment = entry.value.get();
if (!attachment->isInitialized())
- mask |= GraphicsContextGLOpenGL::getClearBitsByAttachmentType(attachmentType);
+ mask |= getClearBitsByAttachmentType(attachmentType);
}
if (!mask)
return true;
@@ -682,7 +789,7 @@
for (AttachmentMap::iterator it = m_attachments.begin(); it != m_attachments.end(); ++it) {
GCGLenum attachmentType = it->key;
auto attachment = it->value;
- GCGLbitfield bits = GraphicsContextGLOpenGL::getClearBitsByAttachmentType(attachmentType);
+ GCGLbitfield bits = getClearBitsByAttachmentType(attachmentType);
if (bits & mask)
attachment->setInitialized();
}
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (281620 => 281621)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2021-08-26 12:30:46 UTC (rev 281620)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2021-08-26 12:45:55 UTC (rev 281621)
@@ -526,6 +526,127 @@
return (*clippedX != x || *clippedY != y || *clippedWidth != width || *clippedHeight != height);
}
+
+static uint8_t getChannelBitsByFormat(GCGLenum format)
+{
+ enum class ChannelBits : uint8_t {
+ Red = 1,
+ Green = 2,
+ Blue = 4,
+ Alpha = 8,
+ Depth = 16,
+ Stencil = 32,
+ RGB = Red | Green | Blue,
+ RGBA = RGB | Alpha,
+ DepthStencil = Depth | Stencil,
+ };
+ switch (format) {
+ case GraphicsContextGL::ALPHA:
+ return static_cast<uint8_t>(ChannelBits::Alpha);
+ case GraphicsContextGL::LUMINANCE:
+ return static_cast<uint8_t>(ChannelBits::RGB);
+ case GraphicsContextGL::LUMINANCE_ALPHA:
+ return static_cast<uint8_t>(ChannelBits::RGBA);
+ case GraphicsContextGL::RGB:
+ case GraphicsContextGL::RGB565:
+ case ExtensionsGL::SRGB_EXT:
+ return static_cast<uint8_t>(ChannelBits::RGB);
+ case GraphicsContextGL::RGBA:
+ case GraphicsContextGL::RGBA4:
+ case GraphicsContextGL::RGB5_A1:
+ case ExtensionsGL::SRGB_ALPHA_EXT:
+ return static_cast<uint8_t>(ChannelBits::RGBA);
+ case GraphicsContextGL::DEPTH_COMPONENT16:
+ case GraphicsContextGL::DEPTH_COMPONENT:
+ return static_cast<uint8_t>(ChannelBits::Depth);
+ case GraphicsContextGL::STENCIL_INDEX8:
+ return static_cast<uint8_t>(ChannelBits::Stencil);
+ case GraphicsContextGL::DEPTH_STENCIL:
+ return static_cast<uint8_t>(ChannelBits::DepthStencil);
+ default:
+ return 0;
+ }
+}
+
+static bool possibleFormatAndTypeForInternalFormat(GCGLenum internalFormat, GCGLenum& format, GCGLenum& type)
+{
+#define POSSIBLE_FORMAT_TYPE_CASE(internalFormatMacro, formatMacro, typeMacro) case internalFormatMacro: \
+ format = formatMacro; \
+ type = typeMacro; \
+ break;
+
+ switch (internalFormat) {
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB, GraphicsContextGL::RGB, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA, GraphicsContextGL::RGBA, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::LUMINANCE_ALPHA, GraphicsContextGL::LUMINANCE_ALPHA, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::LUMINANCE, GraphicsContextGL::LUMINANCE, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::ALPHA, GraphicsContextGL::ALPHA, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R8, GraphicsContextGL::RED, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R8_SNORM, GraphicsContextGL::RED, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R16F, GraphicsContextGL::RED, GraphicsContextGL::HALF_FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R32F, GraphicsContextGL::RED, GraphicsContextGL::FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R8UI, GraphicsContextGL::RED_INTEGER, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R8I, GraphicsContextGL::RED_INTEGER, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R16UI, GraphicsContextGL::RED_INTEGER, GraphicsContextGL::UNSIGNED_SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R16I, GraphicsContextGL::RED_INTEGER, GraphicsContextGL::SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R32UI, GraphicsContextGL::RED_INTEGER, GraphicsContextGL::UNSIGNED_INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R32I, GraphicsContextGL::RED_INTEGER, GraphicsContextGL::INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG8, GraphicsContextGL::RG, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG8_SNORM, GraphicsContextGL::RG, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG16F, GraphicsContextGL::RG, GraphicsContextGL::HALF_FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG32F, GraphicsContextGL::RG, GraphicsContextGL::FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG8UI, GraphicsContextGL::RG_INTEGER, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG8I, GraphicsContextGL::RG_INTEGER, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG16UI, GraphicsContextGL::RG_INTEGER, GraphicsContextGL::UNSIGNED_SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG16I, GraphicsContextGL::RG_INTEGER, GraphicsContextGL::SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG32UI, GraphicsContextGL::RG_INTEGER, GraphicsContextGL::UNSIGNED_INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RG32I, GraphicsContextGL::RG_INTEGER, GraphicsContextGL::INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB8, GraphicsContextGL::RGB, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::SRGB8, GraphicsContextGL::RGB, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB565, GraphicsContextGL::RGB, GraphicsContextGL::UNSIGNED_SHORT_5_6_5);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB8_SNORM, GraphicsContextGL::RGB, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::R11F_G11F_B10F, GraphicsContextGL::RGB, GraphicsContextGL::UNSIGNED_INT_10F_11F_11F_REV);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB9_E5, GraphicsContextGL::RGB, GraphicsContextGL::UNSIGNED_INT_5_9_9_9_REV);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB16F, GraphicsContextGL::RGB, GraphicsContextGL::HALF_FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB32F, GraphicsContextGL::RGB, GraphicsContextGL::FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB8UI, GraphicsContextGL::RGB_INTEGER, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB8I, GraphicsContextGL::RGB_INTEGER, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB16UI, GraphicsContextGL::RGB_INTEGER, GraphicsContextGL::UNSIGNED_SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB16I, GraphicsContextGL::RGB_INTEGER, GraphicsContextGL::SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB32UI, GraphicsContextGL::RGB_INTEGER, GraphicsContextGL::UNSIGNED_INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB32I, GraphicsContextGL::RGB_INTEGER, GraphicsContextGL::INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA8, GraphicsContextGL::RGBA, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::SRGB8_ALPHA8, GraphicsContextGL::RGBA, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA8_SNORM, GraphicsContextGL::RGBA, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB5_A1, GraphicsContextGL::RGBA, GraphicsContextGL::UNSIGNED_SHORT_5_5_5_1);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA4, GraphicsContextGL::RGBA, GraphicsContextGL::UNSIGNED_SHORT_4_4_4_4);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB10_A2, GraphicsContextGL::RGBA, GraphicsContextGL::UNSIGNED_INT_2_10_10_10_REV);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA16F, GraphicsContextGL::RGBA, GraphicsContextGL::HALF_FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA32F, GraphicsContextGL::RGBA, GraphicsContextGL::FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA8UI, GraphicsContextGL::RGBA_INTEGER, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA8I, GraphicsContextGL::RGBA_INTEGER, GraphicsContextGL::BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGB10_A2UI, GraphicsContextGL::RGBA_INTEGER, GraphicsContextGL::UNSIGNED_INT_2_10_10_10_REV);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA16UI, GraphicsContextGL::RGBA_INTEGER, GraphicsContextGL::UNSIGNED_SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA16I, GraphicsContextGL::RGBA_INTEGER, GraphicsContextGL::SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA32I, GraphicsContextGL::RGBA_INTEGER, GraphicsContextGL::INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::RGBA32UI, GraphicsContextGL::RGBA_INTEGER, GraphicsContextGL::UNSIGNED_INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::DEPTH_COMPONENT16, GraphicsContextGL::DEPTH_COMPONENT, GraphicsContextGL::UNSIGNED_SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::DEPTH_COMPONENT, GraphicsContextGL::DEPTH_COMPONENT, GraphicsContextGL::UNSIGNED_SHORT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::DEPTH_COMPONENT24, GraphicsContextGL::DEPTH_COMPONENT, GraphicsContextGL::UNSIGNED_INT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::DEPTH_COMPONENT32F, GraphicsContextGL::DEPTH_COMPONENT, GraphicsContextGL::FLOAT);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::DEPTH_STENCIL, GraphicsContextGL::DEPTH_STENCIL, GraphicsContextGL::UNSIGNED_INT_24_8);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::DEPTH24_STENCIL8, GraphicsContextGL::DEPTH_STENCIL, GraphicsContextGL::UNSIGNED_INT_24_8);
+ POSSIBLE_FORMAT_TYPE_CASE(GraphicsContextGL::DEPTH32F_STENCIL8, GraphicsContextGL::DEPTH_STENCIL, GraphicsContextGL::FLOAT_32_UNSIGNED_INT_24_8_REV);
+ POSSIBLE_FORMAT_TYPE_CASE(ExtensionsGL::SRGB_EXT, ExtensionsGL::SRGB_EXT, GraphicsContextGL::UNSIGNED_BYTE);
+ POSSIBLE_FORMAT_TYPE_CASE(ExtensionsGL::SRGB_ALPHA_EXT, ExtensionsGL::SRGB_ALPHA_EXT, GraphicsContextGL::UNSIGNED_BYTE);
+ default:
+ return false;
+ }
+#undef POSSIBLE_FORMAT_TYPE_CASE
+
+ return true;
+}
+
#endif
class InspectorScopedShaderProgramHighlight {
@@ -1923,7 +2044,7 @@
if (clip2D(x, y, width, height, getBoundReadFramebufferWidth(), getBoundReadFramebufferHeight(), &clippedX, &clippedY, &clippedWidth, &clippedHeight)) {
GCGLenum format;
GCGLenum type;
- if (!GraphicsContextGLOpenGL::possibleFormatAndTypeForInternalFormat(tex->getInternalFormat(target, level), format, type)) {
+ if (!possibleFormatAndTypeForInternalFormat(tex->getInternalFormat(target, level), format, type)) {
synthesizeGLError(GraphicsContextGL::INVALID_ENUM, "copyTexSubImage2D", "Texture has unknown internal format");
return;
}
@@ -6545,8 +6666,8 @@
bool WebGLRenderingContextBase::isTexInternalFormatColorBufferCombinationValid(GCGLenum texInternalFormat, GCGLenum colorBufferFormat)
{
- auto need = GraphicsContextGL::getChannelBitsByFormat(texInternalFormat);
- auto have = GraphicsContextGL::getChannelBitsByFormat(colorBufferFormat);
+ auto need = getChannelBitsByFormat(texInternalFormat);
+ auto have = getChannelBitsByFormat(colorBufferFormat);
return (need & have) == need;
}
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContextGL.cpp (281620 => 281621)
--- trunk/Source/WebCore/platform/graphics/GraphicsContextGL.cpp 2021-08-26 12:30:46 UTC (rev 281620)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContextGL.cpp 2021-08-26 12:45:55 UTC (rev 281621)
@@ -369,143 +369,6 @@
m_attrs.preserveDrawingBuffer = true;
}
-unsigned GraphicsContextGL::getClearBitsByAttachmentType(GCGLenum attachment)
-{
- switch (attachment) {
- case GraphicsContextGL::COLOR_ATTACHMENT0:
- case ExtensionsGL::COLOR_ATTACHMENT1_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT2_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT3_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT4_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT5_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT6_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT7_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT8_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT9_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT10_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT11_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT12_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT13_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT14_EXT:
- case ExtensionsGL::COLOR_ATTACHMENT15_EXT:
- return GraphicsContextGL::COLOR_BUFFER_BIT;
- case GraphicsContextGL::DEPTH_ATTACHMENT:
- return GraphicsContextGL::DEPTH_BUFFER_BIT;
- case GraphicsContextGL::STENCIL_ATTACHMENT:
- return GraphicsContextGL::STENCIL_BUFFER_BIT;
- case GraphicsContextGL::DEPTH_STENCIL_ATTACHMENT:
- return GraphicsContextGL::DEPTH_BUFFER_BIT | GraphicsContextGL::STENCIL_BUFFER_BIT;
- default:
- return 0;
- }
-}
-
-unsigned GraphicsContextGL::getClearBitsByFormat(GCGLenum format)
-{
- switch (format) {
- case GraphicsContextGL::RGB:
- case GraphicsContextGL::RGBA:
- case GraphicsContextGL::LUMINANCE_ALPHA:
- case GraphicsContextGL::LUMINANCE:
- case GraphicsContextGL::ALPHA:
- case GraphicsContextGL::R8:
- case GraphicsContextGL::R8_SNORM:
- case GraphicsContextGL::R16F:
- case GraphicsContextGL::R32F:
- case GraphicsContextGL::R8UI:
- case GraphicsContextGL::R8I:
- case GraphicsContextGL::R16UI:
- case GraphicsContextGL::R16I:
- case GraphicsContextGL::R32UI:
- case GraphicsContextGL::R32I:
- case GraphicsContextGL::RG8:
- case GraphicsContextGL::RG8_SNORM:
- case GraphicsContextGL::RG16F:
- case GraphicsContextGL::RG32F:
- case GraphicsContextGL::RG8UI:
- case GraphicsContextGL::RG8I:
- case GraphicsContextGL::RG16UI:
- case GraphicsContextGL::RG16I:
- case GraphicsContextGL::RG32UI:
- case GraphicsContextGL::RG32I:
- case GraphicsContextGL::RGB8:
- case GraphicsContextGL::SRGB8:
- case GraphicsContextGL::RGB565:
- case GraphicsContextGL::RGB8_SNORM:
- case GraphicsContextGL::R11F_G11F_B10F:
- case GraphicsContextGL::RGB9_E5:
- case GraphicsContextGL::RGB16F:
- case GraphicsContextGL::RGB32F:
- case GraphicsContextGL::RGB8UI:
- case GraphicsContextGL::RGB8I:
- case GraphicsContextGL::RGB16UI:
- case GraphicsContextGL::RGB16I:
- case GraphicsContextGL::RGB32UI:
- case GraphicsContextGL::RGB32I:
- case GraphicsContextGL::RGBA8:
- case GraphicsContextGL::SRGB8_ALPHA8:
- case GraphicsContextGL::RGBA8_SNORM:
- case GraphicsContextGL::RGB5_A1:
- case GraphicsContextGL::RGBA4:
- case GraphicsContextGL::RGB10_A2:
- case GraphicsContextGL::RGBA16F:
- case GraphicsContextGL::RGBA32F:
- case GraphicsContextGL::RGBA8UI:
- case GraphicsContextGL::RGBA8I:
- case GraphicsContextGL::RGB10_A2UI:
- case GraphicsContextGL::RGBA16UI:
- case GraphicsContextGL::RGBA16I:
- case GraphicsContextGL::RGBA32I:
- case GraphicsContextGL::RGBA32UI:
- case ExtensionsGL::SRGB_EXT:
- case ExtensionsGL::SRGB_ALPHA_EXT:
- return GraphicsContextGL::COLOR_BUFFER_BIT;
- case GraphicsContextGL::DEPTH_COMPONENT16:
- case GraphicsContextGL::DEPTH_COMPONENT24:
- case GraphicsContextGL::DEPTH_COMPONENT32F:
- case GraphicsContextGL::DEPTH_COMPONENT:
- return GraphicsContextGL::DEPTH_BUFFER_BIT;
- case GraphicsContextGL::STENCIL_INDEX8:
- return GraphicsContextGL::STENCIL_BUFFER_BIT;
- case GraphicsContextGL::DEPTH_STENCIL:
- case GraphicsContextGL::DEPTH24_STENCIL8:
- case GraphicsContextGL::DEPTH32F_STENCIL8:
- return GraphicsContextGL::DEPTH_BUFFER_BIT | GraphicsContextGL::STENCIL_BUFFER_BIT;
- default:
- return 0;
- }
-}
-
-uint8_t GraphicsContextGL::getChannelBitsByFormat(GCGLenum format)
-{
- switch (format) {
- case GraphicsContextGL::ALPHA:
- return static_cast<uint8_t>(ChannelBits::Alpha);
- case GraphicsContextGL::LUMINANCE:
- return static_cast<uint8_t>(ChannelBits::RGB);
- case GraphicsContextGL::LUMINANCE_ALPHA:
- return static_cast<uint8_t>(ChannelBits::RGBA);
- case GraphicsContextGL::RGB:
- case GraphicsContextGL::RGB565:
- case ExtensionsGL::SRGB_EXT:
- return static_cast<uint8_t>(ChannelBits::RGB);
- case GraphicsContextGL::RGBA:
- case GraphicsContextGL::RGBA4:
- case GraphicsContextGL::RGB5_A1:
- case ExtensionsGL::SRGB_ALPHA_EXT:
- return static_cast<uint8_t>(ChannelBits::RGBA);
- case GraphicsContextGL::DEPTH_COMPONENT16:
- case GraphicsContextGL::DEPTH_COMPONENT:
- return static_cast<uint8_t>(ChannelBits::Depth);
- case GraphicsContextGL::STENCIL_INDEX8:
- return static_cast<uint8_t>(ChannelBits::Stencil);
- case GraphicsContextGL::DEPTH_STENCIL:
- return static_cast<uint8_t>(ChannelBits::DepthStencil);
- default:
- return 0;
- }
-}
-
bool GraphicsContextGL::computeFormatAndTypeParameters(GCGLenum format, GCGLenum type, unsigned* componentsPerPixel, unsigned* bytesPerComponent)
{
switch (format) {
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h (281620 => 281621)
--- trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h 2021-08-26 12:30:46 UTC (rev 281620)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContextGL.h 2021-08-26 12:45:55 UTC (rev 281621)
@@ -1318,11 +1318,6 @@
IntSize getInternalFramebufferSize() const { return IntSize(m_currentWidth, m_currentHeight); }
- static unsigned getClearBitsByAttachmentType(GCGLenum);
- static unsigned getClearBitsByFormat(GCGLenum);
-
- static uint8_t getChannelBitsByFormat(GCGLenum);
-
struct PixelStoreParams final {
GCGLint alignment { 4 };
GCGLint rowLength { 0 };
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp (281620 => 281621)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp 2021-08-26 12:30:46 UTC (rev 281620)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp 2021-08-26 12:45:55 UTC (rev 281621)
@@ -107,88 +107,6 @@
#endif
-#if !USE(ANGLE)
-bool GraphicsContextGLOpenGL::possibleFormatAndTypeForInternalFormat(GCGLenum internalFormat, GCGLenum& format, GCGLenum& type)
-{
-#define POSSIBLE_FORMAT_TYPE_CASE(internalFormatMacro, formatMacro, typeMacro) case internalFormatMacro: \
- format = formatMacro; \
- type = typeMacro; \
- break;
-
- switch (internalFormat) {
- POSSIBLE_FORMAT_TYPE_CASE(RGB, RGB, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA, RGBA, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(LUMINANCE_ALPHA, LUMINANCE_ALPHA, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(LUMINANCE, LUMINANCE, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(ALPHA, ALPHA, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(R8, RED, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(R8_SNORM, RED, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(R16F, RED, HALF_FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(R32F, RED, FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(R8UI, RED_INTEGER, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(R8I, RED_INTEGER, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(R16UI, RED_INTEGER, UNSIGNED_SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(R16I, RED_INTEGER, SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(R32UI, RED_INTEGER, UNSIGNED_INT);
- POSSIBLE_FORMAT_TYPE_CASE(R32I, RED_INTEGER, INT);
- POSSIBLE_FORMAT_TYPE_CASE(RG8, RG, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RG8_SNORM, RG, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RG16F, RG, HALF_FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(RG32F, RG, FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(RG8UI, RG_INTEGER, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RG8I, RG_INTEGER, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RG16UI, RG_INTEGER, UNSIGNED_SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(RG16I, RG_INTEGER, SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(RG32UI, RG_INTEGER, UNSIGNED_INT);
- POSSIBLE_FORMAT_TYPE_CASE(RG32I, RG_INTEGER, INT);
- POSSIBLE_FORMAT_TYPE_CASE(RGB8, RGB, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(SRGB8, RGB, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGB565, RGB, UNSIGNED_SHORT_5_6_5);
- POSSIBLE_FORMAT_TYPE_CASE(RGB8_SNORM, RGB, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(R11F_G11F_B10F, RGB, UNSIGNED_INT_10F_11F_11F_REV);
- POSSIBLE_FORMAT_TYPE_CASE(RGB9_E5, RGB, UNSIGNED_INT_5_9_9_9_REV);
- POSSIBLE_FORMAT_TYPE_CASE(RGB16F, RGB, HALF_FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(RGB32F, RGB, FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(RGB8UI, RGB_INTEGER, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGB8I, RGB_INTEGER, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGB16UI, RGB_INTEGER, UNSIGNED_SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(RGB16I, RGB_INTEGER, SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(RGB32UI, RGB_INTEGER, UNSIGNED_INT);
- POSSIBLE_FORMAT_TYPE_CASE(RGB32I, RGB_INTEGER, INT);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA8, RGBA, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(SRGB8_ALPHA8, RGBA, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA8_SNORM, RGBA, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGB5_A1, RGBA, UNSIGNED_SHORT_5_5_5_1);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA4, RGBA, UNSIGNED_SHORT_4_4_4_4);
- POSSIBLE_FORMAT_TYPE_CASE(RGB10_A2, RGBA, UNSIGNED_INT_2_10_10_10_REV);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA16F, RGBA, HALF_FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA32F, RGBA, FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA8UI, RGBA_INTEGER, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA8I, RGBA_INTEGER, BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(RGB10_A2UI, RGBA_INTEGER, UNSIGNED_INT_2_10_10_10_REV);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA16UI, RGBA_INTEGER, UNSIGNED_SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA16I, RGBA_INTEGER, SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA32I, RGBA_INTEGER, INT);
- POSSIBLE_FORMAT_TYPE_CASE(RGBA32UI, RGBA_INTEGER, UNSIGNED_INT);
- POSSIBLE_FORMAT_TYPE_CASE(DEPTH_COMPONENT16, DEPTH_COMPONENT, UNSIGNED_SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(DEPTH_COMPONENT, DEPTH_COMPONENT, UNSIGNED_SHORT);
- POSSIBLE_FORMAT_TYPE_CASE(DEPTH_COMPONENT24, DEPTH_COMPONENT, UNSIGNED_INT);
- POSSIBLE_FORMAT_TYPE_CASE(DEPTH_COMPONENT32F, DEPTH_COMPONENT, FLOAT);
- POSSIBLE_FORMAT_TYPE_CASE(DEPTH_STENCIL, DEPTH_STENCIL, UNSIGNED_INT_24_8);
- POSSIBLE_FORMAT_TYPE_CASE(DEPTH24_STENCIL8, DEPTH_STENCIL, UNSIGNED_INT_24_8);
- POSSIBLE_FORMAT_TYPE_CASE(DEPTH32F_STENCIL8, DEPTH_STENCIL, FLOAT_32_UNSIGNED_INT_24_8_REV);
- POSSIBLE_FORMAT_TYPE_CASE(ExtensionsGL::SRGB_EXT, ExtensionsGL::SRGB_EXT, UNSIGNED_BYTE);
- POSSIBLE_FORMAT_TYPE_CASE(ExtensionsGL::SRGB_ALPHA_EXT, ExtensionsGL::SRGB_ALPHA_EXT, UNSIGNED_BYTE);
- default:
- return false;
- }
-#undef POSSIBLE_FORMAT_TYPE_CASE
-
- return true;
-}
-#endif // !USE(ANGLE)
-
-
#if !PLATFORM(COCOA)
void GraphicsContextGLOpenGL::setContextVisibility(bool)
{
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h (281620 => 281621)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-08-26 12:30:46 UTC (rev 281620)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-08-26 12:45:55 UTC (rev 281621)
@@ -524,10 +524,6 @@
GraphicsContextGLCV* asCV() final;
#endif
-#if !USE(ANGLE)
- static bool possibleFormatAndTypeForInternalFormat(GCGLenum internalFormat, GCGLenum& format, GCGLenum& type);
-#endif // !USE(ANGLE)
-
static void paintToCanvas(const GraphicsContextGLAttributes&, PixelBuffer&&, const IntSize& canvasSize, GraphicsContext&);
#if PLATFORM(COCOA)
