Re: [waffle] json, approach 2, version 2

2016-06-18 Thread Frank Henigman
I send v2 of the series. I'll send v2 after rebasing and incorporating the latest suggestions. Thanks. On Tue, Jun 14, 2016 at 12:13 PM, Chad Versace <chad.vers...@intel.com> wrote: > On Thu 21 Apr 2016, Frank Henigman wrote: >> Thanks Emil and Chad for reviewing my json series.

Re: [waffle] [PATCH 07/12] waffle: support platform-specific information

2016-04-24 Thread Frank Henigman
On Sun, Apr 24, 2016 at 5:04 PM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 24 April 2016 at 20:52, Frank Henigman <fjhenig...@google.com> wrote: >> On Sun, Apr 24, 2016 at 6:36 AM, Emil Velikov <emil.l.veli...@gmail.com> >> wrote: >>> On 21 Ap

Re: [waffle] [PATCH 05/12] waffle: add waffle_display_info_json()

2016-04-24 Thread Frank Henigman
On Sun, Apr 24, 2016 at 4:54 PM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 24 April 2016 at 20:50, Frank Henigman <fjhenig...@google.com> wrote: >> On Sun, Apr 24, 2016 at 6:42 AM, Emil Velikov <emil.l.veli...@gmail.com> >> wrote: >>> On 21 Ap

Re: [waffle] [PATCH 04/12] core: add JSON library

2016-04-24 Thread Frank Henigman
On Sun, Apr 24, 2016 at 4:50 PM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 6 January 2016 at 19:56, Frank Henigman <fjhenig...@google.com> wrote: > >> +static void >> +put(struct json *jj, char *s) >> +{ >

Re: [waffle] [PATCH 07/12] waffle: support platform-specific information

2016-04-24 Thread Frank Henigman
On Sun, Apr 24, 2016 at 6:36 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 21 April 2016 at 21:26, Frank Henigman <fjhenig...@google.com> wrote: >> On Fri, Jan 8, 2016 at 7:44 AM, Emil Velikov <emil.l.veli...@gmail.com> >> wrote: >>> On 6 Janu

Re: [waffle] [PATCH 05/12] waffle: add waffle_display_info_json()

2016-04-24 Thread Frank Henigman
On Sun, Apr 24, 2016 at 6:42 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 21 April 2016 at 21:25, Frank Henigman <fjhenig...@google.com> wrote: >> On Fri, Jan 8, 2016 at 7:40 AM, Emil Velikov <emil.l.veli...@gmail.com> >> wrote: >>> On 6 Janu

Re: [waffle] [PATCH 10/12] egl: implement platform-specific information

2016-04-21 Thread Frank Henigman
On Fri, Jan 8, 2016 at 7:50 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 6 January 2016 at 21:56, Frank Henigman <fjhenig...@google.com> wrote: >> Implement the platform hook of waffle_display_info_json() so it can >> pick up egl-specific information. >>

Re: [waffle] [PATCH 07/12] waffle: support platform-specific information

2016-04-21 Thread Frank Henigman
On Fri, Jan 8, 2016 at 7:44 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 6 January 2016 at 21:56, Frank Henigman <fjhenig...@google.com> wrote: >> Add a platform hook so platform-specific information can be included >> by waffle_display_info_json(). >>

Re: [waffle] [PATCH 06/12] wflinfo: add option for JSON output

2016-04-21 Thread Frank Henigman
On Fri, Apr 8, 2016 at 8:14 PM, Chad Versace <chad.vers...@intel.com> wrote: > On 01/06/2016 11:56 AM, Frank Henigman wrote: >> With "-f json" wflinfo will now print the result of >> waffle_display_info_json(). >> >> Signed-off-by: Frank Henigman &

Re: [waffle] [PATCH 05/12] waffle: add waffle_display_info_json()

2016-04-21 Thread Frank Henigman
On Fri, Jan 8, 2016 at 7:40 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 6 January 2016 at 21:56, Frank Henigman <fjhenig...@google.com> wrote: >> Duplicate wflinfo functionality in the API, with the difference that the >> information is returned in JSO

Re: [waffle] [PATCH 04/12] core: add JSON library

2016-04-21 Thread Frank Henigman
On Fri, Apr 8, 2016 at 7:38 PM, Chad Versace <chad.vers...@intel.com> wrote: > On 01/08/2016 04:17 AM, Emil Velikov wrote: >> On 6 January 2016 at 21:56, Frank Henigman <fjhenig...@google.com> wrote: >>> A small library for building JSON strings. >>> >

Re: [waffle] Approaches to JSON

2016-01-11 Thread Frank Henigman
On Mon, Jan 11, 2016 at 3:43 PM, Chad Versace wrote: > There are two sets of very different json patchsets on the list. Each > has advantages and disadvantages. > > Dylan's patchset duplicates a small amount of code. And it doesn't teach > wflinfo to print any additional

Re: [waffle] [PATCH 02/29] gbm: don't fetch gbm_bo_* symbols from libgbm

2016-01-06 Thread Frank Henigman
e platform > friendlier to derived classes). The latter of which could have kept > these as a separate patch :) > > Cc: Frank Henigman <fjhenig...@google.com> > Cc: Chad Versace <chad.vers...@intel.com> > Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>

Re: [waffle] [PATCH 00/12] JSON and platform-specific wflinfo

2016-01-06 Thread Frank Henigman
On Wed, Jan 6, 2016 at 6:43 PM, Dylan Baker wrote: > Okay, I have some comments: > > When I run wflinfo -p gbm -a gl -f json | jsontidy (a small python script I > have that formats JSON to be human readable) > I get this: > { > "generic": { > "waffle": { >

[waffle] [PATCH 08/12] wflinfo: add flag for platform-specific info

2016-01-06 Thread Frank Henigman
When given a "-s" flag wflinfo will now also print some platform-specific information. This affects only JSON output, not other formats. Signed-off-by: Frank Henigman <fjhenig...@google.com> --- src/utils/wflinfo.c | 14 -- 1 file changed, 12 insertions(+), 2 de

[waffle] [PATCH 01/12] core: store platform type in wcore_platform

2016-01-06 Thread Frank Henigman
Facilitates platform-specific code in core functions, like the forthcoming wflinfo-like function. Signed-off-by: Frank Henigman <fjhenig...@google.com> --- src/waffle/api/waffle_init.c | 32 +--- src/waffle/core/wcore_platform.h | 1 + 2 files chang

[waffle] [PATCH 12/12] x11_egl: implement platform-specific information

2016-01-06 Thread Frank Henigman
Implement the platform hook of waffle_display_info_json() so it can pick up x11_egl-specific information. So far only egl information is provided, nothing specific to x11. Signed-off-by: Frank Henigman <fjhenig...@google.com> --- src/waffle/xegl/xegl_platform.c | 1 + 1 file chan

[waffle] [PATCH 11/12] gbm: implement platform-specific information

2016-01-06 Thread Frank Henigman
Implement the platform hook of waffle_display_info_json() so it can pick up gbm-specific information. So far only egl information is provided, nothing specific to gbm. Signed-off-by: Frank Henigman <fjhenig...@google.com> --- src/waffle/gbm/wgbm_platform.c | 1 + 1 file changed, 1 ins

[waffle] [PATCH 00/12] JSON and platform-specific wflinfo

2016-01-06 Thread Frank Henigman
as possible. It also tries to write one key:value per line to allow grepping in lieu of full json parsing. Finally this set adds additional platform-specific info, though as stated above that could be considered a follow-on. Frank Henigman (12): core: store platform type in wcore_platform core

[waffle] [PATCH 02/12] core: store context API in wcore_context

2016-01-06 Thread Frank Henigman
Facilitates api-specific code in core functions, like the forthcoming wflinfo-like function. Signed-off-by: Frank Henigman <fjhenig...@google.com> --- src/waffle/core/wcore_context.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/waffle/core/wcore_context.h b/src/waffl

[waffle] [PATCH 05/12] waffle: add waffle_display_info_json()

2016-01-06 Thread Frank Henigman
Duplicate wflinfo functionality in the API, with the difference that the information is returned in JSON form. The function has a parameter for including platform-specific information, but it is ignored for now. Signed-off-by: Frank Henigman <fjhenig...@google.com> --- include/waffle/wa

[waffle] [PATCH 03/12] core: store current context in wcore_display

2016-01-06 Thread Frank Henigman
For core functions that need to know the current context, like the forthcoming wflinfo-like function. Signed-off-by: Frank Henigman <fjhenig...@google.com> --- src/waffle/api/waffle_gl_misc.c | 11 +++ src/waffle/core/wcore_display.c | 1 + src/waffle/core/wcore_display.h | 2

Re: [waffle] [RFC 1/3] wflinfo.c: split out flags struct

2015-12-27 Thread Frank Henigman
On Wed, Dec 16, 2015 at 8:37 PM, wrote: > From: Dylan Baker > > This is groundwork for adding a json interface to wflinfo. > --- > src/utils/wflinfo.c | 19 +++ > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git

Re: [waffle] [RFC 2/3] wflinfo.c: split version, renderer, and vendor checks

2015-12-27 Thread Frank Henigman
On Wed, Dec 16, 2015 at 8:37 PM, wrote: > From: Dylan Baker > > Pull these out into helper functions, this change will be used in a > following patch to add a json printer. > > Signed-off-by: Dylan Baker > --- >

Re: [waffle] [RFC 0/3] Add JSON output to wflinfo

2015-12-27 Thread Frank Henigman
On Wed, Dec 16, 2015 at 8:37 PM, wrote: > From: Dylan Baker > > This is a pretty rough RFC for adding JSON output to wflinfo. The > intended consumer of this feature is piglit, for use with the > fast-skipping mechanism. This mechanism currently

[waffle] [PATCH 4/4] wflinfo: use waffle_string_to_enum()

2015-04-22 Thread Frank Henigman
Remove platform and api lists, and instead use waffle_string_to_enum() to parse command line platform and api arguments. Also use waffle_enum_to_string() when printing platform and api. This means it now prints GLX instead of glx and GL_ES2 instead of gles2, for example. Signed-off-by: Frank

[waffle] [PATCH 0/4] waffle_string_to_enum()

2015-04-22 Thread Frank Henigman
to be updated when waffle gets a new platform; they should just work with the new platform. I've updated wflinfo as proof of concept. If people like this I'll do gl_basic too. Frank Henigman (4): waffle: put waffle_enum items in a macro waffle: use enum list in waffle_enum_to_string

[waffle] [PATCH 1/4] waffle: put waffle_enum items in a macro

2015-04-22 Thread Frank Henigman
List all waffle_enum items in a big #define to avoid duplicating the list when a case is needed for each item, e.g. enum to string. Signed-off-by: Frank Henigman fjhenig...@google.com --- include/waffle/waffle.h | 150 ++-- 1 file changed, 81

Re: [waffle] [PATCH 1/4] waffle: put waffle_enum items in a macro

2015-04-22 Thread Frank Henigman
On Wed, Apr 22, 2015 at 8:09 PM, Jordan Justen jordan.l.jus...@intel.com wrote: On 2015-04-22 11:03:47, Frank Henigman wrote: List all waffle_enum items in a big #define to avoid duplicating the list when a case is needed for each item, e.g. enum to string. This looks kind of yucky. :) When

[waffle] [PATCH 08/10] wflinfo: add 'null' platform

2015-03-30 Thread Frank Henigman
Signed-off-by: Frank Henigman fjhenig...@google.com --- src/utils/wflinfo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/wflinfo.c b/src/utils/wflinfo.c index 268d4b8..0a58aab 100644 --- a/src/utils/wflinfo.c +++ b/src/utils/wflinfo.c @@ -62,7 +62,7 @@ static

[waffle] [PATCH 10/10] waffle: add 'null' platform

2015-03-30 Thread Frank Henigman
. The gbm buffers can be displayed via DRM/KMS. Signed-off-by: Frank Henigman fjhenig...@google.com --- LICENSE.txt| 5 + Options.cmake | 8 + cmake/Modules/WaffleDefineCompilerFlags.cmake | 4 + cmake/Modules

[waffle] [PATCH 03/10] gbm: make wgbm_get_default_fd_for_pattern public

2015-03-30 Thread Frank Henigman
Signed-off-by: Frank Henigman fjhenig...@google.com --- src/waffle/gbm/wgbm_display.c | 2 +- src/waffle/gbm/wgbm_display.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/waffle/gbm/wgbm_display.c b/src/waffle/gbm/wgbm_display.c index 76e6c32..b46524a 100644 --- a/src

[waffle] [PATCH 07/10] waffle: add full screen window request

2015-03-30 Thread Frank Henigman
You can now put WAFFLE_WINDOW_FULLSCREEN in the attribute list passed to waffle_window_create2() and get a full screen window. Only glx and x11_egl implemented so far. Signed-off-by: Frank Henigman fjhenig...@google.com --- include/waffle/waffle.h| 1 + src/waffle/api/waffle_window.c

[waffle] [PATCH 05/10] wegl: add EGL image create/destroy

2015-03-30 Thread Frank Henigman
From: Frank Henigman fjhenig...@gmail.com Store EGLImageCreateKHR and EGLImageDestroyKHR in the EGL platform struct. Signed-off-by: Frank Henigman fjhenig...@google.com --- src/waffle/egl/wegl_platform.c | 9 - src/waffle/egl/wegl_platform.h | 4 2 files changed, 12 insertions

[waffle] [PATCH 06/10] gbm: wegl_display ok in wgbm_config_get_gbm_format

2015-03-30 Thread Frank Henigman
From: Frank Henigman fjhenig...@gmail.com wgbm_config_get_gbm_format() does not need to cast the display all the way to wgbm_display; wegl_display is far enough. Now wgbm_config_get_gbm_format() can be used outside of the gbm platform. Signed-off-by: Frank Henigman fjhenig...@google.com --- src

[waffle] [PATCH 01/10] wegl: enable deriving from wegl_context

2015-03-30 Thread Frank Henigman
Factor out init and teardown functions from create and destroy so a derived class can use them on its embedded wegl_context object. Signed-off-by: Frank Henigman fjhenig...@google.com --- src/waffle/egl/wegl_context.c | 79 +++ src/waffle/egl

[waffle] [PATCH 02/10] gbm: make platform friendlier to derived classes

2015-03-30 Thread Frank Henigman
Retrieve additional gbm functions. Change some functions from private to public. Factor init and teardown out of create and destroy respectively, so a derived class can used them on its embedded platform object. Signed-off-by: Frank Henigman fjhenig...@google.com --- src/waffle/gbm

[waffle] [PATCH 09/10] gl_basic: add 'null' platform

2015-03-30 Thread Frank Henigman
Signed-off-by: Frank Henigman fjhenig...@google.com --- examples/gl_basic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/gl_basic.c b/examples/gl_basic.c index 8f59d21..ab9c78c 100644 --- a/examples/gl_basic.c +++ b/examples/gl_basic.c @@ -243,6 +243,7 @@ static const struct

[waffle] [PATCH] gl_basic: request alpha planes

2015-03-23 Thread Frank Henigman
Alpha planes are written and read, so we should ask for them in the config. Signed-off-by: Frank Henigman fjhenig...@google.com --- examples/gl_basic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/gl_basic.c b/examples/gl_basic.c index ab9c78c..e59dc11 100644 --- a/examples

Re: [waffle] EGL null platform

2015-02-12 Thread Frank Henigman
EGL_PLATFORM_NULL is not upstreamed yet either, though perhaps it could be fairly easily. Also I'm developing with minigbm, though it could probably also work with mesa gbm. My priority is to get this working for chromeos tests, as we've already switched to null platform + minigbm. That will

Re: [waffle] [wflinfo] [RFC] platform-specific info from wflinfo

2015-02-12 Thread Frank Henigman
On Thu, Feb 12, 2015 at 5:44 AM, Emil Velikov emil.l.veli...@gmail.com wrote: On 12 February 2015 at 02:01, Chad Versace chad.vers...@intel.com wrote: On 02/10/2015 01:20 PM, Frank Henigman wrote: On Tue, Feb 10, 2015 at 4:08 PM, Frank Henigman fjhenig...@google.com wrote: Looks like Issue

Re: [waffle] [wflinfo] [RFC] platform-specific info from wflinfo

2015-02-10 Thread Frank Henigman
, Piglit wants this. I imagine more users will begin using it too. On Sun, Feb 08, 2015 at 07:50:15PM -0500, Frank Henigman wrote: I'd like to extend wflinfo so it can print platform-specific information and eventually be able to replace glxinfo, eglinfo and the like (I only know what's on linux

Re: [waffle] [wflinfo] [RFC] platform-specific info from wflinfo

2015-02-10 Thread Frank Henigman
On Tue, Feb 10, 2015 at 4:08 PM, Frank Henigman fjhenig...@google.com wrote: On Tue, Feb 10, 2015 at 3:09 PM, Chad Versace chad.vers...@intel.com wrote: On 02/10/2015 10:31 AM, Dylan Baker wrote: I like this idea, it would be convenient for piglit to be able to assume waffle info can provide

[waffle] [PATCH] wflinfo: find glGetStringi on both Mali and WGL

2015-01-26 Thread Frank Henigman
Do the glGetStringi lookup after making context current so it works on WGL. Remove an incorrect glGetStringi lookup, which returned NULL on Mali. Signed-off-by: Frank Henigman fjhenig...@google.com --- Not sure what happened but wflinfo is still broken on mali because of the glGetStringi madness

Re: [waffle] [PATCH 00/11] Add new public func waffle_window_create2()

2014-12-23 Thread Frank Henigman
On Mon, Dec 22, 2014 at 8:11 PM, Chad Versace chad.vers...@intel.com wrote: On 12/21/2014 01:41 PM, Emil Velikov wrote: On 16 December 2014 at 08:18, Chad Versace chad.vers...@linux.intel.com wrote: Today, waffle_window() has only two parameters: width and height. Frank Henigman wants

Re: [waffle] [PATCH 02/11] core: Define intptr_t variants of wcore_attrib_list functions

2014-12-23 Thread Frank Henigman
On Tue, Dec 16, 2014 at 3:18 AM, Chad Versace chad.vers...@linux.intel.com wrote: When designing the original Waffle 1.0 API, I made a mistake when I chose to declare attribute lists as arrays of int32_t. Instead, they should have been arrays of intptr_t. A new public function,

Re: [waffle] [PATCH 09/11] waffle: Add public func waffle_window_create2()

2014-12-23 Thread Frank Henigman
On Tue, Dec 16, 2014 at 3:18 AM, Chad Versace chad.vers...@linux.intel.com wrote: Today, waffle_window() has only two parameters: width and height. Frank Henigman wants to extend Waffle's GBM backend with the ability to post window contents to the display. Multiple methods exist for posting

Re: [waffle] [RFC] Add display support to GBM backend

2014-12-12 Thread Frank Henigman
for upstreaming. From: Frank Henigman fjhenig...@chromium.org Date: Tue, 21 Oct 2014 22:58:45 -0400 Subject: [PATCH] gbm WIP: show gbm buffers on screen Four options based on the value of environment variable MODE: COPY: copy render buffer to scanout buffer and flip to scanout buffer FLIP: scan