← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/r300/r300_render.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/r300/r300_render.c
347
347
static int r300Fallback(GLcontext * ctx)
348
348
{
349
349
        r300ContextPtr r300 = R300_CONTEXT(ctx);
 
350
        const unsigned back = ctx->Stencil._BackFace;
 
351
 
350
352
        /* Do we need to use new-style shaders?
351
353
         * Also is there a better way to do this? */
352
354
        if (r300->radeon.radeonScreen->chip_family >= CHIP_FAMILY_RV515) {
371
373
 
372
374
        FALLBACK_IF(ctx->RenderMode != GL_RENDER);
373
375
 
374
 
        FALLBACK_IF(ctx->Stencil._TestTwoSide
375
 
                    && (ctx->Stencil.Ref[0] != ctx->Stencil.Ref[1]
376
 
                        || ctx->Stencil.ValueMask[0] !=
377
 
                        ctx->Stencil.ValueMask[1]
378
 
                        || ctx->Stencil.WriteMask[0] !=
379
 
                        ctx->Stencil.WriteMask[1]));
 
376
        /* If GL_EXT_stencil_two_side is disabled, this fallback check can
 
377
         * be removed.
 
378
         */
 
379
        FALLBACK_IF(ctx->Stencil.Ref[0] != ctx->Stencil.Ref[back]
 
380
                    || ctx->Stencil.ValueMask[0] !=
 
381
                    ctx->Stencil.ValueMask[back]
 
382
                    || ctx->Stencil.WriteMask[0] !=
 
383
                    ctx->Stencil.WriteMask[back]);
380
384
 
381
385
        if (ctx->Extensions.NV_point_sprite || ctx->Extensions.ARB_point_sprite)
382
386
                FALLBACK_IF(ctx->Point.PointSprite);