diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-11-15 16:48:29 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-11-15 17:42:08 +0100 |
| commit | 88850b3e4f5f2692bf77d46fab031bd573f4d642 (patch) | |
| tree | f402ce1e0f6cf503b34e83a5cfa43327d0bef1b9 /src/mesa/drivers/dri/nouveau/nv10_state_tnl.c | |
| parent | aceb5b3277e83b17da57b14c4c1a005032bf2ecc (diff) | |
dri/nouveau: Kill a bunch of ternary operators.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv10_state_tnl.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state_tnl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c b/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c index b9d07c1129..e8bd12e6e0 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c +++ b/src/mesa/drivers/dri/nouveau/nv10_state_tnl.c @@ -136,7 +136,7 @@ nv10_emit_fog(struct gl_context *ctx, int emit) BEGIN_RING(chan, celsius, NV10_3D_FOG_MODE, 4); OUT_RING(chan, get_fog_mode(f->Mode)); OUT_RING(chan, get_fog_source(source)); - OUT_RING(chan, f->Enabled ? 1 : 0); + OUT_RINGb(chan, f->Enabled); OUT_RING(chan, pack_rgba_f(MESA_FORMAT_RGBA8888_REV, f->Color)); BEGIN_RING(chan, celsius, NV10_3D_FOG_COEFF(0), 3); @@ -181,9 +181,9 @@ nv10_emit_light_enable(struct gl_context *ctx, int emit) BEGIN_RING(chan, celsius, NV10_3D_ENABLED_LIGHTS, 1); OUT_RING(chan, en_lights); BEGIN_RING(chan, celsius, NV10_3D_LIGHTING_ENABLE, 1); - OUT_RING(chan, ctx->Light.Enabled ? 1 : 0); + OUT_RINGb(chan, ctx->Light.Enabled); BEGIN_RING(chan, celsius, NV10_3D_NORMALIZE_ENABLE, 1); - OUT_RING(chan, ctx->Transform.Normalize ? 1 : 0); + OUT_RINGb(chan, ctx->Transform.Normalize); } void @@ -194,7 +194,7 @@ nv10_emit_light_model(struct gl_context *ctx, int emit) struct gl_lightmodel *m = &ctx->Light.Model; BEGIN_RING(chan, celsius, NV10_3D_SEPARATE_SPECULAR_ENABLE, 1); - OUT_RING(chan, m->ColorControl == GL_SEPARATE_SPECULAR_COLOR ? 1 : 0); + OUT_RINGb(chan, m->ColorControl == GL_SEPARATE_SPECULAR_COLOR); BEGIN_RING(chan, celsius, NV10_3D_LIGHT_MODEL, 1); OUT_RING(chan, ((m->LocalViewer ? |