diff options
Diffstat (limited to 'src/mesa/pipe')
| -rw-r--r-- | src/mesa/pipe/nouveau/nouveau_winsys.h | 6 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_fragprog.c | 1 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_miptree.c | 1 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_region.c | 6 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_state_tex.c | 1 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_vbo.c | 1 |
6 files changed, 6 insertions, 10 deletions
diff --git a/src/mesa/pipe/nouveau/nouveau_winsys.h b/src/mesa/pipe/nouveau/nouveau_winsys.h index 28f17cdc8f..1dc15f93ec 100644 --- a/src/mesa/pipe/nouveau/nouveau_winsys.h +++ b/src/mesa/pipe/nouveau/nouveau_winsys.h @@ -53,13 +53,13 @@ struct nouveau_winsys { int (*notifier_wait)(struct nouveau_notifier *, int id, int status, int timeout); - int (*region_copy)(struct nouveau_context *, struct pipe_region *, + int (*region_copy)(struct nouveau_winsys *, struct pipe_region *, unsigned, unsigned, unsigned, struct pipe_region *, unsigned, unsigned, unsigned, unsigned, unsigned); - int (*region_fill)(struct nouveau_context *, struct pipe_region *, + int (*region_fill)(struct nouveau_winsys *, struct pipe_region *, unsigned, unsigned, unsigned, unsigned, unsigned, unsigned); - int (*region_data)(struct nouveau_context *, struct pipe_region *, + int (*region_data)(struct nouveau_winsys *, struct pipe_region *, unsigned, unsigned, unsigned, const void *, unsigned, unsigned, unsigned, unsigned, unsigned); }; diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/mesa/pipe/nv40/nv40_fragprog.c index ec8cac676e..8f3eeb1f48 100644 --- a/src/mesa/pipe/nv40/nv40_fragprog.c +++ b/src/mesa/pipe/nv40/nv40_fragprog.c @@ -620,7 +620,6 @@ nv40_fragprog_translate(struct nv40_context *nv40, { struct tgsi_parse_context parse; struct nv40_fpc *fpc = NULL; - int i; fpc = calloc(1, sizeof(struct nv40_fpc)); if (!fpc) diff --git a/src/mesa/pipe/nv40/nv40_miptree.c b/src/mesa/pipe/nv40/nv40_miptree.c index 15639f01e9..f5c4206f40 100644 --- a/src/mesa/pipe/nv40/nv40_miptree.c +++ b/src/mesa/pipe/nv40/nv40_miptree.c @@ -7,7 +7,6 @@ boolean nv40_miptree_layout(struct pipe_context *pipe, struct pipe_mipmap_tree *mt) { - struct nv40_context *nv40 = (struct nv40_context *)pipe; boolean swizzled = FALSE; uint width = mt->width0, height = mt->height0, depth = mt->depth0; uint offset; diff --git a/src/mesa/pipe/nv40/nv40_region.c b/src/mesa/pipe/nv40/nv40_region.c index f62bf89d18..572b82bca3 100644 --- a/src/mesa/pipe/nv40/nv40_region.c +++ b/src/mesa/pipe/nv40/nv40_region.c @@ -42,7 +42,7 @@ nv40_region_data(struct pipe_context *pipe, struct nv40_context *nv40 = (struct nv40_context *)pipe; struct nouveau_winsys *nvws = nv40->nvws; - nvws->region_data(nvws->nv, dst, dst_offset, dstx, dsty, + nvws->region_data(nvws, dst, dst_offset, dstx, dsty, src, src_pitch, srcx, srcy, width, height); } @@ -56,7 +56,7 @@ nv40_region_copy(struct pipe_context *pipe, struct pipe_region *dst, struct nv40_context *nv40 = (struct nv40_context *)pipe; struct nouveau_winsys *nvws = nv40->nvws; - nvws->region_copy(nvws->nv, dst, dst_offset, dstx, dsty, + nvws->region_copy(nvws, dst, dst_offset, dstx, dsty, src, src_offset, srcx, srcy, width, height); } @@ -69,7 +69,7 @@ nv40_region_fill(struct pipe_context *pipe, struct nv40_context *nv40 = (struct nv40_context *)pipe; struct nouveau_winsys *nvws = nv40->nvws; - nvws->region_fill(nvws->nv, dst, dst_offset, dstx, dsty, + nvws->region_fill(nvws, dst, dst_offset, dstx, dsty, width, height, value); } diff --git a/src/mesa/pipe/nv40/nv40_state_tex.c b/src/mesa/pipe/nv40/nv40_state_tex.c index bd779df9b3..6902b41ba7 100644 --- a/src/mesa/pipe/nv40/nv40_state_tex.c +++ b/src/mesa/pipe/nv40/nv40_state_tex.c @@ -53,7 +53,6 @@ nv40_tex_format(uint pipe_format) static void nv40_tex_unit_enable(struct nv40_context *nv40, int unit) { - struct nouveau_winsys *nvws = nv40->nvws; struct nv40_sampler_state *ps = nv40->tex_sampler[unit]; struct pipe_mipmap_tree *mt = nv40->tex_miptree[unit]; struct nv40_texture_format *tf; diff --git a/src/mesa/pipe/nv40/nv40_vbo.c b/src/mesa/pipe/nv40/nv40_vbo.c index 2da0001b28..cc71fb99de 100644 --- a/src/mesa/pipe/nv40/nv40_vbo.c +++ b/src/mesa/pipe/nv40/nv40_vbo.c @@ -175,7 +175,6 @@ nv40_vbo_format_to_ncomp(uint format) void nv40_vbo_arrays_update(struct nv40_context *nv40) { - struct nouveau_winsys *nvws = nv40->nvws; struct nv40_vertex_program *vp = nv40->vertprog.active; uint32_t inputs, vtxfmt[16]; int hw, num_hw; |