[Piglit] [PATCH 01/11] shader_runner: Don't try to enable GL_TEXTURE_2D in core profiles

[Chris Forbes]

For the series:

Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>

On Mon, Jun 2, 2014 at 12:39 PM, Jordan Justen
<jordan.l.justen at intel.com> wrote:
> Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
> ---
> Series available at 'cs' branch of:
> git://people.freedesktop.org/~jljusten/piglit
>
>  tests/shaders/shader_runner.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
> index 7e1a303..7126c64 100644
> --- a/tests/shaders/shader_runner.c
> +++ b/tests/shaders/shader_runner.c
> @@ -2017,11 +2017,13 @@ piglit_display(void)
>                                   &tex, &w, &h) == 3) {
>                         glActiveTexture(GL_TEXTURE0 + tex);
>                         piglit_rgbw_texture(GL_RGBA, w, h, GL_FALSE, GL_FALSE, GL_UNSIGNED_NORMALIZED);
> -                       glEnable(GL_TEXTURE_2D);
> +                       if (!piglit_is_core_profile)
> +                               glEnable(GL_TEXTURE_2D);
>                 } else if (sscanf(line, "texture miptree %d", &tex) == 1) {
>                         glActiveTexture(GL_TEXTURE0 + tex);
>                         piglit_miptree_texture();
> -                       glEnable(GL_TEXTURE_2D);
> +                       if (!piglit_is_core_profile)
> +                               glEnable(GL_TEXTURE_2D);
>                 } else if (sscanf(line,
>                                   "texture checkerboard %d %d ( %d , %d ) "
>                                   "( %f , %f , %f , %f ) "
> @@ -2034,7 +2036,8 @@ piglit_display(void)
>                                                     w, h,
>                                                     w / 2, h / 2,
>                                                     c + 0, c + 4);
> -                       glEnable(GL_TEXTURE_2D);
> +                       if (!piglit_is_core_profile)
> +                               glEnable(GL_TEXTURE_2D);
>                 } else if (sscanf(line,
>                                   "texture shadow2D %d ( %d , %d )",
>                                   &tex, &w, &h) == 3) {
> @@ -2048,7 +2051,8 @@ piglit_display(void)
>                                         GL_TEXTURE_COMPARE_FUNC,
>                                         GL_GREATER);
>
> -                       glEnable(GL_TEXTURE_2D);
> +                       if (!piglit_is_core_profile)
> +                               glEnable(GL_TEXTURE_2D);
>                 } else if (sscanf(line,
>                                   "texture shadowRect %d ( %d , %d )",
>                                   &tex, &w, &h) == 3) {
> --
> 2.0.0.rc4
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit