← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/i965/brw_curbe.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/i965/brw_curbe.c
48
48
 */
49
49
static void calculate_curbe_offsets( struct brw_context *brw )
50
50
{
 
51
   GLcontext *ctx = &brw->intel.ctx;
51
52
   /* CACHE_NEW_WM_PROG */
52
53
   GLuint nr_fp_regs = (brw->wm.prog_data->nr_params + 15) / 16;
53
54
   
58
59
   GLuint total_regs;
59
60
 
60
61
   /* _NEW_TRANSFORM */
61
 
   if (brw->attribs.Transform->ClipPlanesEnabled) {
62
 
      GLuint nr_planes = 6 + brw_count_bits(brw->attribs.Transform->ClipPlanesEnabled);
 
62
   if (ctx->Transform.ClipPlanesEnabled) {
 
63
      GLuint nr_planes = 6 + brw_count_bits(ctx->Transform.ClipPlanesEnabled);
63
64
      nr_clip_regs = (nr_planes * 4 + 15) / 16;
64
65
   }
65
66
 
233
234
       */
234
235
      assert(MAX_CLIP_PLANES == 6);
235
236
      for (j = 0; j < MAX_CLIP_PLANES; j++) {
236
 
         if (brw->attribs.Transform->ClipPlanesEnabled & (1<<j)) {
237
 
            buf[offset + i * 4 + 0] = brw->attribs.Transform->_ClipUserPlane[j][0];
238
 
            buf[offset + i * 4 + 1] = brw->attribs.Transform->_ClipUserPlane[j][1];
239
 
            buf[offset + i * 4 + 2] = brw->attribs.Transform->_ClipUserPlane[j][2];
240
 
            buf[offset + i * 4 + 3] = brw->attribs.Transform->_ClipUserPlane[j][3];
 
237
         if (ctx->Transform.ClipPlanesEnabled & (1<<j)) {
 
238
            buf[offset + i * 4 + 0] = ctx->Transform._ClipUserPlane[j][0];
 
239
            buf[offset + i * 4 + 1] = ctx->Transform._ClipUserPlane[j][1];
 
240
            buf[offset + i * 4 + 2] = ctx->Transform._ClipUserPlane[j][2];
 
241
            buf[offset + i * 4 + 3] = ctx->Transform._ClipUserPlane[j][3];
241
242
            i++;
242
243
         }
243
244
      }