commit c0b6c639b109e97d9af37a3fca2f1f9a7c35cb51
author Yizhou Jiang <yizhou.jiang@intel.com> Thu Sep 06 15:02:04 2018 +0800
committer Commit Bot <commit-bot@chromium.org> Fri Nov 02 02:51:57 2018 +0000
tree ff1a4cc077e9f011cce0d9a3afe3a7f5d7f300b1
parent 502d2e215556c56fc0661885f93899c0f6e56eb2

Implement GetTexLevelParameter api of texture multisample extension

This patch adds GetTexLevelParameterivANGLE and GetTexLevelParameterfvANGLE.

TEST=TextureMultisampleTest.GetTexLevelParameter*
TEST=NegativeTextureMultisampleTest.Negtive*

BUG=angleproject:2275

Change-Id: Id702ba31df36ab65f46b697d480b5bf01b87e360
Reviewed-on: https://chromium-review.googlesource.com/c/1295830
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Yizhou Jiang <yizhou.jiang@intel.com>

src/tests/gl_tests/TextureMultisampleTest.cpp

diff --git a/src/tests/gl_tests/TextureMultisampleTest.cpp b/src/tests/gl_tests/TextureMultisampleTest.cpp
index 0ef5541..f1da15f 100644
--- a/src/tests/gl_tests/TextureMultisampleTest.cpp
+++ b/src/tests/gl_tests/TextureMultisampleTest.cpp
@@ -69,6 +69,9 @@
                                GLsizei height,
                                GLboolean fixedsamplelocations);
 
+    void getTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params);
+    void getTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params);
+
     GLuint mFramebuffer = 0;
     GLuint mTexture     = 0;
 
@@ -211,6 +214,37 @@
     }
 }
 
+void TextureMultisampleTest::getTexLevelParameterfv(GLenum target,
+                                                    GLint level,
+                                                    GLenum pname,
+                                                    GLfloat *params)
+{
+    if (getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
+        ensureExtensionEnabled("GL_ANGLE_texture_multisample"))
+    {
+        glGetTexLevelParameterfvANGLE(target, level, pname, params);
+    }
+    else
+    {
+        glGetTexLevelParameterfv(target, level, pname, params);
+    }
+}
+void TextureMultisampleTest::getTexLevelParameteriv(GLenum target,
+                                                    GLint level,
+                                                    GLenum pname,
+                                                    GLint *params)
+{
+    if (getClientMajorVersion() <= 3 && getClientMinorVersion() < 1 &&
+        ensureExtensionEnabled("GL_ANGLE_texture_multisample"))
+    {
+        glGetTexLevelParameterivANGLE(target, level, pname, params);
+    }
+    else
+    {
+        glGetTexLevelParameteriv(target, level, pname, params);
+    }
+}
+
 // Tests that if es version < 3.1, GL_TEXTURE_2D_MULTISAMPLE is not supported in
 // GetInternalformativ. Checks that the number of samples returned is valid in case of ES >= 3.1.
 TEST_P(TextureMultisampleTest, MultisampleTargetGetInternalFormativBase)
@@ -245,6 +279,7 @@
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE,
                            mTexture, 0);
+
     ASSERT_GL_NO_ERROR();
 }
 
@@ -321,6 +356,27 @@
     EXPECT_NE(std::numeric_limits<GLint>::max(), maxDepthTextureSamples);
 }
 
+// Tests that getTexLevelParameter is supported by ES 3.1 or ES 3.0 and ANGLE_texture_multisample
+TEST_P(TextureMultisampleTest, GetTexLevelParameter)
+{
+    ANGLE_SKIP_TEST_IF(lessThanES31MultisampleExtNotSupported());
+
+    glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTexture);
+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE, 4, GL_RGBA8, 1, 1, GL_TRUE);
+    ASSERT_GL_NO_ERROR();
+
+    GLfloat levelSamples = 0;
+    getTexLevelParameterfv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_SAMPLES, &levelSamples);
+    EXPECT_EQ(levelSamples, 4);
+
+    GLint fixedSampleLocation = false;
+    getTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_FIXED_SAMPLE_LOCATIONS,
+                           &fixedSampleLocation);
+    EXPECT_EQ(fixedSampleLocation, 1);
+
+    ASSERT_GL_NO_ERROR();
+}
+
 // The value of sample position should be equal to standard pattern on D3D.
 TEST_P(TextureMultisampleTest, CheckSamplePositions)
 {
@@ -376,16 +432,16 @@
     GLint samplesToUse              = getSamplesToUse(GL_TEXTURE_2D_MULTISAMPLE_ANGLE, testFormats);
 
     glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ANGLE, mTexture);
-    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE_ANGLE, samplesToUse, GL_RGBA8, kWidth,
-                              kHeight, GL_TRUE);
+    texStorageMultisample(GL_TEXTURE_2D_MULTISAMPLE_ANGLE, samplesToUse, GL_RGBA8, kWidth, kHeight,
+                          GL_TRUE);
     ASSERT_GL_NO_ERROR();
 
     // Clear texture zero to green.
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
     GLColor clearColor = GLColor::green;
 
-    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                           GL_TEXTURE_2D_MULTISAMPLE_ANGLE, mTexture, 0);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE_ANGLE,
+                           mTexture, 0);
     GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
     ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, status);
     glClearColor(clearColor.R / 255.0f, clearColor.G / 255.0f, clearColor.B / 255.0f,
@@ -437,6 +493,15 @@
     GLint params = 0;
     glGetTexParameteriv(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_IMMUTABLE_FORMAT, &params);
     ASSERT_GL_ERROR(GL_INVALID_ENUM);
+
+    GLfloat levelSamples = 0;
+    getTexLevelParameterfv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_SAMPLES, &levelSamples);
+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
+
+    GLint fixedSampleLocation = false;
+    getTexLevelParameteriv(GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_FIXED_SAMPLE_LOCATIONS,
+                           &fixedSampleLocation);
+    ASSERT_GL_ERROR(GL_INVALID_OPERATION);
 }
 
 // Tests that GL_TEXTURE_2D_MULTISAMPLE_ARRAY is not supported in GetInternalformativ when the