← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/nv30/nv30_state_stipple.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/gallium/drivers/nv30/nv30_state_stipple.c
1
 
#include "nv30_context.h"
2
 
 
3
 
static boolean
4
 
nv30_state_stipple_validate(struct nv30_context *nv30)
5
 
{
6
 
        struct pipe_rasterizer_state *rast = &nv30->rasterizer->pipe;
7
 
        struct nouveau_grobj *rankine = nv30->screen->rankine;
8
 
        struct nouveau_stateobj *so;
9
 
 
10
 
        if (nv30->state.hw[NV30_STATE_STIPPLE] &&
11
 
           (rast->poly_stipple_enable == 0 && nv30->state.stipple_enabled == 0))
12
 
                return FALSE;
13
 
 
14
 
        if (rast->poly_stipple_enable) {
15
 
                unsigned i;
16
 
 
17
 
                so = so_new(2, 33, 0);
18
 
                so_method(so, rankine, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
19
 
                so_data  (so, 1);
20
 
                so_method(so, rankine, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
21
 
                for (i = 0; i < 32; i++)
22
 
                        so_data(so, nv30->stipple[i]);
23
 
        } else {
24
 
                so = so_new(1, 1, 0);
25
 
                so_method(so, rankine, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
26
 
                so_data  (so, 0);
27
 
        }
28
 
 
29
 
        so_ref(so, &nv30->state.hw[NV30_STATE_STIPPLE]);
30
 
        so_ref(NULL, &so);
31
 
        return TRUE;
32
 
}
33
 
 
34
 
struct nv30_state_entry nv30_state_stipple = {
35
 
        .validate = nv30_state_stipple_validate,
36
 
        .dirty = {
37
 
                .pipe = NV30_NEW_STIPPLE | NV30_NEW_RAST,
38
 
                .hw = NV30_STATE_STIPPLE,
39
 
        }
40
 
};