From 2a90420bbe9509997b1f95b1e81fadca7154f383 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Wed, 10 Feb 2021 18:22:03 +0100
Subject: [PATCH] ci: enable max texture size tests for zink

I cargo-culted these from the llvmpipe tests, but they seem to pass and
not take much time or memory at all, so let's try enabling them. If this
works fine, we might want to try the same for llvmpipe as well...

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8979>
---
 .gitlab-ci.yml                      |  2 --
 .gitlab-ci/piglit/zink-quick_gl.txt | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb28c559b2e..7574c5abe25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1194,8 +1194,6 @@ zink-piglit-quick_gl:
     PIGLIT_OPTIONS: >
       -x arb_map_buffer_alignment@arb_map_buffer_alignment-map-invalidate-range
       -x glx-make-current
-      -x max-texture-size
-      -x maxsize
     PIGLIT_PROFILES: quick_gl
     PIGLIT_RESULTS: "zink-quick_gl"
     GALLIVM_PERF: "no_filter_hacks"
diff --git a/.gitlab-ci/piglit/zink-quick_gl.txt b/.gitlab-ci/piglit/zink-quick_gl.txt
index e0ab05ed06f..fe6c015c01e 100644
--- a/.gitlab-ci/piglit/zink-quick_gl.txt
+++ b/.gitlab-ci/piglit/zink-quick_gl.txt
@@ -411,6 +411,16 @@ spec/!opengl 1.1/linestipple/factor 3x: fail
 spec/!opengl 1.1/linestipple/line loop: fail
 spec/!opengl 1.1/linestipple/line strip: fail
 spec/!opengl 1.1/linestipple/restarting lines within a single begin-end block: fail
+spec/!opengl 1.1/max-texture-size/gl_texture_2d-gl_rgba16: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_2d-gl_rgba32f: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_3d-gl_rgba16: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_3d-gl_rgba32f: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_3d-gl_rgba8: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_cube_map-gl_rgba16: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_cube_map-gl_rgba32f: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_cube_map-gl_rgba8: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_rectangle-gl_rgba16: skip
+spec/!opengl 1.1/max-texture-size/gl_texture_rectangle-gl_rgba32f: skip
 spec/!opengl 1.1/polygon-mode: fail
 spec/!opengl 1.1/polygon-mode-facing: fail
 spec/!opengl 1.1/polygon-mode-offset/config 0: expected white pixel on bottom edge: fail
@@ -3377,10 +3387,10 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    18163
+       pass:    18186
        fail:     1173
       crash:      330
-       skip:     1845
+       skip:     1855
     timeout:        0
        warn:        4
  incomplete:        0
@@ -3389,4 +3399,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    21539
+      total:    21572