← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/mesa/jaunty

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/mga/mga_texstate.c

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2009-04-03 12:42:06 UTC
  • mfrom: (1.2.16 upstream) (3.1.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20090403124206-0oo9dl0tcmd0qr38
Tags: 7.4-0ubuntu1
https://launchpad.net/bugs/330476
https://launchpad.net/bugs/347171
https://launchpad.net/bugs/349127
https://launchpad.net/bugs/146298
https://launchpad.net/bugs/324854
* New upstream release, merge from debian-experimental
  (LP: #330476, #347171, #349127)
* Drop 103_rs600_support.patch, included in this version.
* Drop 104_swrast_fbconfigs.patch, included in this version.
* Add 103_bump_965_texture_limit.diff. (LP: #146298)
* Add 104_fix_dri2_ext_tfp.diff. (LP: #324854)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/mga/mga_texstate.c
206
206
   mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
207
207
   GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
208
208
 
209
 
   if (tObj != ctx->Texture.Unit[0].Current2D &&
210
 
       tObj != ctx->Texture.Unit[0].CurrentRect)
 
209
   if (tObj != ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX] &&
 
210
       tObj != ctx->Texture.Unit[0].CurrentTex[TEXTURE_RECT_INDEX])
211
211
      return;
212
212
 
213
213
 
635
635
   mgaTextureObjectPtr t = (mgaTextureObjectPtr) tObj->DriverData;
636
636
   GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
637
637
 
638
 
   if (tObj != ctx->Texture.Unit[source].Current2D &&
639
 
       tObj != ctx->Texture.Unit[source].CurrentRect)
 
638
   if (tObj != ctx->Texture.Unit[source].CurrentTex[TEXTURE_2D_INDEX] &&
 
639
       tObj != ctx->Texture.Unit[source].CurrentTex[TEXTURE_RECT_INDEX])
640
640
      return;
641
641
 
642
642
   switch (ctx->Texture.Unit[source].EnvMode) {