On Thursday, July 03, 2014 10:13:53 PM Adel Gadllah wrote: > Commit 442442026eb updated both i915 and i965 for DRI3 support, > but one check in intelInitScreen2 was missed for i915 causing crashes > when trying to use i915 with DRI3. > > So fix that up. > > Reported-by: Igor Gnatenko <i.gnatenko.br...@gmail.com> > Tested-by: FrantiĊĦek Zatloukal <zatloukal.franti...@gmail.com> > Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1115323 > Cc: "10.2" <mesa-sta...@lists.freedesktop.org> > Signed-off-by: Adel Gadllah <adel.gadl...@gmail.com> > --- > src/mesa/drivers/dri/i915/intel_screen.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c > index 9b4e490..4c9726c 100644 > --- a/src/mesa/drivers/dri/i915/intel_screen.c > +++ b/src/mesa/drivers/dri/i915/intel_screen.c > @@ -1152,7 +1152,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) > { > struct intel_screen *intelScreen; > > - if (psp->dri2.loader->base.version <= 2 || > + if (psp->image.loader) { > + } else if (psp->dri2.loader->base.version <= 2 || > psp->dri2.loader->getBuffersWithFormat == NULL) { > fprintf(stderr, > "\nERROR! DRI2 loader with getBuffersWithFormat() " >
Pushed, thanks. I didn't actually test it, but it does look like the image loader support is there (in commit 442442026eb), and this really was just missed.
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
