← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mesa/vbo/vbo_exec_draw.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/vbo/vbo_exec_draw.c
175
175
         exec->vtx.inputs[attr + 16] = &vbo->generic_currval[attr];
176
176
      }
177
177
      map = vbo->map_vp_arb;
 
178
 
 
179
      /* check if VERT_ATTRIB_POS is not read but VERT_BIT_GENERIC0 is read.
 
180
       * In that case we effectively need to route the data from
 
181
       * glVertexAttrib(0, val) calls to feed into the GENERIC0 input.
 
182
       */
 
183
      if ((ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_POS) == 0 &&
 
184
          (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {
 
185
         exec->vtx.inputs[16] = exec->vtx.inputs[0];
 
186
         exec->vtx.attrsz[16] = exec->vtx.attrsz[0];
 
187
         exec->vtx.attrsz[0] = 0;
 
188
      }
178
189
      break;
 
190
   default:
 
191
      assert(0);
179
192
   }
180
193
 
181
194
   /* Make all active attributes (including edgeflag) available as