← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/failover/fo_state_emit.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/failover/fo_state_emit.c
63
63
   if (failover->dirty & FO_NEW_CLIP)
64
64
      failover->sw->set_clip_state( failover->sw, &failover->clip );
65
65
 
 
66
   if (failover->dirty & FO_NEW_SAMPLE_MASK)
 
67
      failover->sw->set_sample_mask( failover->sw, failover->sample_mask );
 
68
 
66
69
   if (failover->dirty & FO_NEW_DEPTH_STENCIL)
67
70
      failover->sw->bind_depth_stencil_alpha_state( failover->sw,
68
71
                                                    failover->depth_stencil->sw_state );
81
84
      failover->sw->bind_vs_state( failover->sw,
82
85
                                   failover->vertex_shader->sw_state );
83
86
 
 
87
   if (failover->dirty & FO_NEW_VERTEX_ELEMENT)
 
88
      failover->sw->bind_vertex_elements_state( failover->sw,
 
89
                                                failover->vertex_elements->sw_state );
 
90
 
84
91
   if (failover->dirty & FO_NEW_STIPPLE)
85
92
      failover->sw->set_polygon_stipple( failover->sw, &failover->poly_stipple );
86
93
 
102
109
                                               failover->sw_vertex_sampler_state);
103
110
   }
104
111
 
105
 
   if (failover->dirty & FO_NEW_TEXTURE) {
106
 
      failover->sw->set_fragment_sampler_textures( failover->sw, failover->num_textures, 
107
 
                                                   failover->texture );
108
 
      failover->sw->set_vertex_sampler_textures(failover->sw,
109
 
                                                failover->num_vertex_textures, 
110
 
                                                failover->vertex_textures);
 
112
   if (failover->dirty & FO_NEW_SAMPLER_VIEW) {
 
113
      struct pipe_sampler_view *fragment_views[PIPE_MAX_SAMPLERS];
 
114
      struct pipe_sampler_view *vertex_views[PIPE_MAX_VERTEX_SAMPLERS];
 
115
      uint i;
 
116
 
 
117
      for (i = 0; i < failover->num_fragment_sampler_views; i++) {
 
118
         fragment_views[i] = failover->fragment_sampler_views[i]->sw;
 
119
      }
 
120
      failover->sw->set_fragment_sampler_views(failover->sw,
 
121
                                               failover->num_fragment_sampler_views,
 
122
                                               fragment_views);
 
123
 
 
124
      for (i = 0; i < failover->num_vertex_sampler_views; i++) {
 
125
         vertex_views[i] = failover->vertex_sampler_views[i]->sw;
 
126
      }
 
127
      failover->sw->set_vertex_sampler_views(failover->sw,
 
128
                                             failover->num_vertex_sampler_views,
 
129
                                             vertex_views);
111
130
   }
112
131
 
113
132
   if (failover->dirty & FO_NEW_VERTEX_BUFFER) {
116
135
                                        failover->vertex_buffers );
117
136
   }
118
137
 
119
 
   if (failover->dirty & FO_NEW_VERTEX_ELEMENT) {
120
 
      failover->sw->set_vertex_elements( failover->sw,
121
 
                                         failover->num_vertex_elements,
122
 
                                         failover->vertex_elements );
 
138
   if (failover->dirty & FO_NEW_INDEX_BUFFER) {
 
139
      failover->sw->set_index_buffer( failover->sw,
 
140
                                      &failover->index_buffer );
123
141
   }
124
142
 
125
143
   failover->dirty = 0;