diff options
| author | Adel Gadllah <[email protected]> | 2014-07-03 22:13:53 +0200 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-07-17 14:42:35 -0700 |
| commit | b656e3c603da46fe0acd9905dc039c93d76f0b06 (patch) | |
| tree | c0971adc95d8708d56a157d921930d289eaebda3 /src/mesa/drivers/dri/i915 | |
| parent | 4ceb612a10d7776631b196ae13be9c5588154468 (diff) | |
i915: Fix up intelInitScreen2 for DRI3
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 <[email protected]>
References: https://bugzilla.redhat.com/show_bug.cgi?id=1115323
References: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754297
Tested-by: FrantiĊĦek Zatloukal <[email protected]>
Tested-by: Dirk Griesbach <[email protected]>
Signed-off-by: Adel Gadllah <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
Cc: "10.2" <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 9b4e490df07..4c9726c299f 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() " |