[PATCH weston] gl-renderer: allow EGL_NATIVE_VISUAL_ID to be 0 in configs

Derek Foreman derekf at osg.samsung.com
Wed Nov 4 12:45:00 PST 2015


On 04/11/15 01:44 PM, Bryce Harrington wrote:
> On Wed, Nov 04, 2015 at 02:57:11PM +0100, Manuel Bachmann wrote:
>> Accept 0 as a valid value for the EGL_NATIVE_VISUAL_ID
>> attribute in EGL configurations, just as we did before
>> commit e76f185.
>>
>> (fixes running Weston with DRM backend and gl-renderer
>> on Lenovo ThinkPad with i915 driver)
>>
>> Signed-off-by: Manuel Bachmann <manuel.bachmann at iot.bzh>
> 
> Confirmed; the code prior to that refactor was allowing id == 0 through.
> 
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>
> Cc: Derek Foreman <derekf at osg.samsung.com>
> 
>> ---
>>  src/gl-renderer.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/gl-renderer.c b/src/gl-renderer.c
>> index d7231f4..85c69f3 100644
>> --- a/src/gl-renderer.c
>> +++ b/src/gl-renderer.c
>> @@ -2194,7 +2194,7 @@ match_config_to_visual(EGLDisplay egl_display,
>>  				&id))
>>  			continue;
>>  
>> -		if (id == visual_id)
>> +		if (id == 0 || id == visual_id)

I think this could potentially pick the wrong id on some systems?

Seems like it's theoretically possible for visuals with a native id of 0
to be tested before the ones with legitimate ids...  I think we should
always prefer a visual with a matching id if at all possible.

Just out of curiosity, what version of Mesa are you using?

I'll post an alternative patch shortly - I can't reproduce your bug, so
it'd be great if you could try it...

>>  			return i;
>>  	}
>>  
>> -- 
>> 1.8.3.1
>>
>> _______________________________________________
>> wayland-devel mailing list
>> wayland-devel at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/wayland-devel



More information about the wayland-devel mailing list