diff options
| author | Francisco Jerez <[email protected]> | 2010-10-10 01:45:23 +0200 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2010-10-10 01:48:01 +0200 |
| commit | 35a1893fd1993932a428f5f83051383d51c8135e (patch) | |
| tree | c5320a03ff5221253c7de9553a999ce5b778eece /src/mesa/drivers/dri | |
| parent | 307df6a858dcab1bc10f3f52d9968acb3ea6d74f (diff) | |
dri/nouveau: Minor cleanup.
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_render.c | 20 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv20_render.c | 20 |
4 files changed, 22 insertions, 23 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c index 1121d2d3d39..6369e8d7b14 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c @@ -353,6 +353,5 @@ nouveau_validate_framebuffer(GLcontext *ctx) validate_framebuffer(dri_ctx, dri_read, &dri_ctx->dri2.read_stamp); - if (nouveau_next_dirty_state(ctx) >= 0) - nouveau_state_emit(ctx); + nouveau_state_emit(ctx); } diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c index 41723ff190f..f0e27441947 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_context.c +++ b/src/mesa/drivers/dri/nouveau/nv10_context.c @@ -305,7 +305,7 @@ nv10_hwctx_init(GLcontext *ctx) OUT_RING(chan, 1); BEGIN_RING(chan, celsius, NV10TCL_DEPTH_RANGE_NEAR, 2); - OUT_RING(chan, 0.0); + OUT_RINGf(chan, 0.0); OUT_RINGf(chan, 16777216.0); FIRE_RING(chan); diff --git a/src/mesa/drivers/dri/nouveau/nv10_render.c b/src/mesa/drivers/dri/nouveau/nv10_render.c index 54245ea6bab..e4c51f804cf 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_render.c +++ b/src/mesa/drivers/dri/nouveau/nv10_render.c @@ -167,35 +167,35 @@ nv10_render_bind_vertices(GLcontext *ctx) #define BATCH_BEGIN(prim) \ BEGIN_RING(chan, celsius, NV10TCL_VERTEX_BUFFER_BEGIN_END, 1); \ - OUT_RING(chan, prim); + OUT_RING(chan, prim) #define BATCH_END() \ BEGIN_RING(chan, celsius, NV10TCL_VERTEX_BUFFER_BEGIN_END, 1); \ - OUT_RING(chan, 0); + OUT_RING(chan, 0) #define MAX_PACKET 0x400 #define MAX_OUT_L 0x100 #define BATCH_PACKET_L(n) \ - BEGIN_RING_NI(chan, celsius, NV10TCL_VERTEX_BUFFER_DRAW_ARRAYS, n); + BEGIN_RING_NI(chan, celsius, NV10TCL_VERTEX_BUFFER_DRAW_ARRAYS, n) #define BATCH_OUT_L(i, n) \ - OUT_RING(chan, ((n) - 1) << 24 | (i)); + OUT_RING(chan, ((n) - 1) << 24 | (i)) #define MAX_OUT_I16 0x2 #define BATCH_PACKET_I16(n) \ - BEGIN_RING_NI(chan, celsius, NV10TCL_VB_ELEMENT_U16, n); + BEGIN_RING_NI(chan, celsius, NV10TCL_VB_ELEMENT_U16, n) #define BATCH_OUT_I16(i0, i1) \ - OUT_RING(chan, (i1) << 16 | (i0)); + OUT_RING(chan, (i1) << 16 | (i0)) #define MAX_OUT_I32 0x1 #define BATCH_PACKET_I32(n) \ - BEGIN_RING_NI(chan, celsius, NV10TCL_VB_ELEMENT_U32, n); + BEGIN_RING_NI(chan, celsius, NV10TCL_VB_ELEMENT_U32, n) #define BATCH_OUT_I32(i) \ - OUT_RING(chan, i); + OUT_RING(chan, i) #define IMM_PACKET(m, n) \ - BEGIN_RING(chan, celsius, m, n); + BEGIN_RING(chan, celsius, m, n) #define IMM_OUT(x) \ - OUT_RINGf(chan, x); + OUT_RINGf(chan, x) #define TAG(x) nv10_##x #include "nouveau_render_t.c" diff --git a/src/mesa/drivers/dri/nouveau/nv20_render.c b/src/mesa/drivers/dri/nouveau/nv20_render.c index a696ac107f5..d7c3e747f02 100644 --- a/src/mesa/drivers/dri/nouveau/nv20_render.c +++ b/src/mesa/drivers/dri/nouveau/nv20_render.c @@ -191,35 +191,35 @@ nv20_render_bind_vertices(GLcontext *ctx) #define BATCH_BEGIN(prim) \ BEGIN_RING(chan, kelvin, NV20TCL_VERTEX_BEGIN_END, 1); \ - OUT_RING(chan, prim); + OUT_RING(chan, prim) #define BATCH_END() \ BEGIN_RING(chan, kelvin, NV20TCL_VERTEX_BEGIN_END, 1); \ - OUT_RING(chan, 0); + OUT_RING(chan, 0) #define MAX_PACKET 0x400 #define MAX_OUT_L 0x100 #define BATCH_PACKET_L(n) \ - BEGIN_RING_NI(chan, kelvin, NV20TCL_VB_VERTEX_BATCH, n); + BEGIN_RING_NI(chan, kelvin, NV20TCL_VB_VERTEX_BATCH, n) #define BATCH_OUT_L(i, n) \ - OUT_RING(chan, ((n) - 1) << 24 | (i)); + OUT_RING(chan, ((n) - 1) << 24 | (i)) #define MAX_OUT_I16 0x2 #define BATCH_PACKET_I16(n) \ - BEGIN_RING_NI(chan, kelvin, NV20TCL_VB_ELEMENT_U16, n); + BEGIN_RING_NI(chan, kelvin, NV20TCL_VB_ELEMENT_U16, n) #define BATCH_OUT_I16(i0, i1) \ - OUT_RING(chan, (i1) << 16 | (i0)); + OUT_RING(chan, (i1) << 16 | (i0)) #define MAX_OUT_I32 0x1 #define BATCH_PACKET_I32(n) \ - BEGIN_RING_NI(chan, kelvin, NV20TCL_VB_ELEMENT_U32, n); + BEGIN_RING_NI(chan, kelvin, NV20TCL_VB_ELEMENT_U32, n) #define BATCH_OUT_I32(i) \ - OUT_RING(chan, i); + OUT_RING(chan, i) #define IMM_PACKET(m, n) \ - BEGIN_RING(chan, kelvin, m, n); + BEGIN_RING(chan, kelvin, m, n) #define IMM_OUT(x) \ - OUT_RINGf(chan, x); + OUT_RINGf(chan, x) #define TAG(x) nv20_##x #include "nouveau_render_t.c" |