[Piglit] [PATCH 2/6] texelFetch: check GL_MAX_INTEGER_SAMPLES

[Marek Olšák]

and reindent
---
 tests/texturing/shaders/texelFetch.c | 42 ++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/tests/texturing/shaders/texelFetch.c b/tests/texturing/shaders/texelFetch.c
index 71f2b5e..549c105 100644
--- a/tests/texturing/shaders/texelFetch.c
+++ b/tests/texturing/shaders/texelFetch.c
@@ -821,20 +821,34 @@ piglit_init(int argc, char **argv)
 		if (!sampler_found && (sampler_found = select_sampler(argv[i])))
 			continue;
 
-        /* Maybe it's the sample count? */
-        if (sampler_found && has_samples() && !sample_count) {
-            if ((sample_count = atoi(argv[i]))) {
-                /* check it */
-                GLint max_samples;
-                glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
-                if (sample_count > max_samples) {
-                    printf("Sample count of %d not supported, >MAX_SAMPLES\n",
-                            sample_count);
-                    piglit_report_result(PIGLIT_SKIP);
-                }
-            }
-            continue;
-        }
+		/* Maybe it's the sample count? */
+		if (sampler_found && has_samples() && !sample_count) {
+			if ((sample_count = atoi(argv[i]))) {
+				/* check it */
+				GLint max_samples;
+
+				if (sampler.data_type == GL_INT ||
+				    sampler.data_type == GL_UNSIGNED_INT) {
+					glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &max_samples);
+					if (sample_count > max_samples) {
+						printf("Sample count of %d not supported,"
+						       " >MAX_INTEGER_SAMPLES\n",
+						       sample_count);
+						piglit_report_result(PIGLIT_SKIP);
+					}
+				}
+				else {
+					glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+					if (sample_count > max_samples) {
+						printf("Sample count of %d not supported,"
+						       " >MAX_SAMPLES\n",
+						       sample_count);
+						piglit_report_result(PIGLIT_SKIP);
+					}
+				}
+			}
+			continue;
+		}
 
 		if (!swizzling && (swizzling = parse_swizzle(argv[i])))
 			continue;
-- 
1.8.1.2