diff options
| author | Kenneth Graunke <[email protected]> | 2016-03-23 21:38:42 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-03-24 10:47:29 -0700 |
| commit | 412e686da9e64d5b56b0a9c57c2b95624c56ea05 (patch) | |
| tree | a3e706e5385bd906175c1b86bb70b10ed2657412 | |
| parent | 6b763c026de0aa4c18bb698ddcfd25d04c73e56e (diff) | |
mesa: Include null terminator in GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH.
From the KHR_debug spec:
"Applications can query the number of messages currently in the log by
obtaining the value of DEBUG_LOGGED_MESSAGES, and the string length
(including its null terminator) of the oldest message in the log
through the value of DEBUG_NEXT_LOGGED_MESSAGE_LENGTH."
Because we weren't including the null terminator, many dEQP tests
called glGetDebugMessageLog with a bufSize parameter that was 1 too
small, and unable to contain the message, so we skipped returning it,
failing many cases.
Fixes 298 dEQP-GLES31.functional.debug.* tests.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Stephane Marchesin <[email protected]>
Reviewed-by: Eduardo Lima Mitev <[email protected]>
| -rw-r--r-- | src/mesa/main/debug_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/debug_output.c b/src/mesa/main/debug_output.c index c2b9f053352..74be8554c80 100644 --- a/src/mesa/main/debug_output.c +++ b/src/mesa/main/debug_output.c @@ -779,7 +779,7 @@ _mesa_get_debug_state_int(struct gl_context *ctx, GLenum pname) break; case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH: val = (debug->Log.NumMessages) ? - debug->Log.Messages[debug->Log.NextMessage].length : 0; + debug->Log.Messages[debug->Log.NextMessage].length + 1 : 0; break; case GL_DEBUG_GROUP_STACK_DEPTH: val = debug->CurrentGroup + 1; |