[Mesa-dev] [PATCH 14/15] glapi: Setup autogeneration infrastructure for KHR_debug
Paul Berry
stereotype441 at gmail.com
Wed Sep 4 07:58:36 PDT 2013
On 26 August 2013 03:43, Timothy Arceri <t_arceri at yahoo.com.au> wrote:
>
> Signed-off-by: Timothy Arceri <t_arceri at yahoo.com.au>
> ---
> src/mapi/glapi/gen/gl_API.xml | 149
> +++++++++++++++++++++++++++++++++++++-
> src/mapi/glapi/gen/gl_genexec.py | 1 +
> 2 files changed, 149 insertions(+), 1 deletion(-)
>
> diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
> index 82b908f..71aa9a7 100644
> --- a/src/mapi/glapi/gen/gl_API.xml
> +++ b/src/mapi/glapi/gen/gl_API.xml
> @@ -1107,6 +1107,7 @@
> <type name="void" size="1"/>
>
> <type name="DEBUGPROCARB" size="4" pointer="true"/>
> + <type name="DEBUGPROC" size="4" pointer="true"/>
>
> <function name="NewList" offset="0" deprecated="3.1">
> <param name="list" type="GLuint"/>
> @@ -8309,7 +8310,153 @@
>
> <xi:include href="ARB_texture_storage.xml" xmlns:xi="
> http://www.w3.org/2001/XInclude"/>
>
> -<!-- ARB extensions #118...#126 -->
> +<!-- ARB extension #118 -->
> +
> +<category name="GL_KHR_debug" number="119">
> + <enum name="DEBUG_OUTPUT" value="0x92E0"/>
> + <enum name="DEBUG_OUTPUT_SYNCHRONOUS" value="0x8242"/>
> +
> + <enum name="CONTEXT_FLAG_DEBUG_BIT"
> value="0x00000002"/>
> +
> + <enum name="MAX_DEBUG_MESSAGE_LENGTH" count="1" value="0x9143">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="MAX_DEBUG_LOGGED_MESSAGES" count="1" value="0x9144">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="DEBUG_LOGGED_MESSAGES" count="1" value="0x9145">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="DEBUG_NEXT_LOGGED_MESSAGE_LENGTH" count="1" value="0x8243">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="MAX_DEBUG_GROUP_STACK_DEPTH" count="1" value="0x826C">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="DEBUG_GROUP_STACK_DEPTH" count="1" value="0x826D">
> + <size name="Get" mode="get"/>
> + </enum>
> + <enum name="MAX_LABEL_LENGTH" count="1" value="0x82E8">
> + <size name="Get" mode="get"/>
> + </enum>
> +
> + <enum name="DEBUG_CALLBACK_FUNCTION" count="1" value="0x8244">
> + <size name="GetPointerv" mode="get"/>
> + </enum>
> + <enum name="DEBUG_CALLBACK_USER_PARAM" count="1" value="0x8245">
> + <size name="GetPointerv" mode="get"/>
> + </enum>
> +
> + <enum name="DEBUG_SOURCE_API" value="0x8246"/>
> + <enum name="DEBUG_SOURCE_WINDOW_SYSTEM" value="0x8247"/>
> + <enum name="DEBUG_SOURCE_SHADER_COMPILER" value="0x8248"/>
> + <enum name="DEBUG_SOURCE_THIRD_PARTY" value="0x8249"/>
> + <enum name="DEBUG_SOURCE_APPLICATION" value="0x824A"/>
> + <enum name="DEBUG_SOURCE_OTHER" value="0x824B"/>
> +
> + <enum name="DEBUG_TYPE_ERROR" value="0x824C"/>
> + <enum name="DEBUG_TYPE_DEPRECATED_BEHAVIOR" value="0x824D"/>
> + <enum name="DEBUG_TYPE_UNDEFINED_BEHAVIOR" value="0x824E"/>
> + <enum name="DEBUG_TYPE_PORTABILITY" value="0x824F"/>
> + <enum name="DEBUG_TYPE_PERFORMANCE" value="0x8250"/>
> + <enum name="DEBUG_TYPE_OTHER" value="0x8251"/>
> + <enum name="DEBUG_TYPE_MARKER" value="0x8268"/>
> +
> + <enum name="DEBUG_TYPE_PUSH_GROUP" value="0x8269"/>
> + <enum name="DEBUG_TYPE_POP_GROUP" value="0x826A"/>
> +
> + <enum name="DEBUG_SEVERITY_HIGH" value="0x9146"/>
> + <enum name="DEBUG_SEVERITY_MEDIUM" value="0x9147"/>
> + <enum name="DEBUG_SEVERITY_LOW" value="0x9148"/>
> + <enum name="DEBUG_SEVERITY_NOTIFICATION" value="0x826B"/>
> +
> + <enum name="STACK_UNDERFLOW" value="0x0504"/>
> + <enum name="STACK_OVERFLOW" value="0x0503"/>
> +
> + <enum name="BUFFER" value="0x82E0"/>
> + <enum name="SHADER" value="0x82E1"/>
> + <enum name="PROGRAM" value="0x82E2"/>
> + <enum name="QUERY" value="0x82E3"/>
> + <enum name="PROGRAM_PIPELINE" value="0x82E4"/>
> + <enum name="SAMPLER" value="0x82E6"/>
> + <!-- Compatibility Profile -->
> + <enum name="DISPLAY_LIST" value="0x82E7"/>
> +
> + <function name="DebugMessageControl" offset="assign">
> + <param name="source" type="GLenum"/>
> + <param name="type" type="GLenum"/>
> + <param name="severity" type="GLenum"/>
> + <param name="count" type="GLsizei" counter="true"/>
> + <param name="ids" type="const GLuint *" count="count"/>
> + <param name="enabled" type="GLboolean"/>
> + </function>
> +
> + <function name="DebugMessageInsert" offset="assign">
> + <param name="source" type="GLenum"/>
> + <param name="type" type="GLenum"/>
> + <param name="id" type="GLuint"/>
> + <param name="severity" type="GLenum"/>
> + <param name="length" type="GLsizei"/>
> + <param name="buf" type="const GLchar *"/>
> + </function>
> +
> + <function name="DebugMessageCallback" offset="assign">
> + <param name="callback" type="GLDEBUGPROC"/>
> + <param name="userParam" type="const GLvoid *"/>
> + </function>
> +
> + <function name="GetDebugMessageLog" offset="assign">
> + <return type="GLuint"/>
> + <param name="count" type="GLuint"/>
> + <param name="bufsize" type="GLsizei"/>
> + <param name="sources" type="GLenum *" output="true"/>
> + <param name="types" type="GLenum *" output="true"/>
> + <param name="ids" type="GLuint *" output="true"/>
> + <param name="severities" type="GLenum *" output="true"/>
> + <param name="lengths" type="GLsizei *" output="true"/>
> + <param name="messageLog" type="GLchar *" output="true"/>
> + </function>
> +
> + <function name="PushDebugGroup" offset="assign">
> + <param name="source" type="GLenum"/>
> + <param name="id" type="GLuint"/>
> + <param name="length" type="GLsizei"/>
> + <param name="message" type="const GLchar *"/>
> + </function>
> +
> + <function name="PopDebugGroup" offset="assign"/>
> +
> + <function name="ObjectLabel" offset="assign">
> + <param name="identifier" type="GLenum"/>
> + <param name="name" type="GLuint"/>
> + <param name="length" type="GLsizei"/>
> + <param name="label" type="const GLchar *"/>
> + </function>
> +
> + <function name="GetObjectLabel" offset="assign">
> + <param name="identifier" type="GLenum"/>
> + <param name="name" type="GLuint"/>
> + <param name="bufSize" type="GLsizei"/>
> + <param name="length" type="GLsizei *"/>
> + <param name="label" type="GLchar *"/>
> + </function>
> +
> + <function name="ObjectPtrLabel" offset="assign">
> + <param name="ptr" type="const GLvoid *"/>
> + <param name="length" type="GLsizei"/>
> + <param name="label" type="const GLchar *"/>
> + </function>
> +
> + <function name="GetObjectPtrLabel" offset="assign">
> + <param name="ptr" type="const GLvoid *"/>
> + <param name="bufSize" type="GLsizei"/>
> + <param name="length" type="GLsizei *"/>
> + <param name="label" type="GLchar *"/>
> + </function>
> +
> +</category>
> +
> +<!-- ARB extensions #120...#126 -->
>
> <xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="
> http://www.w3.org/2001/XInclude"/>
>
> diff --git a/src/mapi/glapi/gen/gl_genexec.py
> b/src/mapi/glapi/gen/gl_genexec.py
> index e91d4e9..be82f90 100644
> --- a/src/mapi/glapi/gen/gl_genexec.py
> +++ b/src/mapi/glapi/gen/gl_genexec.py
> @@ -81,6 +81,7 @@ header = """/**
> #include "main/lines.h"
> #include "main/matrix.h"
> #include "main/multisample.h"
> +#include "main/objectlabel.h"
> #include "main/pixel.h"
> #include "main/pixelstore.h"
> #include "main/points.h"
> --
> 1.7.9.5
This commit caused "make check" to fail for me. With a clean build, I get
the following:
============================================================================
Testsuite summary for Mesa 9.3.0-devel
============================================================================
# TOTAL: 1
# PASS: 0
# SKIP: 0
# XFAIL: 0
# FAIL: 1
# XPASS: 0
# ERROR: 0
============================================================================
See src/mesa/main/tests/test-suite.log
Please report to https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa
============================================================================
Then, in src/mesa/main/tests/test-suite.log:
==========================================================
Mesa 9.3.0-devel: src/mesa/main/tests/test-suite.log
==========================================================
# TOTAL: 1
# PASS: 0
# SKIP: 0
# XFAIL: 0
# FAIL: 1
# XPASS: 0
# ERROR: 0
.. contents:: :depth: 2
FAIL: main-test
===============
Running main() from gtest_main.cc
[==========] Running 8 tests from 2 test cases.
[----------] Global test environment set-up.
[----------] 4 tests from EnumStrings
[ RUN ] EnumStrings.LookUpByNumber
[ OK ] EnumStrings.LookUpByNumber (1 ms)
[ RUN ] EnumStrings.LookUpByName
[ OK ] EnumStrings.LookUpByName (1 ms)
[ RUN ] EnumStrings.LookUpByDuplicateName
[ OK ] EnumStrings.LookUpByDuplicateName (0 ms)
[ RUN ] EnumStrings.LookUpUnknownNumber
[ OK ] EnumStrings.LookUpUnknownNumber (0 ms)
[----------] 4 tests from EnumStrings (2 ms total)
[----------] 4 tests from DispatchSanity_test
[ RUN ] DispatchSanity_test.GL31_CORE
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x4342fa
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 857 (DebugMessageCallback)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x4342a3
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 858 (DebugMessageControl)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x4341b4
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 859 (DebugMessageInsert)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x434239
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 860 (GetDebugMessageLog)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x5d3e92
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 861 (GetObjectLabel)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x5d3f85
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 862 (GetObjectPtrLabel)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x5d3e28
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 863 (ObjectLabel)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x5d3ef9
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 864 (ObjectPtrLabel)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x434a9c
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 865 (PopDebugGroup)
dispatch_sanity.cpp:166: Failure
Value of: table[i]
Actual: 0x434340
Expected: (_glapi_proc) _mesa_generic_nop
Which is: 0x40c62c
i = 866 (PushDebugGroup)
[ FAILED ] DispatchSanity_test.GL31_CORE (3 ms)
[ RUN ] DispatchSanity_test.GLES11
[ OK ] DispatchSanity_test.GLES11 (1 ms)
[ RUN ] DispatchSanity_test.GLES2
[ OK ] DispatchSanity_test.GLES2 (0 ms)
[ RUN ] DispatchSanity_test.GLES3
[ OK ] DispatchSanity_test.GLES3 (1 ms)
[----------] 4 tests from DispatchSanity_test (5 ms total)
[----------] Global test environment tear-down
[==========] 8 tests from 2 test cases ran. (7 ms total)
[ PASSED ] 7 tests.
[ FAILED ] 1 test, listed below:
[ FAILED ] DispatchSanity_test.GL31_CORE
1 FAILED TEST
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130904/a4dfd987/attachment-0001.html>
More information about the mesa-dev
mailing list