← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gallium/drivers/nvfx/nvfx_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/drivers/nvfx/nvfx_context.h
18
18
 
19
19
#include "nouveau/nouveau_winsys.h"
20
20
#include "nouveau/nouveau_gldefs.h"
 
21
#include "nouveau/nouveau_resource.h"
21
22
#include "nv30-40_3d.xml.h"
22
23
#include "nvfx_state.h"
23
24
 
339
340
/* nvfx_push.c */
340
341
extern void nvfx_push_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info);
341
342
 
342
 
/* must WAIT_RING(chan, ncomp + 1) or equivalent beforehand! */
343
 
static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan, unsigned attrib, const float* v, unsigned ncomp)
 
343
static inline void nvfx_emit_vtx_attr(struct nouveau_channel* chan,
 
344
                struct nouveau_grobj *eng3d, unsigned attrib, const float* v,
 
345
                unsigned ncomp)
344
346
{
345
347
        switch (ncomp) {
346
348
        case 4:
347
 
                OUT_RING(chan, RING_3D(NV30_3D_VTX_ATTR_4F_X(attrib), 4));
 
349
                BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_4F_X(attrib), 4);
348
350
                OUT_RING(chan, fui(v[0]));
349
351
                OUT_RING(chan, fui(v[1]));
350
352
                OUT_RING(chan,  fui(v[2]));
351
353
                OUT_RING(chan,  fui(v[3]));
352
354
                break;
353
355
        case 3:
354
 
                OUT_RING(chan, RING_3D(NV30_3D_VTX_ATTR_3F_X(attrib), 3));
 
356
                BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_3F_X(attrib), 3);
355
357
                OUT_RING(chan,  fui(v[0]));
356
358
                OUT_RING(chan,  fui(v[1]));
357
359
                OUT_RING(chan,  fui(v[2]));
358
360
                break;
359
361
        case 2:
360
 
                OUT_RING(chan, RING_3D(NV30_3D_VTX_ATTR_2F_X(attrib), 2));
 
362
                BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_2F_X(attrib), 2);
361
363
                OUT_RING(chan,  fui(v[0]));
362
364
                OUT_RING(chan,  fui(v[1]));
363
365
                break;
364
366
        case 1:
365
 
                OUT_RING(chan, RING_3D(NV30_3D_VTX_ATTR_1F(attrib), 1));
 
367
                BEGIN_RING(chan, eng3d, NV30_3D_VTX_ATTR_1F(attrib), 1);
366
368
                OUT_RING(chan,  fui(v[0]));
367
369
                break;
368
370
        }