<div dir="ltr">On 25 October 2013 11:13, Ian Romanick <<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com" target="_blank">ian.d.romanick@intel.com</a>> All of the tests for this extension will require a bunch of function pointers, etc. This patch adds a function to get these function pointers and some macros to wrap calls using them. Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com" target="_blank">ian.d.romanick@intel.com</a>> --- .../query-renderer-common.c | 70 +++++++++++++++++++++ .../query-renderer-common.h | 72 ++++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 tests/spec/glx_mesa_query_renderer/query-renderer-common.c create mode 100644 tests/spec/glx_mesa_query_renderer/query-renderer-common.h diff --git a/tests/spec/glx_mesa_query_renderer/query-renderer-common.c b/tests/spec/glx_mesa_query_renderer/query-renderer-common.c new file mode 100644 index 0000000..429f360 --- /dev/null +++ b/tests/spec/glx_mesa_query_renderer/query-renderer-common.c @@ -0,0 +1,70 @@ +/* Copyright © 2013 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ +#include "piglit-util-gl-common.h" +#include "piglit-glx-util.h" +#include "query-renderer-common.h" + +PFNGLXQUERYRENDERERSTRINGMESAPROC __piglit_glXQueryRendererStringMESA = NULL; +PFNGLXQUERYCURRENTRENDERERSTRINGMESAPROC __piglit_glXQueryCurrentRendererStringMESA = NULL; +PFNGLXQUERYRENDERERINTEGERMESAPROC __piglit_glXQueryRendererIntegerMESA = NULL; +PFNGLXQUERYCURRENTRENDERERINTEGERMESAPROC __piglit_glXQueryCurrentRendererIntegerMESA = NULL; +PFNGLXCREATECONTEXTATTRIBSARBPROC __piglit_glXCreateContextAttribsARB = NULL; </blockquote><div> </div><div>Identifiers beginning with "__" are reserved by ISO C. Change these to "piglit_glX..." and the patch is: Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com" target="_blank">stereotype441@gmail.com</a>> </div></div></div></div>