AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dri/nouveau: Minor cleanup.

Browse Source
This commit is contained in:
Francisco Jerez
2010-10-10 01:45:23 +02:00
parent 307df6a858
commit 35a1893fd1
4 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/nouveau/nouveau_context.c
+1 -2
View File
@@ -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);
}
src/mesa/drivers/dri/nouveau/nv10_context.c
+1 -1
View File
@@ -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);
src/mesa/drivers/dri/nouveau/nv10_render.c
+10 -10
View File
@@ -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"
src/mesa/drivers/dri/nouveau/nv20_render.c
+10 -10
View File
@@ -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"