summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2017-07-06 18:48:03 -0700
committerMatt Turner <[email protected]>2017-08-21 14:45:44 -0700
commit384e27174d0c4c96279d51a037ea36618d51a851 (patch)
treed8bb140e4d81c353cb3c79f41ff77634408a2bf4
parent4e97084591c206338af4425c33edb833de348816 (diff)
mesa: Don't compare unsigned for < 0
The INTEL_performance_query spec says "Performance counter id 0 is reserved as an invalid counter." GLuint counterid_to_index(GLuint counterid) just returns counterid - 1, so with unsigned overflow rules, it will generate 0xFFFFFFFF given an input of 0. 0xFFFFFFFF will trigger the counterIndex >= queryNumCounters check, so the code worked as is. It just contained a useless comparison. Reviewed-by: Jordan Justen <[email protected]>
-rw-r--r--src/mesa/main/performance_query.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/performance_query.c b/src/mesa/main/performance_query.c
index 56f6a7da8b9..b9e7cf9961b 100644
--- a/src/mesa/main/performance_query.c
+++ b/src/mesa/main/performance_query.c
@@ -349,7 +349,7 @@ _mesa_GetPerfCounterInfoINTEL(GLuint queryId, GLuint counterId,
counterIndex = counterid_to_index(counterId);
- if (counterIndex < 0 || counterIndex >= queryNumCounters) {
+ if (counterIndex >= queryNumCounters) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glGetPerfCounterInfoINTEL(invalid counterId)");
return;