← Back to branch summary

~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/mesa/main/ffvertex_prog.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
https://launchpad.net/bugs/631413
https://launchpad.net/bugs/628930
https://launchpad.net/bugs/628727
https://launchpad.net/bugs/596292
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/630315
https://launchpad.net/bugs/613694
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/578619
https://launchpad.net/bugs/626943
https://launchpad.net/bugs/610541
https://launchpad.net/bugs/601052
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/main/ffvertex_prog.c
38
38
#include "main/macros.h"
39
39
#include "main/enums.h"
40
40
#include "main/ffvertex_prog.h"
41
 
#include "shader/program.h"
42
 
#include "shader/prog_cache.h"
43
 
#include "shader/prog_instruction.h"
44
 
#include "shader/prog_parameter.h"
45
 
#include "shader/prog_print.h"
46
 
#include "shader/prog_statevars.h"
 
41
#include "program/program.h"
 
42
#include "program/prog_cache.h"
 
43
#include "program/prog_instruction.h"
 
44
#include "program/prog_parameter.h"
 
45
#include "program/prog_print.h"
 
46
#include "program/prog_statevars.h"
47
47
 
48
48
 
49
49
/** Max of number of lights and texture coord units */
75
75
      unsigned light_attenuated:1;
76
76
      unsigned texunit_really_enabled:1;
77
77
      unsigned texmat_enabled:1;
 
78
      unsigned coord_replace:1;
78
79
      unsigned texgen_enabled:4;
79
80
      unsigned texgen_mode0:4;
80
81
      unsigned texgen_mode1:4;
225
226
      if (texUnit->_ReallyEnabled)
226
227
         key->unit[i].texunit_really_enabled = 1;
227
228
 
 
229
      if (ctx->Point.PointSprite)
 
230
         if (ctx->Point.CoordReplace[i])
 
231
            key->unit[i].coord_replace = 1;
 
232
 
228
233
      if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))
229
234
         key->unit[i].texmat_enabled = 1;
230
235
 
1385
1390
      if (!(p->state->fragprog_inputs_read & FRAG_BIT_TEX(i)))
1386
1391
         continue;
1387
1392
 
 
1393
      if (p->state->unit[i].coord_replace)
 
1394
         continue;
 
1395
 
1388
1396
      if (p->state->unit[i].texgen_enabled ||
1389
1397
          p->state->unit[i].texmat_enabled) {
1390
1398