--- Michel Dänzer <[EMAIL PROTECTED]> wrote:
> > diff --git a/src/mesa/drivers/dri/r200/r200_texmem.c
> > b/src/mesa/drivers/dri/r200/r200_texmem.c
> > index d926313..a5687a5 100644
> > --- a/src/mesa/drivers/dri/r200/r200_texmem.c
> > +++ b/src/mesa/drivers/dri/r200/r200_texmem.c
> > @@ -490,11 +491,14 @@ int r200UploadTexImages( r200ContextPtr rmesa,
> > r200TexObjPtr t, GLuint
> face )
> > /* Set the base offset of the texture image */
> > t->bufAddr = rmesa->r200Screen->texOffset[heap]
> > + t->base.memBlock->ofs;
> > - t->pp_txoffset = t->bufAddr;
> > +
> > + if ( !t->image_override ) {
> > + t->pp_txoffset = t->bufAddr;
> >
> > - if (!(t->base.tObj->Image[0][0]->IsClientData)) {
> > - /* hope it's safe to add that here... */
> > - t->pp_txoffset |= t->tile_bits;
> > + if (!(t->base.tObj->Image[0][0]->IsClientData)) {
> > + /* hope it's safe to add that here... */
> > + t->pp_txoffset |= t->tile_bits;
> > + }
> > }
> >
> > /* Mark this texobj as dirty on all units:
>
> This test should probably be earlier - there's no point in allocating
> t->base.memBlock when it'll never be used.
Is that "earlier" as in:
if ( !t || t->base.totalSize == 0 || t->image_override )
return 0;
?
Cheers,
Chris
___________________________________________________________
Yahoo! Answers - Got a question? Someone out there knows the answer. Try it
now.
http://uk.answers.yahoo.com/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
