From 41d59c0af7c70bbc8cc0030a1fc3c24cdae206ce Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Thu, 11 Oct 2012 17:59:55 +0200 Subject: [PATCH] cogl: Enable PBO path for all mesa versions when using intel There seem to be other cases where the slow path is hit even with mesa 9.0. https://bugzilla.gnome.org/show_bug.cgi?id=685915 (cherry picked from commit 6b14fa222bafb7e67c4845b26439322b34ac26a2) --- cogl/cogl-gpu-info.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cogl/cogl-gpu-info.c b/cogl/cogl-gpu-info.c index 5bb0e6592..0d23c977b 100644 --- a/cogl/cogl-gpu-info.c +++ b/cogl/cogl-gpu-info.c @@ -540,14 +540,12 @@ probed: /* Determine the driver bugs */ - /* In Mesa < 8.0.2 the glReadPixels implementation is really slow - because it converts each pixel to a floating point representation - and back even if the data could just be memcpy'd. The Intel + /* In Mesa the glReadPixels implementation is really slow + when using the Intel driver. The Intel driver has a fast blit path when reading into a PBO. Reading into a temporary PBO and then memcpying back out to the application's memory is faster than a regular glReadPixels in this case */ if (gpu->vendor == COGL_GPU_INFO_VENDOR_INTEL && - gpu->driver_package == COGL_GPU_INFO_DRIVER_PACKAGE_MESA && - gpu->driver_package_version < COGL_VERSION_ENCODE (8, 0, 2)) + gpu->driver_package == COGL_GPU_INFO_DRIVER_PACKAGE_MESA) gpu->driver_bugs |= COGL_GPU_INFO_DRIVER_BUG_MESA_46631_SLOW_READ_PIXELS; }