summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/formatquery.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c
index 14afe6fcf02..14c69f629df 100644
--- a/src/mesa/main/formatquery.c
+++ b/src/mesa/main/formatquery.c
@@ -1025,6 +1025,7 @@ _mesa_GetInternalformati64v(GLenum target, GLenum internalformat,
{
GLint params32[16];
unsigned i;
+ GLsizei realSize = MIN2(bufSize, 16);
GET_CURRENT_CONTEXT(ctx);
@@ -1035,8 +1036,18 @@ _mesa_GetInternalformati64v(GLenum target, GLenum internalformat,
return;
}
- _mesa_GetInternalformativ(target, internalformat, pname, bufSize, params32);
+ /* For SAMPLES there are cases where params needs to remain unmodified. As
+ * no pname can return a negative value, we fill params32 with negative
+ * values as reference values, that can be used to know what copy-back to
+ * params */
+ memset(params32, -1, 16);
- for (i = 0; i < bufSize; i++)
- params[i] = params32[i];
+ _mesa_GetInternalformativ(target, internalformat, pname, realSize, params32);
+
+ for (i = 0; i < realSize; i++) {
+ /* We only copy back the values that changed */
+ if (params32[i] < 0)
+ break;
+ params[i] = (GLint64) params32[i];
+ }
}