← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring-proposed

« back to all changes in this revision

Viewing changes to src/gallium/auxiliary/draw/draw_context.h

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2011-06-19 21:26:00 UTC
  • mfrom: (1.6.1 upstream) (3.3.18 sid)
  • mto: (3.3.20 sid)
  • mto: This revision was merged to the branch mainline in revision 145.
  • Revision ID: james.westby@ubuntu.com-20110619212600-rleaapdmnbtstekb
Tags: 7.11~0-2
Thank you sbuild for giving a green light when that's not actually the
case. Fix missing Pre-Depends for the libegl1-mesa-drivers package
(multiarch-support).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/auxiliary/draw/draw_context.h
123
123
draw_set_mapped_texture(struct draw_context *draw,
124
124
                        unsigned sampler_idx,
125
125
                        uint32_t width, uint32_t height, uint32_t depth,
126
 
                        uint32_t last_level,
 
126
                        uint32_t first_level, uint32_t last_level,
127
127
                        uint32_t row_stride[PIPE_MAX_TEXTURE_LEVELS],
128
128
                        uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS],
129
129
                        const void *data[PIPE_MAX_TEXTURE_LEVELS]);
243
243
                           unsigned prim );
244
244
 
245
245
static INLINE int
246
 
draw_get_shader_param(unsigned shader, enum pipe_cap param)
 
246
draw_get_shader_param(unsigned shader, enum pipe_shader_cap param)
247
247
{
248
248
   switch(shader) {
249
249
   case PIPE_SHADER_VERTEX: