On Thu, 2011-06-02 at 09:19 -0600, Brian Paul wrote:
> On 06/01/2011 11:44 AM, Adam Jackson wrote:
> > -      /* Apply pixel store unpack modes to copy data into buf */
> > -      if (src != NULL) {
> > -         (*gc->fillImage) (gc, dim, width, height, depth, format, type,
> > -                           src, buf, modes);
> > -      }
> > -      else {
> > -         if (dim<  3) {
> > -            (void) memcpy(modes, __glXDefaultPixelStore + 4, 20);
> > -         }
> > -         else {
> > -            (void) memcpy(modes, __glXDefaultPixelStore + 0, 36);
> > -         }
> > -      }
> > +    /* Apply pixel store unpack modes to copy data into buf */
> > +    if (src != NULL) {
> > +   (*gc->fillImage) (gc, dim, width, height, depth, format, type,
> > +                     src, buf, modes);
> > +    }
> > +    else {
> > +   if (dim<  3) {
> > +       (void) memcpy(modes, __glXDefaultPixelStore + 4, 20);
> 
> Independent of this patch, __glXDefaultPixelStore + 4 seems like a 
> magic number kind of thing.  There's macros for this value and others 
> in indirect.c (grep default_pixel_store_2D) which should probably be 
> used here.  Feel like taking care of that?

Sure, I have some other cleanups I want to do that will require touching
the generated files (and the generators) anyway.

> Reviewed-by: Brian Paul <bri...@vmware.com>

Thanks, pushed.

- ajax

Attachment: 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

Reply via email to