projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 987832b)
Rework sparse texture shader typing
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Fri, 22 Apr 2022 13:12:26 +0000 (09:12 -0400)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Thu, 2 Jun 2022 22:03:05 +0000 (22:03 +0000)
This previously would try to jam 2D textures into 2DArray-using
shaders and vice versa, so instead just use layered image
binding when appropriate and pass both texture targets to ensure
that everything always matches up nicely.

Affects:
KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment
KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup
KHR-GL46.sparse_texture2_tests.UncommittedRegionsAccess
KHR-GL46.sparse_texture_clamp_tests.SparseTextureClampLookupColor
KHR-GL46.sparse_texture_clamp_tests.SparseTextureClampLookupResidency
KHR-GL46.sparse_texture_tests.SparseTextureAllocation
KHR-GL46.sparse_texture_tests.SparseTextureCommitment

Components: OpenGL
VK-GL-CTS issue: 3653

Change-Id: Iea7d1027784aaad4969b01372895939ac96968bc

external/openglcts/modules/gl/gl4cSparseTexture2Tests.cpp patch | blob | history
external/openglcts/modules/gl/gl4cSparseTexture2Tests.hpp patch | blob | history
external/openglcts/modules/gl/gl4cSparseTextureClampTests.cpp patch | blob | history

diff --git a/external/openglcts/modules/gl/gl4cSparseTexture2Tests.cpp b/external/openglcts/modules/gl/gl4cSparseTexture2Tests.cpp
index 125475b..49cb243 100644 (file)
--- a/external/openglcts/modules/gl/gl4cSparseTexture2Tests.cpp
+++ b/external/openglcts/modules/gl/gl4cSparseTexture2Tests.cpp
@@ -596,7 +596,7 @@ tcu::TestNode::IterateResult SparseTexture2CommitmentTestCase::iterate()
  * @return target    Structure of token strings
  */
 SparseTexture2CommitmentTestCase::TokenStrings SparseTexture2CommitmentTestCase::createShaderTokens(
-       GLint target, GLint format, GLint sample, const std::string outputBase, const std::string inputBase)
+       GLint target, GLint verifyTarget, GLint format, GLint sample, const std::string outputBase, const std::string inputBase)
 {
        TokenStrings s;
        std::string  prefix;
@@ -867,21 +867,18 @@ SparseTexture2CommitmentTestCase::TokenStrings SparseTexture2CommitmentTestCase:
 
        if (target == GL_TEXTURE_1D)
        {
-               s.outputType = "u" + outputBase + "2D";
                s.inputType  = prefix + inputBase + "1D";
                s.pointType  = "int";
                s.pointDef   = "gl_WorkGroupID.x";
        }
        else if (target == GL_TEXTURE_1D_ARRAY)
        {
-               s.outputType = "u" + outputBase + "2D_ARRAY";
                s.inputType  = prefix + inputBase + "1DArray";
                s.pointType  = "ivec2";
                s.pointDef   = "gl_WorkGroupID.x, gl_WorkGroupID.z";
        }
        else if (target == GL_TEXTURE_2D_ARRAY)
        {
-               s.outputType = "u" + outputBase + "2DArray";
                s.inputType  = prefix + inputBase + "2DArray";
                s.pointType  = "ivec3";
                s.pointDef   = "gl_WorkGroupID.x, gl_WorkGroupID.y, gl_WorkGroupID.z";
@@ -895,14 +892,12 @@ SparseTexture2CommitmentTestCase::TokenStrings SparseTexture2CommitmentTestCase:
        }
        else if (target == GL_TEXTURE_CUBE_MAP)
        {
-               s.outputType = "u" + outputBase + "2DArray";
                s.inputType  = prefix + inputBase + "Cube";
                s.pointType  = "ivec3";
                s.pointDef   = "gl_WorkGroupID.x, gl_WorkGroupID.y, gl_WorkGroupID.z % 6";
        }
        else if (target == GL_TEXTURE_CUBE_MAP_ARRAY)
        {
-               s.outputType = "u" + outputBase + "2DArray";
                s.inputType  = prefix + inputBase + "CubeArray";
                s.pointType  = "ivec3";
                s.pointDef   = "gl_WorkGroupID.x, gl_WorkGroupID.y, gl_WorkGroupID.z";
@@ -918,12 +913,19 @@ SparseTexture2CommitmentTestCase::TokenStrings SparseTexture2CommitmentTestCase:
        }
        else if (target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
        {
-               s.outputType = "u" + outputBase + "2DArray";
                s.inputType  = prefix + inputBase + "2DMSArray";
                s.pointType  = "ivec3";
                s.pointDef   = "gl_WorkGroupID.x, gl_WorkGroupID.y, gl_WorkGroupID.z";
                s.sampleDef  = ", " + de::toString(sample);
        }
+       if (verifyTarget == GL_TEXTURE_2D)
+       {
+               s.outputType = "u" + outputBase + "2D";
+       }
+       else
+       {
+               s.outputType = "u" + outputBase + "2DArray";
+       }
 
        return s;
 }
@@ -1083,7 +1085,12 @@ bool SparseTexture2CommitmentTestCase::writeDataToTexture(const Functions& gl, G
                                std::string shader = st2_compute_textureFill;
 
                                // Adjust shader source to texture format
-                               TokenStrings s = createShaderTokens(target, format, sample);
+                               GLint verifyTarget;
+                               if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE)
+                                       verifyTarget = GL_TEXTURE_2D;
+                               else
+                                       verifyTarget = GL_TEXTURE_2D_ARRAY;
+                               TokenStrings s = createShaderTokens(target, verifyTarget, format, sample);
 
                                replaceToken("<INPUT_TYPE>", s.inputType.c_str(), shader);
                                replaceToken("<POINT_TYPE>", s.pointType.c_str(), shader);
@@ -1253,7 +1260,7 @@ bool SparseTexture2CommitmentTestCase::verifyTextureData(const Functions& gl, GL
 
                // Create verifying texture
                GLint verifyTarget;
-               if (target == GL_TEXTURE_2D_MULTISAMPLE)
+               if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE)
                        verifyTarget = GL_TEXTURE_2D;
                else
                        verifyTarget = GL_TEXTURE_2D_ARRAY;
@@ -1276,7 +1283,7 @@ bool SparseTexture2CommitmentTestCase::verifyTextureData(const Functions& gl, GL
                        std::string shader = st2_compute_textureVerify;
 
                        // Adjust shader source to texture format
-                       TokenStrings s = createShaderTokens(target, format, sample);
+                       TokenStrings s = createShaderTokens(target, verifyTarget, format, sample);
 
                        replaceToken("<OUTPUT_TYPE>", s.outputType.c_str(), shader);
                        replaceToken("<FORMAT>", s.format.c_str(), shader);
@@ -1859,13 +1866,15 @@ bool UncommittedRegionsAccessTestCase::verifyTextureDataExtended(const Functions
        {
                // Create verifying texture
                GLint verifyTarget;
-               if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D)
+               if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE)
                        verifyTarget = GL_TEXTURE_2D;
                else
                        verifyTarget = GL_TEXTURE_2D_ARRAY;
 
                if (target == GL_TEXTURE_CUBE_MAP)
                        depth = depth * 6;
+               if (depth == 1 && mState.samples == 1)
+                       target = GL_TEXTURE_2D;
 
                GLint texSize = width * height * depth;
 
@@ -1897,7 +1906,7 @@ bool UncommittedRegionsAccessTestCase::verifyTextureDataExtended(const Functions
                        std::string shader = st2_compute_textureVerify;
 
                        // Adjust shader source to texture format
-                       TokenStrings s = createShaderTokens(target, format, sample);
+                       TokenStrings s = createShaderTokens(target, verifyTarget, format, sample);
 
                        replaceToken("<OUTPUT_TYPE>", s.outputType.c_str(), shader);
                        replaceToken("<FORMAT>", s.format.c_str(), shader);
@@ -1921,14 +1930,14 @@ bool UncommittedRegionsAccessTestCase::verifyTextureDataExtended(const Functions
                                gl.bindImageTexture(0, //unit
                                                                        verifyTexture,
                                                                        0,                //level
-                                                                       GL_FALSE, //layered
+                                                                       depth > 1, //layered
                                                                        0,                //layer
                                                                        GL_WRITE_ONLY, GL_R8UI);
                                GLU_EXPECT_NO_ERROR(gl.getError(), "glBindImageTexture");
                                gl.bindImageTexture(1, //unit
                                                                        texture,
                                                                        level,  //level
-                                                                       GL_FALSE, //layered
+                                                                       depth > 1, //layered
                                                                        0,                //layer
                                                                        GL_READ_ONLY, format);
                                GLU_EXPECT_NO_ERROR(gl.getError(), "glBindImageTexture");
@@ -2010,10 +2019,14 @@ bool UncommittedRegionsAccessTestCase::verifyAtomicOperations(const Functions& g
 
        // Create verifying texture
        GLint verifyTarget;
-       if (target == GL_TEXTURE_2D_MULTISAMPLE)
+       if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE)
                verifyTarget = GL_TEXTURE_2D;
        else
                verifyTarget = GL_TEXTURE_2D_ARRAY;
+       if (target == GL_TEXTURE_CUBE_MAP)
+               depth = depth * 6;
+       if (depth == 1 && mState.samples == 1)
+               target = GL_TEXTURE_2D;
 
        GLint texSize = width * height * depth;
 
@@ -2045,7 +2058,7 @@ bool UncommittedRegionsAccessTestCase::verifyAtomicOperations(const Functions& g
                std::string shader = st2_compute_atomicVerify;
 
                // Adjust shader source to texture format
-               TokenStrings s            = createShaderTokens(target, format, sample);
+               TokenStrings s            = createShaderTokens(target, verifyTarget, format, sample);
                std::string  dataType = (s.returnType == "ivec4" ? "int" : "uint");
 
                replaceToken("<OUTPUT_TYPE>", s.outputType.c_str(), shader);
@@ -2069,14 +2082,14 @@ bool UncommittedRegionsAccessTestCase::verifyAtomicOperations(const Functions& g
                        gl.bindImageTexture(0, //unit
                                                                verifyTexture,
                                                                0,                //level
-                                                               GL_FALSE, //layered
+                                                               depth > 1, //layered
                                                                0,                //layer
                                                                GL_WRITE_ONLY, GL_R8UI);
                        GLU_EXPECT_NO_ERROR(gl.getError(), "glBindImageTexture");
                        gl.bindImageTexture(1, //unit
                                                                texture,
                                                                level,  //level
-                                                               GL_FALSE, //layered
+                                                               depth > 1, //layered
                                                                0,                //layer
                                                                GL_READ_ONLY, format);
                        GLU_EXPECT_NO_ERROR(gl.getError(), "glBindImageTexture");
@@ -2472,7 +2485,7 @@ tcu::TestNode::IterateResult SparseTexture2LookupTestCase::iterate()
  * @return Returns extended token strings structure.
  */
 SparseTexture2LookupTestCase::TokenStringsExt SparseTexture2LookupTestCase::createLookupShaderTokens(
-       GLint target, GLint format, GLint level, GLint sample, FunctionToken& funcToken)
+       GLint target, GLint verifyTarget, GLint format, GLint level, GLint sample, FunctionToken& funcToken)
 {
        std::string funcName = funcToken.name;
 
@@ -2487,7 +2500,7 @@ SparseTexture2LookupTestCase::TokenStringsExt SparseTexture2LookupTestCase::crea
                inputType = "sampler";
 
        // Copy data from TokenStrings to TokenStringsExt
-       TokenStrings ss  = createShaderTokens(target, format, sample, "image", inputType);
+       TokenStrings ss  = createShaderTokens(target, verifyTarget, format, sample, "image", inputType);
        s.epsilon                = ss.epsilon;
        s.format                 = ss.format;
        s.inputType              = ss.inputType;
@@ -2775,7 +2788,12 @@ bool SparseTexture2LookupTestCase::writeDataToTexture(const Functions& gl, GLint
                        std::string shader = st2_compute_textureFill;
 
                        // Adjust shader source to texture format
-                       TokenStrings s = createShaderTokens(target, format, sample);
+                       GLint verifyTarget;
+                       if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE)
+                               verifyTarget = GL_TEXTURE_2D;
+                       else
+                               verifyTarget = GL_TEXTURE_2D_ARRAY;
+                       TokenStrings s = createShaderTokens(target, verifyTarget, format, sample);
 
                        replaceToken("<INPUT_TYPE>", s.inputType.c_str(), shader);
                        replaceToken("<POINT_TYPE>", s.pointType.c_str(), shader);
@@ -2797,7 +2815,7 @@ bool SparseTexture2LookupTestCase::writeDataToTexture(const Functions& gl, GLint
                        {
                                gl.useProgram(program.getProgram());
                                GLU_EXPECT_NO_ERROR(gl.getError(), "glUseProgram");
-                               gl.bindImageTexture(0 /* unit */, texture, level /* level */, GL_FALSE /* layered */, 0 /* layer */,
+                               gl.bindImageTexture(0 /* unit */, texture, level /* level */, depth > 1 /* layered */, 0 /* layer */,
                                                                        GL_WRITE_ONLY, convFormat);
                                GLU_EXPECT_NO_ERROR(gl.getError(), "glBindImageTexture");
                                gl.uniform1i(1, 0 /* image_unit */);
@@ -2886,7 +2904,7 @@ bool SparseTexture2LookupTestCase::verifyLookupTextureData(const Functions& gl,
 
        // Create verifying texture
        GLint verifyTarget;
-       if (target == GL_TEXTURE_2D_MULTISAMPLE)
+       if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE)
                verifyTarget = GL_TEXTURE_2D;
        else
                verifyTarget = GL_TEXTURE_2D_ARRAY;
@@ -2909,7 +2927,7 @@ bool SparseTexture2LookupTestCase::verifyLookupTextureData(const Functions& gl,
                std::string shader = st2_compute_lookupVerify;
 
                // Adjust shader source to texture format
-               TokenStringsExt s = createLookupShaderTokens(target, format, level, sample, f);
+               TokenStringsExt s = createLookupShaderTokens(target, verifyTarget, format, level, sample, f);
 
                replaceToken("<FUNCTION>", f.name.c_str(), shader);
                replaceToken("<ARGUMENTS>", f.arguments.c_str(), shader);
diff --git a/external/openglcts/modules/gl/gl4cSparseTexture2Tests.hpp b/external/openglcts/modules/gl/gl4cSparseTexture2Tests.hpp
index 64cada9..56e3feb 100644 (file)
--- a/external/openglcts/modules/gl/gl4cSparseTexture2Tests.hpp
+++ b/external/openglcts/modules/gl/gl4cSparseTexture2Tests.hpp
@@ -147,7 +147,7 @@ protected:
        };
 
        /* Protected methods */
-       TokenStrings createShaderTokens(GLint target, GLint format, GLint sample, const std::string outputBase = "image",
+       TokenStrings createShaderTokens(GLint target, GLint verifyTarget, GLint format, GLint sample, const std::string outputBase = "image",
                                                                        const std::string inputBase = "image");
 
        virtual bool caseAllowed(GLint target, GLint format);
@@ -250,7 +250,7 @@ protected:
        std::vector<FunctionToken> mFunctions;
 
        /* Protected methods */
-       TokenStringsExt createLookupShaderTokens(GLint target, GLint format, GLint level, GLint sample,
+       TokenStringsExt createLookupShaderTokens(GLint target, GLint verifyTarget, GLint format, GLint level, GLint sample,
                                                                                         FunctionToken& funcToken);
 
        virtual bool caseAllowed(GLint target, GLint format);
diff --git a/external/openglcts/modules/gl/gl4cSparseTextureClampTests.cpp b/external/openglcts/modules/gl/gl4cSparseTextureClampTests.cpp
index 3a15bdf..1246637 100644 (file)
--- a/external/openglcts/modules/gl/gl4cSparseTextureClampTests.cpp
+++ b/external/openglcts/modules/gl/gl4cSparseTextureClampTests.cpp
@@ -344,7 +344,7 @@ bool SparseTextureClampLookupResidencyTestCase::verifyLookupTextureData(const Fu
                FunctionToken f = funcToken;
 
                // Adjust shader source to texture format
-               TokenStringsExt s = createLookupShaderTokens(target, format, level, sample, f);
+               TokenStringsExt s = createLookupShaderTokens(target, verifyTarget, format, level, sample, f);
 
                replaceToken("<COORD_TYPE>", s.coordType.c_str(), vertex);
 
@@ -735,7 +735,12 @@ bool SparseTextureClampLookupColorTestCase::writeDataToTexture(const Functions&
                        std::string shader = stc_compute_textureFill;
 
                        // Adjust shader source to texture format
-                       TokenStrings s = createShaderTokens(target, format, sample);
+                       GLint verifyTarget;
+                       if (target == GL_TEXTURE_2D_MULTISAMPLE || target == GL_TEXTURE_2D || target == GL_TEXTURE_RECTANGLE)
+                               verifyTarget = GL_TEXTURE_2D;
+                       else
+                               verifyTarget = GL_TEXTURE_2D_ARRAY;
+                       TokenStrings s = createShaderTokens(target, verifyTarget, format, sample);
 
                        GLint convFormat = format;
                        if (format == GL_DEPTH_COMPONENT16)
@@ -856,7 +861,7 @@ bool SparseTextureClampLookupColorTestCase::verifyLookupTextureData(const Functi
                std::string functionDef = generateFunctionDef(f.name);
 
                // Adjust shader source to texture format
-               TokenStringsExt s = createLookupShaderTokens(target, format, level, sample, f);
+               TokenStringsExt s = createLookupShaderTokens(target, verifyTarget, format, level, sample, f);
 
                // Change expected result as it has to be adjusted to different levels
                s.resultExpected = generateExpectedResult(s.returnType, level, format);
Domain: Graphics System / GL;