X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=metrics.c;h=71fe82da1b3d5ff06cf6dd94aa541f14f0b38a33;hb=8ce831b4994e445482eeaeaea868def8a847f34c;hp=2ed90d6b33538bd2cb921b47664e4b086c6b3eaf;hpb=2c71194f453bb34ff2291c2fa7c73582a3adb05e;p=fips

diff --git a/metrics.c b/metrics.c
index 2ed90d6..71fe82d 100644
--- a/metrics.c
+++ b/metrics.c
@@ -163,15 +163,6 @@ metrics_group_info_init (metrics_group_info_t *group, GLuint id)
 						GL_COUNTER_TYPE_AMD,
 						&group->counter_types[i]);
 
-		/* We assume that all peformance counters are made
-		 * available as uint32 values. The code calling
-		 * CONSUME in accumulate_program_metrics will need to
-		 * be extended to accomodate other counter values. */
-		if (group->counter_types[i] != GL_UNSIGNED_INT) {
-			fprintf (stderr, "fips: Internal error: No support for non-uint counter values\n");
-			exit (1);
-		}
-
 		glGetPerfMonitorCounterStringAMD (group->id,
 						  group->counter_ids[i],
 						  0, &length, NULL);
@@ -524,15 +515,14 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
 		GLuint group_id, group_index;
 		GLuint counter_id, counter_index;
 		metrics_group_info_t *group;
-		uint32_t value;
+		double value;
 		unsigned i;
 
 		CONSUME (group_id);
 		CONSUME (counter_id);
-		CONSUME (value);
 
 		for (i = 0; i < info->num_groups; i++) {
-			if (info->groups[i].id == i)
+			if (info->groups[i].id == group_id)
 				break;
 		}
 		group_index = i;
@@ -546,6 +536,31 @@ accumulate_program_metrics (metrics_op_t op, GLuint *result, GLuint size)
 		counter_index = i;
 		assert (counter_index < group->num_counters);
 
+		switch (group->counter_types[counter_index])
+		{
+			uint uint_value;
+			uint64_t uint64_value;
+			float float_value;
+		case GL_UNSIGNED_INT:
+			CONSUME (uint_value);
+			value = uint_value;
+			break;
+		case GL_UNSIGNED_INT64_AMD:
+			CONSUME (uint64_value);
+			value = uint64_value;
+			break;
+		case GL_PERCENTAGE_AMD:
+		case GL_FLOAT:
+			CONSUME (float_value);
+			value = float_value;
+			break;
+		default:
+			fprintf (stderr, "fips: Warning: Unknown counter value type (%d)\n",
+				 group->counter_types[counter_index]);
+			value = 0.0;
+			break;
+		}
+
 		ctx->op_metrics[op].counters[group_index][counter_index] += value;
 	}
 }