[PATCH 6/8] ephyr: Create 3.3 core profile context if possible (v3)

[Dave Airlie]

On 23 January 2016 at 02:53, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Hi Dave,
>
> On 19 January 2016 at 09:02, Dave Airlie <airlied at gmail.com> wrote:
>> From: Keith Packard <keithp at keithp.com>
>>
>> On desktop GL, Ask for a 3.3 core profile context if that's available,
>> otherwise create a generic context.
>>
> Regardless if 3.1 or other version is chosen, may I suggest that we
> keep the commit message/summary in line with the code.

yes we should update the commit, Eric if you push this can you do that?

>
>> v2: tell glamor the profile is a core one.
>> v2.1: add/use GL version defines
>> v3: let glamor work out core itself
>>
>> Signed-off-by: Keith Packard <keithp at keithp.com>
>> Signed-off-by: Dave Airlie <airlied at redhat.com>
>> ---
>>  hw/kdrive/ephyr/ephyr_glamor_glx.c | 18 +++++++++++++++++-
>>  1 file changed, 17 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c b/hw/kdrive/ephyr/ephyr_glamor_glx.c
>> index 30c5245..b9fe8d1 100644
>> --- a/hw/kdrive/ephyr/ephyr_glamor_glx.c
>> +++ b/hw/kdrive/ephyr/ephyr_glamor_glx.c
>> @@ -41,6 +41,10 @@
>>  #include "os.h"
>>  #include <X11/Xproto.h>
>>
>> +/* until we need geometry shaders GL3.1 should suffice. */
>> +/* Xephyr has it's own copy of this for build reasons */
>
> Afaict there isn't any particular reason why that's the case, is it ?
> After all Xephyr does link in libglamor.la. Wouldn't it be better to
> include "glamor.h" here and migrate (at later stage) to using the
> glamor functions as opposed to ephyr_glamor_compile_glsl_prog,
> ephyr_glamor_build_glsl_prog plus others(?) ?

Ephyr is complicated by having to include client and server side X headers
in two separate places, the part of xephyr that opens the GLX connection
is in the side that is client header driven, not the side that is
server header driven,
so we can't just include glamor.h.

Dave.