Edit

kc3-lang/angle/src/tests/gl_tests/TextureMultisampleTest.cpp

Branch :

  • Show log

    Commit

  • Author : Shao
    Date : 2017-08-02 12:39:44
    Hash : 5116d687
    Message : ES31: Add missing initialization of MAX_*_SAMPLES on D3D This patch intends to add missing initialization of MAX_INTEGER_SAMPLES, MAX_DEPTH_TEXTURE_SAMPLES and MAX_COLOR_TEXTURE_SAMPLES required for multisampled textures on D3D backends. Since MAX_*_SAMPLES cannot be queried directly from D3D APIs, these values are initially assigned a large value in renderer11.cpp and re-calculated in context::updateCaps(). This patch also adds tests to ensure these values are greater than 1 as required in OpenGL ES3.1 spec. BUG=angleproject:1592 TEST=angle_end2end_tests Change-Id: Iba586e311d40d2da4569816902f96e40bbd6935b Reviewed-on: https://chromium-review.googlesource.com/597411 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>

  • src/tests/gl_tests/TextureMultisampleTest.cpp
  • //
    // Copyright 2017 The ANGLE Project Authors. All rights reserved.
    // Use of this source code is governed by a BSD-style license that can be
    // found in the LICENSE file.
    //
    
    // TextureMultisampleTest: Tests of multisampled texture
    
    #include "test_utils/ANGLETest.h"
    #include "test_utils/gl_raii.h"
    
    using namespace angle;
    
    namespace
    {
    
    class TextureMultisampleTest : public ANGLETest
    {
      protected:
        TextureMultisampleTest()
        {
            setWindowWidth(64);
            setWindowHeight(64);
            setConfigRedBits(8);
            setConfigGreenBits(8);
            setConfigBlueBits(8);
            setConfigAlphaBits(8);
        }
    
        void SetUp() override
        {
            ANGLETest::SetUp();
    
            glGenFramebuffers(1, &mFramebuffer);
            glGenTextures(1, &mTexture);
    
            ASSERT_GL_NO_ERROR();
        }
    
        void TearDown() override
        {
            glDeleteFramebuffers(1, &mFramebuffer);
            mFramebuffer = 0;
            glDeleteTextures(1, &mTexture);
            mTexture = 0;
    
            ANGLETest::TearDown();
        }
    
        GLuint mFramebuffer = 0;
        GLuint mTexture     = 0;
    };
    
    class TextureMultisampleTestES31 : public TextureMultisampleTest
    {
      protected:
        TextureMultisampleTestES31() : TextureMultisampleTest() {}
    };
    
    // Tests that if es version < 3.1, GL_TEXTURE_2D_MULTISAMPLE is not supported in
    // GetInternalformativ.
    TEST_P(TextureMultisampleTest, MultisampleTargetGetInternalFormativBase)
    {
        GLint maxSamples = 0;
        glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE, GL_R8, GL_SAMPLES, 1, &maxSamples);
        if (getClientMajorVersion() < 3 || getClientMinorVersion() < 1)
        {
            ASSERT_GL_ERROR(GL_INVALID_OPERATION);
        }
        else
        {
            ASSERT_GL_NO_ERROR();
        }
    }
    
    // Tests that if es version < 3.1, GL_TEXTURE_2D_MULTISAMPLE is not supported in
    // FramebufferTexture2D.
    TEST_P(TextureMultisampleTest, MultisampleTargetFramebufferTexture2D)
    {
        GLint samples = 1;
        glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, samples, GL_RGBA8, 64, 64, GL_FALSE);
        if (getClientMajorVersion() < 3 || getClientMinorVersion() < 1)
        {
            ASSERT_GL_ERROR(GL_INVALID_ENUM);
        }
        else
        {
            ASSERT_GL_NO_ERROR();
        }
    
        glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
                               mTexture, 0);
        if (getClientMajorVersion() < 3 || getClientMinorVersion() < 1)
        {
            ASSERT_GL_ERROR(GL_INVALID_OPERATION);
        }
        else
        {
            ASSERT_GL_NO_ERROR();
        }
    }
    
    // Tests basic functionality of glTexStorage2DMultisample.
    TEST_P(TextureMultisampleTestES31, ValidateTextureStorageMultisampleParameters)
    {
        glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 1, 1, GL_FALSE);
        ASSERT_GL_NO_ERROR();
    
        GLint params = 0;
        glGetTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_IMMUTABLE_FORMAT, &params);
        EXPECT_EQ(1, params);
    
        glTexStorage2DMultisample(GL_TEXTURE_2D, 1, GL_RGBA8, 1, 1, GL_FALSE);
        ASSERT_GL_ERROR(GL_INVALID_ENUM);
    
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 0, 0, GL_FALSE);
        ASSERT_GL_ERROR(GL_INVALID_VALUE);
    
        GLint maxSize = 0;
        glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, maxSize + 1, 1, GL_FALSE);
        ASSERT_GL_ERROR(GL_INVALID_VALUE);
    
        GLint maxSamples = 0;
        glGetInternalformativ(GL_TEXTURE_2D_MULTISAMPLE, GL_R8, GL_SAMPLES, 1, &maxSamples);
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, maxSamples + 1, GL_RGBA8, 1, 1, GL_FALSE);
        ASSERT_GL_ERROR(GL_INVALID_OPERATION);
    
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_RGBA8, 1, 1, GL_FALSE);
        ASSERT_GL_ERROR(GL_INVALID_VALUE);
    
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA, 0, 0, GL_FALSE);
        ASSERT_GL_ERROR(GL_INVALID_VALUE);
    
        glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, 0);
        glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, 1, GL_RGBA8, 1, 1, GL_FALSE);
        ASSERT_GL_ERROR(GL_INVALID_OPERATION);
    }
    
    // Tests the value of MAX_INTEGER_SAMPLES is no less than 1.
    // [OpenGL ES 3.1 SPEC Table 20.40]
    TEST_P(TextureMultisampleTestES31, MaxIntegerSamples)
    {
        GLint maxIntegerSamples;
        glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &maxIntegerSamples);
        EXPECT_GE(maxIntegerSamples, 1);
        EXPECT_NE(std::numeric_limits<GLint>::max(), maxIntegerSamples);
    }
    
    // Tests the value of MAX_COLOR_TEXTURE_SAMPLES is no less than 1.
    // [OpenGL ES 3.1 SPEC Table 20.40]
    TEST_P(TextureMultisampleTestES31, MaxColorTextureSamples)
    {
        GLint maxColorTextureSamples;
        glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &maxColorTextureSamples);
        EXPECT_GE(maxColorTextureSamples, 1);
        EXPECT_NE(std::numeric_limits<GLint>::max(), maxColorTextureSamples);
    }
    
    // Tests the value of MAX_DEPTH_TEXTURE_SAMPLES is no less than 1.
    // [OpenGL ES 3.1 SPEC Table 20.40]
    TEST_P(TextureMultisampleTestES31, MaxDepthTextureSamples)
    {
        GLint maxDepthTextureSamples;
        glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &maxDepthTextureSamples);
        EXPECT_GE(maxDepthTextureSamples, 1);
        EXPECT_NE(std::numeric_limits<GLint>::max(), maxDepthTextureSamples);
    }
    
    ANGLE_INSTANTIATE_TEST(TextureMultisampleTest,
                           ES31_D3D11(),
                           ES3_OPENGL(),
                           ES3_OPENGLES(),
                           ES31_OPENGL(),
                           ES31_OPENGLES());
    ANGLE_INSTANTIATE_TEST(TextureMultisampleTestES31, ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES());
    }