Merge branch 'master' into GL_ARB_fragment_coord_conventions

2021-11-24 11:52:08 -07:00
parent 50a6a51625 042aaea516
commit 69f9dce708
62 changed files with 2603 additions and 230 deletions
--- a/gtests/AST.FromFile.cpp
+++ b/gtests/AST.FromFile.cpp
@@ -284,10 +284,12 @@ INSTANTIATE_TEST_SUITE_P(
        "textureoffset_sampler2darrayshadow.vert",
        "atomicAdd.comp",
        "GL_ARB_gpu_shader5.u2i.vert",
+        "textureQueryLOD.frag",
        "atomicCounterARBOps.vert",
        "GL_EXT_shader_integer_mix.vert",
        "GL_ARB_draw_instanced.vert",
-        "GL_ARB_fragment_coord_conventions.vert"
+        "GL_ARB_fragment_coord_conventions.vert",
+        "BestMatchFunction.vert",
    })),
    FileNameAsCustomTestSuffix
 );