← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/i965/brw_draw.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/i965/brw_draw.c
142
142
 */
143
143
static int
144
144
try_draw_range_elements(struct brw_context *brw,
145
 
                        struct pipe_buffer *index_buffer,
 
145
                        boolean indexed,
146
146
                        unsigned hw_prim, 
147
147
                        unsigned start, unsigned count)
148
148
{
165
165
   if (ret)
166
166
      return ret;
167
167
   
168
 
   ret = brw_emit_prim(brw, start, count, index_buffer != NULL, hw_prim);
 
168
   ret = brw_emit_prim(brw, start, count, indexed, hw_prim);
169
169
   if (ret)
170
170
      return ret;
171
171
 
177
177
 
178
178
 
179
179
static void
180
 
brw_draw_range_elements(struct pipe_context *pipe,
181
 
                        struct pipe_buffer *index_buffer,
182
 
                        unsigned index_size,
183
 
                        unsigned min_index,
184
 
                        unsigned max_index,
185
 
                        unsigned mode, unsigned start, unsigned count)
 
180
brw_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
186
181
{
187
182
   struct brw_context *brw = brw_context(pipe);
188
183
   int ret;
189
184
   uint32_t hw_prim;
190
185
 
191
 
   hw_prim = brw_set_prim(brw, mode);
 
186
   hw_prim = brw_set_prim(brw, info->mode);
192
187
 
193
188
   if (BRW_DEBUG & DEBUG_PRIMS)
194
189
      debug_printf("PRIM: %s start %d count %d index_buffer %p\n",
195
 
                   u_prim_name(mode), start, count, (void *)index_buffer);
196
 
 
197
 
   /* Potentially trigger upload of new index buffer.
198
 
    *
199
 
    * XXX: do we need to go through state validation to achieve this?
200
 
    * Could just call upload code directly.
201
 
    */
202
 
   if (brw->curr.index_buffer != index_buffer ||
203
 
       brw->curr.index_size != index_size) {
204
 
      pipe_buffer_reference( &brw->curr.index_buffer, index_buffer );
205
 
      brw->curr.index_size = index_size;
206
 
      brw->state.dirty.mesa |= PIPE_NEW_INDEX_BUFFER;
207
 
   }
208
 
 
209
 
   /* XXX: do we really care?
210
 
    */
211
 
   if (brw->curr.min_index != min_index ||
212
 
       brw->curr.max_index != max_index) 
 
190
                   u_prim_name(info->mode), info->start, info->count,
 
191
                   (void *) brw->curr.index_buffer);
 
192
 
 
193
   assert(info->index_bias == 0);
 
194
 
 
195
   /* Potentially trigger upload of new index buffer range.
 
196
    * XXX: do we really care?
 
197
    */
 
198
   if (brw->curr.min_index != info->min_index ||
 
199
       brw->curr.max_index != info->max_index) 
213
200
   { 
214
 
      brw->curr.min_index = min_index;
215
 
      brw->curr.max_index = max_index;
 
201
      brw->curr.min_index = info->min_index;
 
202
      brw->curr.max_index = info->max_index;
216
203
      brw->state.dirty.mesa |= PIPE_NEW_INDEX_RANGE;
217
204
   }
218
205
 
219
206
 
220
207
   /* Make a first attempt at drawing:
221
208
    */
222
 
   ret = try_draw_range_elements(brw, index_buffer, hw_prim, start, count );
 
209
   ret = try_draw_range_elements(brw, info->indexed,
 
210
         hw_prim, info->start, info->count);
223
211
 
224
212
   /* Otherwise, flush and retry:
225
213
    */
226
214
   if (ret != 0) {
227
215
      brw_context_flush( brw );
228
 
      ret = try_draw_range_elements(brw, index_buffer, hw_prim, start, count );
 
216
      ret = try_draw_range_elements(brw, info->indexed,
 
217
            hw_prim, info->start, info->count);
229
218
      assert(ret == 0);
230
219
   }
231
220
}
232
221
 
233
 
static void
234
 
brw_draw_elements(struct pipe_context *pipe,
235
 
                  struct pipe_buffer *index_buffer,
236
 
                  unsigned index_size,
237
 
                  unsigned mode, 
238
 
                  unsigned start, unsigned count)
239
 
{
240
 
   brw_draw_range_elements( pipe, index_buffer,
241
 
                            index_size,
242
 
                            0, 0xffffffff,
243
 
                            mode, 
244
 
                            start, count );
245
 
}
246
 
 
247
 
static void
248
 
brw_draw_arrays(struct pipe_context *pipe, unsigned mode,
249
 
                     unsigned start, unsigned count)
250
 
{
251
 
   brw_draw_elements(pipe, NULL, 0, mode, start, count);
252
 
}
253
 
 
254
 
 
255
222
 
256
223
boolean brw_draw_init( struct brw_context *brw )
257
224
{
258
225
   /* Register our drawing function: 
259
226
    */
260
 
   brw->base.draw_arrays = brw_draw_arrays;
261
 
   brw->base.draw_elements = brw_draw_elements;
262
 
   brw->base.draw_range_elements = brw_draw_range_elements;
 
227
   brw->base.draw_vbo = brw_draw_vbo;
263
228
 
264
229
   /* Create helpers for uploading data in user buffers:
265
230
    */
266
 
   brw->vb.upload_vertex = u_upload_create( brw->base.screen,
 
231
   brw->vb.upload_vertex = u_upload_create( &brw->base,
267
232
                                            128 * 1024,
268
233
                                            64,
269
 
                                            PIPE_BUFFER_USAGE_VERTEX );
 
234
                                            PIPE_BIND_VERTEX_BUFFER );
270
235
   if (brw->vb.upload_vertex == NULL)
271
236
      return FALSE;
272
237
 
273
 
   brw->vb.upload_index = u_upload_create( brw->base.screen,
 
238
   brw->vb.upload_index = u_upload_create( &brw->base,
274
239
                                           32 * 1024,
275
240
                                           64,
276
 
                                           PIPE_BUFFER_USAGE_INDEX );
 
241
                                           PIPE_BIND_INDEX_BUFFER );
277
242
   if (brw->vb.upload_index == NULL)
278
243
      return FALSE;
279
244