diff options
| author | Christoph Bumiller <[email protected]> | 2012-04-06 15:41:55 +0200 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2012-04-14 02:56:33 +1000 |
| commit | 6d1cdec3ba151168bfc3aef222fba6265dfb41fb (patch) | |
| tree | c8c013eaa14e1b7463b6b3f39221524d901370f6 /src/gallium/drivers/nv50/nv50_program.c | |
| parent | 3c7872f35f4ae439082d413ab31333cf99be7e91 (diff) | |
nouveau: switch to libdrm_nouveau-2.0
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_program.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_program.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c index c141a91eec2..776cecaeb7e 100644 --- a/src/gallium/drivers/nv50/nv50_program.c +++ b/src/gallium/drivers/nv50/nv50_program.c @@ -489,7 +489,8 @@ nv50_fragprog_prepare(struct nv50_translation_info *ti) ++nintp; } - p->fp.colors = 4 << NV50_3D_MAP_SEMANTIC_0_FFC0_ID__SHIFT; /* after HPOS */ + /* after HPOS */ + p->fp.colors = 4 << NV50_3D_SEMANTIC_COLOR_FFC0_ID__SHIFT; for (i = 0; i < p->in_nr; ++i) { int j = p->in[i].id; @@ -680,8 +681,8 @@ nv50_program_destroy(struct nv50_context *nv50, struct nv50_program *p) const struct pipe_shader_state pipe = p->pipe; const ubyte type = p->type; - if (p->res) - nouveau_resource_free(&p->res); + if (p->mem) + nouveau_heap_free(&p->mem); if (p->code) FREE(p->code); |