Pass the result to glTexStorage2D/3DMultisample() instead of using
hard-coded values. This allows the test to fully pass with llvmpipe
where GL_MAX_COLOR_TEXTURE_SAMPLES=1.
---
tests/spec/arb_texture_view/targets.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/tests/spec/arb_texture_view/targets.c
b/tests/spec/arb_texture_view/targets.c
index bbaa736..ec28e0e 100644
--- a/tests/spec/arb_texture_view/targets.c
+++ b/tests/spec/arb_texture_view/targets.c
@@ -107,11 +107,15 @@ test_target_errors(GLenum target)
GL_TEXTURE_2D_MULTISAMPLE,
GL_TEXTURE_2D_MULTISAMPLE_ARRAY
};
-
- if (piglit_is_extension_supported("GL_ARB_texture_storage_multisample"))
+ GLsizei texSamples;
+
+ if
(piglit_is_extension_supported("GL_ARB_texture_storage_multisample")) {
numIllegalTargets = ARRAY_SIZE(illegalTargets);
- else
+ glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &texSamples);
+ } else {
numIllegalTargets = ARRAY_SIZE(illegalTargets) -2;
+ texSamples = 1;
+ }
glGenTextures(1, &tex); /* orig tex */
glBindTexture(target, tex);
@@ -167,16 +171,16 @@ test_target_errors(GLenum target)
GL_TEXTURE_CUBE_MAP_ARRAY, 0);
break;
case GL_TEXTURE_2D_MULTISAMPLE:
- glTexStorage2DMultisample(target, 2, GL_RGBA8, width, height,
- GL_TRUE);
+ glTexStorage2DMultisample(target, texSamples, GL_RGBA8,
+ width, height, GL_TRUE);
numTargets = update_valid_arrays(legalTargets, illegalTargets,
numIllegalTargets,
GL_TEXTURE_2D_MULTISAMPLE,
GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 0);
break;
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
- glTexStorage3DMultisample(target, 4, GL_RGBA8, width, height,
- depth, GL_TRUE);
+ glTexStorage3DMultisample(target, texSamples, GL_RGBA8,
+ width, height, depth, GL_TRUE);
numTargets = update_valid_arrays(legalTargets, illegalTargets,
numIllegalTargets,
GL_TEXTURE_2D_MULTISAMPLE,
--
1.9.1
_______________________________________________
Piglit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/piglit
