← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/nv40/nv40_state_scissor.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/nv40/nv40_state_scissor.c
1
 
#include "nv40_context.h"
2
 
 
3
 
static boolean
4
 
nv40_state_scissor_validate(struct nv40_context *nv40)
5
 
{
6
 
        struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
7
 
        struct pipe_scissor_state *s = &nv40->scissor;
8
 
        struct nouveau_stateobj *so;
9
 
 
10
 
        if (nv40->state.hw[NV40_STATE_SCISSOR] &&
11
 
            (rast->scissor == 0 && nv40->state.scissor_enabled == 0))
12
 
                return FALSE;
13
 
        nv40->state.scissor_enabled = rast->scissor;
14
 
 
15
 
        so = so_new(1, 2, 0);
16
 
        so_method(so, nv40->screen->curie, NV40TCL_SCISSOR_HORIZ, 2);
17
 
        if (nv40->state.scissor_enabled) {
18
 
                so_data  (so, ((s->maxx - s->minx) << 16) | s->minx);
19
 
                so_data  (so, ((s->maxy - s->miny) << 16) | s->miny);
20
 
        } else {
21
 
                so_data  (so, 4096 << 16);
22
 
                so_data  (so, 4096 << 16);
23
 
        }
24
 
 
25
 
        so_ref(so, &nv40->state.hw[NV40_STATE_SCISSOR]);
26
 
        so_ref(NULL, &so);
27
 
        return TRUE;
28
 
}
29
 
 
30
 
struct nv40_state_entry nv40_state_scissor = {
31
 
        .validate = nv40_state_scissor_validate,
32
 
        .dirty = {
33
 
                .pipe = NV40_NEW_SCISSOR | NV40_NEW_RAST,
34
 
                .hw = NV40_STATE_SCISSOR
35
 
        }
36
 
};