summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/nouveau/nv30_state.c
diff options
context:
space:
mode:
authorBen Skeggs <darktama@iinet.net.au>2006-12-24 00:50:13 +1100
committerBen Skeggs <darktama@iinet.net.au>2006-12-24 00:50:13 +1100
commitd79323bd42864fc4768874f56734bad9dc6d8a9c (patch)
tree31b2adafef5082f137df54c9ac2442136cce9d83 /src/mesa/drivers/dri/nouveau/nv30_state.c
parentf54c725497cac19294e1465413d21a9416d4245f (diff)
nouveau: Kill some compile warnings.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv30_state.c')
-rw-r--r--src/mesa/drivers/dri/nouveau/nv30_state.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv30_state.c b/src/mesa/drivers/dri/nouveau/nv30_state.c
index 7ccf5f9875..45befd0e77 100644
--- a/src/mesa/drivers/dri/nouveau/nv30_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv30_state.c
@@ -573,7 +573,6 @@ void (*RenderMode)(GLcontext *ctx, GLenum mode );
static void nv30Scissor(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
{
nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
- nouveau_renderbuffer *nrb;
/* There's no scissor enable bit, so adjust the scissor to cover the
* maximum draw buffer bounds
@@ -677,7 +676,6 @@ static void nv30TextureMatrix(GLcontext *ctx, GLuint unit, const GLmatrix *mat)
static void nv30WindowMoved(nouveauContextPtr nmesa)
{
GLcontext *ctx = nmesa->glCtx;
- nouveau_renderbuffer *nrb;
GLfloat *v = nmesa->viewport.m;
GLuint w = ctx->Viewport.Width;
GLuint h = ctx->Viewport.Height;
@@ -759,11 +757,10 @@ static GLboolean nv30BindBuffers(nouveauContextPtr nmesa, int num_color,
nouveau_renderbuffer **color,
nouveau_renderbuffer *depth)
{
- nouveau_renderbuffer *nrb;
GLuint x, y, w, h;
- w = nrb->mesa.Width;
- h = nrb->mesa.Height;
+ w = color[0]->mesa.Width;
+ h = color[0]->mesa.Height;
x = nmesa->drawX;
y = nmesa->drawY;