i965: Fix type of gl_FragData[] dereference for FB write.

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_bo_state.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c b/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c
index fc5f77b46a7657569bec658b4e09827e2df2dca8..7eef8c1ee81e648ac3154487d0d161dd17dd4893 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bo_state.c
@@ -28,7 +28,7 @@
 #include "nouveau_context.h"
 
 static GLboolean
-nouveau_bo_marker_emit(GLcontext *ctx, struct nouveau_bo_marker *m,
+nouveau_bo_marker_emit(struct gl_context *ctx, struct nouveau_bo_marker *m,
                       uint32_t flags)
 {
        struct nouveau_channel *chan = context_chan(ctx);
@@ -126,17 +126,17 @@ void
 nouveau_bo_context_reset(struct nouveau_bo_context *bctx)
 {
        struct nouveau_bo_state *s = &to_nouveau_context(bctx->ctx)->bo;
-       int i;
-
-       for (i = 0; i < bctx->count; i++)
-               nouveau_bo_ref(NULL, &bctx->marker[i].bo);
+       int i, n = bctx->count;
 
-       s->count -= bctx->count;
+       s->count -= n;
        bctx->count = 0;
+
+       for (i = 0; i < n; i++)
+               nouveau_bo_ref(NULL, &bctx->marker[i].bo);
 }
 
 GLboolean
-nouveau_bo_state_emit(GLcontext *ctx)
+nouveau_bo_state_emit(struct gl_context *ctx)
 {
        struct nouveau_bo_state *s = &to_nouveau_context(ctx)->bo;
        int i, j;
@@ -155,7 +155,7 @@ nouveau_bo_state_emit(GLcontext *ctx)
 }
 
 void
-nouveau_bo_state_init(GLcontext *ctx)
+nouveau_bo_state_init(struct gl_context *ctx)
 {
        struct nouveau_bo_state *s = &to_nouveau_context(ctx)->bo;
        int i;
@@ -165,7 +165,7 @@ nouveau_bo_state_init(GLcontext *ctx)
 }
 
 void
-nouveau_bo_state_destroy(GLcontext *ctx)
+nouveau_bo_state_destroy(struct gl_context *ctx)
 {
        struct nouveau_bo_state *s = &to_nouveau_context(ctx)->bo;
        int i, j;