From 0feec292ddc279998a1e25c10ea70d211f7b4b62 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 16 Jan 2008 13:50:00 +1100 Subject: [PATCH] nouveau: remove assertions from PIPE_ -> GL_ It seems we need to keep some sane defaults around for a bit, at least until the pipe drivers learn to avoid translating things like alpha_src_factor when blend_enable is false. --- src/mesa/pipe/nouveau/nouveau_gldefs.h | 12 ++++++------ src/mesa/pipe/nv50/nv50_query.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mesa/pipe/nouveau/nouveau_gldefs.h b/src/mesa/pipe/nouveau/nouveau_gldefs.h index 556a1ec58b4..8ba3bdef649 100644 --- a/src/mesa/pipe/nouveau/nouveau_gldefs.h +++ b/src/mesa/pipe/nouveau/nouveau_gldefs.h @@ -36,7 +36,7 @@ nvgl_blend_func(unsigned factor) case PIPE_BLENDFACTOR_INV_CONST_ALPHA: return 0x8004; default: - assert(0); + return 0x0000; } } @@ -55,7 +55,7 @@ nvgl_blend_eqn(unsigned func) case PIPE_BLEND_REVERSE_SUBTRACT: return 0x800b; default: - assert(0); + return 0x8006; } } @@ -96,7 +96,7 @@ nvgl_logicop_func(unsigned func) case PIPE_LOGICOP_SET: return 0x150f; default: - assert(0); + return 0x1505; } } @@ -121,7 +121,7 @@ nvgl_comparison_op(unsigned op) case PIPE_FUNC_ALWAYS: return 0x0207; default: - assert(0); + return 0x0207; } } @@ -136,7 +136,7 @@ nvgl_polygon_mode(unsigned mode) case PIPE_POLYGON_MODE_FILL: return 0x1b02; default: - assert(0); + return 0x1b02; } } @@ -161,7 +161,7 @@ nvgl_stencil_op(unsigned op) case PIPE_STENCIL_OP_DECR_WRAP: return 0x8508; default: - assert(0); + return 0x1e00; } } diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/mesa/pipe/nv50/nv50_query.c index 7e48e5121c2..d8c3491c2c5 100644 --- a/src/mesa/pipe/nv50/nv50_query.c +++ b/src/mesa/pipe/nv50/nv50_query.c @@ -29,7 +29,7 @@ nv50_query_end(struct pipe_context *pipe, struct pipe_query *q) static boolean nv50_query_result(struct pipe_context *pipe, struct pipe_query *q, - boolean wait, uint64_t *result) + boolean wait, uint64 *result) { NOUVEAU_ERR("unimplemented\n"); *result = 0xdeadcafe; -- 2.30.2