RE: [PATCH] Fix glReadPixels call from read_from_framebuffer (redux)

[Stefan Dösinger]

Hmm... Wouldn't this bug also affect surfaces without a PBO?
> -----Original Message-----
> From: wine-patches-bounces(a)winehq.org [mailto:wine-patches-
> bounces(a)winehq.org] On Behalf Of Nick Burns
> Sent: Sunday, December 21, 2008 12:36 PM
> To: wine-patches(a)winehq.org
> Subject: [PATCH] Fix glReadPixels call from read_from_framebuffer
> (redux)
>
> This is a resubmission of my previous patch I fixed the issues Jeff
> found
> 1 - email address in the patch file/git
> 2 - move declartions to block beginning (no warnings now)
> 3 - hotmail spacing (well i think this is as good as I can make it...)
>
> This is my last gfx fix for SHOGO (now its quite legible and playable)
> The readpixels call was putting data into the wrong place in the pbo
> (fixed with pixelstore) And the y-flip code was flipping the wrong data
> as well (set the bottom row to the bottom row and not the height'th
> row)
>
> The code handled fullscreen 2d blits (or blts without any colorkey
> masking) correctly However sub-blits had issues (in the pbo path)
>     1 - readpixels read into the wrong part of the pbo (as a line and
> not a rect)
>     2 - the y-flip code would move around the uninited data (from the
> readpixels) and it read from the wrong place
>     3 - After 1 and 2 the pbo is corrupt and the blt code had no
> chance...
>
> This patch fixes 1 and 2 -- letting the blt code shine This can be seen
> in the SHOGO menu (now not corrupt!)
>
> Changelog
>     Fix glReadPixels call from read_from_framebuffer
>     Fix the call to readpixels so that 2d blts going thru the pbo path
> end up in the right place and get flipped correctly
>
> - Nick

[PATCH] Fix glReadPixels call from read_from_framebuffer (redux)

[Nick Burns]

'You are correct sir'
I just disabled PBO on my wine build and ran SHOGO
The poor menu system was all garbled... (the same issue that the pbo path had)
I cleaned-up my patch and made it apply in general (to both paths)
Now SHOGO looks good under both paths


Good catch and thanks -- I will re-resubmit my patch


 - Nick

----------------------------------------
> From: stefan(a)codeweavers.com
> To: wine-devel(a)winehq.org; wine-patches(a)winehq.org
> Subject: RE: [PATCH] Fix glReadPixels call from read_from_framebuffer (redux)
> Date: Mon, 22 Dec 2008 13:05:36 +0100
>
> Hmm... Wouldn't this bug also affect surfaces without a PBO?
> > -----Original Message-----
> > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches-
> > bounces(a)winehq.org] On Behalf Of Nick Burns
> > Sent: Sunday, December 21, 2008 12:36 PM
> > To: wine-patches(a)winehq.org
> > Subject: [PATCH] Fix glReadPixels call from read_from_framebuffer
> > (redux)
> >
> > This is a resubmission of my previous patch I fixed the issues Jeff
> > found
> > 1 - email address in the patch file/git
> > 2 - move declartions to block beginning (no warnings now)
> > 3 - hotmail spacing (well i think this is as good as I can make it...)
> >
> > This is my last gfx fix for SHOGO (now its quite legible and playable)
> > The readpixels call was putting data into the wrong place in the pbo
> > (fixed with pixelstore) And the y-flip code was flipping the wrong data
> > as well (set the bottom row to the bottom row and not the height'th
> > row)
> >
> > The code handled fullscreen 2d blits (or blts without any colorkey
> > masking) correctly However sub-blits had issues (in the pbo path)
> > 1 - readpixels read into the wrong part of the pbo (as a line and
> > not a rect)
> > 2 - the y-flip code would move around the uninited data (from the
> > readpixels) and it read from the wrong place
> > 3 - After 1 and 2 the pbo is corrupt and the blt code had no
> > chance...
> >
> > This patch fixes 1 and 2 -- letting the blt code shine This can be seen
> > in the SHOGO menu (now not corrupt!)
> >
> > Changelog
> > Fix glReadPixels call from read_from_framebuffer
> > Fix the call to readpixels so that 2d blts going thru the pbo path
> > end up in the right place and get flipped correctly
> >
> > - Nick