Merge vk-gl-cts/opengl-es-cts-3.2.8 into vk-gl-cts/opengl-es-cts-3.2.9

Change-Id: I6f6cb08cc8d117ee60765737c3e360403b416aaf
KhronosGroup · Apr 14, 2023 · 17180b0 · 17180b0
2 parents 4259d96 + 8eaedcf
commit 17180b0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/gles31/functional/es31fNegativeTextureApiTests.cpp b/modules/gles31/functional/es31fNegativeTextureApiTests.cpp
@@ -489,7 +489,8 @@ void compressedteximage2d_invalid_size (NegativeTestContext& ctx)
 	ctx.glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, 1, 1, 0, divRoundUp(1, 4) * divRoundUp(1, 4) * 16 - 1, 0);
 	ctx.expectError(GL_INVALID_VALUE);
 
-	if (supportsES32orGL45(ctx))
+	if (contextSupports(ctx.getRenderContext().getType(), glu::ApiType::es(3, 2)) ||
+		ctx.getContextInfo().isExtensionSupported("GL_KHR_texture_compression_astc_ldr"))
 	{
 	    ctx.glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_ASTC_4x4, 1, 1, 0, divRoundUp(1, 4) * divRoundUp(1, 4) * 16 - 1, 0);
 	    ctx.expectError(GL_INVALID_VALUE);