diff options
| author | Zack Rusin <[email protected]> | 2009-01-26 14:49:54 -0500 |
|---|---|---|
| committer | Zack Rusin <[email protected]> | 2009-01-27 12:20:25 -0500 |
| commit | 2299f21f8da816fc4588492965e7dac422da1a96 (patch) | |
| tree | 5e67daeecc501aef7d0a74d03d9e0690a6af31d3 /src/gallium/drivers/nv30 | |
| parent | a7e72231e3c76a9410d192441da309002ea6422d (diff) | |
gallium: standardize api on the prefix "nr"
Diffstat (limited to 'src/gallium/drivers/nv30')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_state_emit.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_state_fb.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv30/nv30_state_emit.c b/src/gallium/drivers/nv30/nv30_state_emit.c index 9480695d6e5..f77b08ff695 100644 --- a/src/gallium/drivers/nv30/nv30_state_emit.c +++ b/src/gallium/drivers/nv30/nv30_state_emit.c @@ -24,7 +24,7 @@ nv30_state_do_validate(struct nv30_context *nv30, const struct pipe_framebuffer_state *fb = &nv30->framebuffer; unsigned i; - for (i = 0; i < fb->num_cbufs; i++) + for (i = 0; i < fb->nr_cbufs; i++) fb->cbufs[i]->status = PIPE_SURFACE_STATUS_DEFINED; if (fb->zsbuf) fb->zsbuf->status = PIPE_SURFACE_STATUS_DEFINED; diff --git a/src/gallium/drivers/nv30/nv30_state_fb.c b/src/gallium/drivers/nv30/nv30_state_fb.c index 73bdf7e56c5..8536acc5701 100644 --- a/src/gallium/drivers/nv30/nv30_state_fb.c +++ b/src/gallium/drivers/nv30/nv30_state_fb.c @@ -14,7 +14,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30) unsigned h = fb->height; rt_enable = 0; - for (i = 0; i < fb->num_cbufs; i++) { + for (i = 0; i < fb->nr_cbufs; i++) { if (colour_format) { assert(colour_format == fb->cbufs[i]->format); } else { @@ -34,7 +34,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30) if (!(rt[0]->texture->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR)) { assert(!(fb->width & (fb->width - 1)) && !(fb->height & (fb->height - 1))); - for (i = 1; i < fb->num_cbufs; i++) + for (i = 1; i < fb->nr_cbufs; i++) assert(!(rt[i]->texture->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR)); /* FIXME: NV34TCL_RT_FORMAT_LOG2_[WIDTH/HEIGHT] */ |