[Piglit] [PATCH 02/16] namespace-pollution: Add glBitmap as an operation to test

[Ilia Mirkin]

On Wed, Jan 6, 2016 at 7:53 PM, Ian Romanick <idr at freedesktop.org> wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
>
> NOTE: The following tests fail on i965 (and presumably other drivers
> that use meta) on Mesa master and 11.1:
>
>     texture with glbitmap
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92363
>
> squash! namespace-pollution: Add glBitmap as an operation to test

Please remove this line.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

> ---
>  tests/all.py                               |  2 +-
>  tests/general/object-namespace-pollution.c | 20 ++++++++++++++++++++
>  2 files changed, 21 insertions(+), 1 deletion(-)
>
> diff --git a/tests/all.py b/tests/all.py
> index 04eb155..88a3f36 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -4609,7 +4609,7 @@ with profile.group_manager(
>          PiglitGLTest,
>          grouptools.join('object namespace pollution')) as g:
>      for object_type in ("buffer", "texture"):
> -        for operation in ("glClear", "glGenerateMipmap"):
> +        for operation in ("glBitmap", "glClear", "glGenerateMipmap"):
>              g(['object-namespace-pollution', operation, object_type],
>                '{} with {}'.format(object_type, operation))
>
> diff --git a/tests/general/object-namespace-pollution.c b/tests/general/object-namespace-pollution.c
> index 5f8d881..c1c8b40 100644
> --- a/tests/general/object-namespace-pollution.c
> +++ b/tests/general/object-namespace-pollution.c
> @@ -409,6 +409,25 @@ validate_texture(unsigned name)
>  /** \name GL operation wrapper functions. */
>  /*@{*/
>  static bool
> +do_Bitmap(bool silent_skip)
> +{
> +       uint8_t bitmap[16 * 16 / 8];
> +
> +       /* glBitmap is always supported, so there is no opportunity to skip. */
> +       (void) silent_skip;
> +
> +       /* Enable depth test to avoid i965 blit path. */
> +       glEnable(GL_DEPTH_TEST);
> +
> +       memset(bitmap, 0xff, sizeof(bitmap));
> +       glBitmap(16, 16, 0, 0, 0, 0, bitmap);
> +
> +       glDisable(GL_DEPTH_TEST);
> +
> +       return piglit_check_gl_error(GL_NO_ERROR);
> +}
> +
> +static bool
>  do_Clear(bool silent_skip)
>  {
>         /* glClear is always supported, so there is no opportunity to skip. */
> @@ -463,6 +482,7 @@ static const struct {
>         const char *name;
>         bool (*func)(bool silent_skip);
>  } operations[] = {
> +       { "glBitmap", do_Bitmap },
>         { "glClear", do_Clear },
>         { "glGenerateMipmap", do_GenerateMipmap },
>  };
> --
> 2.5.0
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit