Commit 72a8e616 authored by Dan Glastonbury's avatar Dan Glastonbury
Browse files

Bug 1184402 - Part 4: Use WebGLFormat for validation in RenderbufferStorage_base. r=jgilbert

parent 2ff87501

dom/canvas/WebGLContextGL.cpp

+10 −35
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "WebGLShader.h"

#include "WebGLProgram.h"

#include "WebGLUniformLocation.h"

#include "WebGLFormats.h"

#include "WebGLFramebuffer.h"

#include "WebGLRenderbuffer.h"

#include "WebGLShaderPrecisionFormat.h"
@@ -2270,42 +2271,16 @@ WebGLContext::RenderbufferStorage_base(const char* funcName, GLenum target, 
        return;

    }



    bool isFormatValid = false;

    switch (internalFormat) {

    case LOCAL_GL_RGBA4:

    case LOCAL_GL_RGB5_A1:

    case LOCAL_GL_RGB565:

    case LOCAL_GL_DEPTH_COMPONENT16:

    case LOCAL_GL_STENCIL_INDEX8:

    case LOCAL_GL_DEPTH_STENCIL:

        isFormatValid = true;

        break;



    case LOCAL_GL_SRGB8_ALPHA8_EXT:

        if (IsExtensionEnabled(WebGLExtensionID::EXT_sRGB))

            isFormatValid = true;

        break;



    case LOCAL_GL_RGB16F:

    case LOCAL_GL_RGBA16F:

        if (IsExtensionEnabled(WebGLExtensionID::OES_texture_half_float) &&

            IsExtensionEnabled(WebGLExtensionID::EXT_color_buffer_half_float))

        {

            isFormatValid = true;

        }

        break;

    // Convert DEPTH_STENCIL to sized type for testing

    GLenum sizedInternalFormat = internalFormat;

    if (sizedInternalFormat == LOCAL_GL_DEPTH_STENCIL)

        sizedInternalFormat = LOCAL_GL_DEPTH24_STENCIL8;



    case LOCAL_GL_RGB32F:

    case LOCAL_GL_RGBA32F:

        if (IsExtensionEnabled(WebGLExtensionID::OES_texture_float) &&

            IsExtensionEnabled(WebGLExtensionID::WEBGL_color_buffer_float))

        {

            isFormatValid = true;

        }

        break;



    default:

        break;

    bool isFormatValid = false;

    const webgl::FormatInfo* info = webgl::GetInfoBySizedFormat(sizedInternalFormat);

    if (info) {

        const webgl::FormatUsageInfo* usage = mFormatUsage->GetUsage(info);

        isFormatValid = usage && usage->asRenderbuffer;

    }



    if (!isFormatValid) {