diff options
| author | Christoph Bumiller <[email protected]> | 2010-09-15 17:34:40 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2010-09-15 17:34:40 +0200 |
| commit | 26fe16a99b762d27e8f499c2e02116e9c4b7a6bb (patch) | |
| tree | 153d15f0e24f349d2ba6ec736ed5e4b8b961e824 /src/gallium/drivers/nv50/nv50_push.c | |
| parent | 59ca1ae84b2c15c8a94211da158f563e45560bcd (diff) | |
| parent | 84d170bbcef8e26017ac8e2f3bacbaeb20f889d3 (diff) | |
Merge remote branch 'origin/nv50-compiler'
Conflicts:
src/gallium/drivers/nouveau/nouveau_class.h
src/gallium/drivers/nv50/nv50_screen.c
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_push.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv50_push.c b/src/gallium/drivers/nv50/nv50_push.c index 57c0010bf4d..380f69406a2 100644 --- a/src/gallium/drivers/nv50/nv50_push.c +++ b/src/gallium/drivers/nv50/nv50_push.c @@ -228,7 +228,7 @@ nv50_push_elements_instanced(struct pipe_context *pipe, ctx.idxbuf = NULL; ctx.vtx_size = 0; ctx.edgeflag = 0.5f; - ctx.edgeflag_attr = nv50->vertprog->cfg.edgeflag_in; + ctx.edgeflag_attr = nv50->vertprog->vp.edgeflag; /* map vertex buffers, determine vertex size */ for (i = 0; i < nv50->vtxelt->num_elements; i++) { |