<div dir="ltr"><div><div><div>Okay, I have some comments:<br><br></div>When I run wflinfo -p gbm -a gl -f json | jsontidy (a small python script I have that formats JSON to be human readable)<br></div>I get this:<br>{<br> "generic": {<br> "waffle": {<br> "api": "WAFFLE_CONTEXT_OPENGL",<br> "platform": "WAFFLE_PLATFORM_GBM"<br> },<br> "extensions": [<br> "GL_3DFX_texture_compression_FXT1",<br></div>... (truncated for readability)<br><div> "GL_SUN_multi_draw_arrays"<br> ],<br> "opengl": {<br> "renderer": "Mesa DRI Intel(R) Haswell Mobile ",<br> "version": "3.0 Mesa 11.1.0",<br> "vendor": "Intel Open Source Technology Center"<br> },<br> "shading_language_version": "1.30"<br> }<br>}<br><br></div><div>I think the shading_language_version and extensions belong in the opengl dictionary.<br><br></div><div>Other than that the output seems reasonable and quite usable for my purposes.<br></div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 6, 2016 at 3:06 PM, Dylan Baker <span dir="ltr"><<a href="mailto:baker.dylan.c@gmail.com" target="_blank">baker.dylan.c@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><div><div>Hi Frank,<br><br></div>It looks like your series is going to achieve the same result (for my use) as mine did, but yours is probably better. With that in mind I'll be withdrawing mine in favour of yours.<span class="HOEnZb"><font color="#888888"><br></font></span></div></div><span class="HOEnZb"><font color="#888888"><div><br></div>Dylan<br></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 6, 2016 at 11:56 AM, Frank Henigman <span dir="ltr"><<a href="mailto:fjhenigman@google.com" target="_blank">fjhenigman@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This patch set does two main things, the second of which could just as<br>
well be a separate patch set.<br>
1-6: Move wflinfo functionality into the api, info returned as a json string.<br>
7-12: Extend the functionality to include platform-specific info, such as<br>
provided by glxinfo.<br>
<br>
After 1-6 wflinfo can be gutted to just get json from the api and present<br>
it as desired (dump the json, legacy wflinfo format, glxinfo compatibility<br>
format, verbose or not). I do not have a patch for that yet.<br>
<br>
Since another json patch set was recently posted, I'll point out how<br>
this one differs...<br>
This set moves wflinfo functionality into the api, the other extends<br>
the wflinfo program. Both options were discussed on the mailing list<br>
in Feb 2015 and the former was favored. This set includes a small<br>
library for constructing json strings, with the aim of keeping string<br>
building code as clear and simple as possible. It also tries to write<br>
one key:value per line to allow grepping in lieu of full json parsing.<br>
Finally this set adds additional platform-specific info, though as<br>
stated above that could be considered a follow-on.<br>
<br>
<br>
Frank Henigman (12):<br>
core: store platform type in wcore_platform<br>
core: store context API in wcore_context<br>
core: store current context in wcore_display<br>
core: add JSON library<br>
waffle: add waffle_display_info_json()<br>
wflinfo: add option for JSON output<br>
waffle: support platform-specific information<br>
wflinfo: add flag for platform-specific info<br>
glx: implement platform-specific information<br>
egl: implement platform-specific information<br>
gbm: implement platform-specific information<br>
x11_egl: implement platform-specific information<br>
<br>
include/waffle/waffle.h | 5 +<br>
man/waffle_display.3.xml | 19 +++<br>
src/utils/wflinfo.c | 50 ++++++-<br>
src/waffle/CMakeLists.txt | 1 +<br>
src/waffle/api/waffle_display.c | 292 ++++++++++++++++++++++++++++++++++++++-<br>
src/waffle/api/waffle_gl_misc.c | 11 +-<br>
src/waffle/api/waffle_init.c | 32 +++--<br>
src/waffle/core/json.c | 235 +++++++++++++++++++++++++++++++<br>
src/waffle/core/json.h | 93 +++++++++++++<br>
src/waffle/core/wcore_context.h | 2 +<br>
src/waffle/core/wcore_display.c | 1 +<br>
src/waffle/core/wcore_display.h | 2 +<br>
src/waffle/core/wcore_platform.h | 5 +<br>
src/waffle/egl/wegl_display.c | 32 ++++-<br>
src/waffle/egl/wegl_display.h | 4 +<br>
src/waffle/egl/wegl_platform.h | 3 +<br>
src/waffle/gbm/wgbm_platform.c | 1 +<br>
src/waffle/glx/glx_display.c | 41 ++++++<br>
src/waffle/glx/glx_display.h | 4 +<br>
src/waffle/glx/glx_platform.c | 4 +<br>
src/waffle/glx/glx_platform.h | 3 +<br>
src/waffle/<a href="http://waffle.def.in" rel="noreferrer" target="_blank">waffle.def.in</a> | 1 +<br>
src/waffle/xegl/xegl_platform.c | 1 +<br>
23 files changed, 820 insertions(+), 22 deletions(-)<br>
create mode 100644 src/waffle/core/json.c<br>
create mode 100644 src/waffle/core/json.h<br>
<span><font color="#888888"><br>
--<br>
2.6.0.rc2.230.g3dd15c0<br>
<br>
_______________________________________________<br>
waffle mailing list<br>
<a href="mailto:waffle@lists.freedesktop.org" target="_blank">waffle@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/waffle" rel="noreferrer" target="_blank">http://lists.freedesktop.org/mailman/listinfo/waffle</a><br>
</font></span></blockquote></div><br></div>
</div></div></blockquote></div><br></div>