summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/nouveau/nouveau_gldefs.h
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-01-16 13:50:00 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-01-16 13:50:00 +1100
commit0feec292ddc279998a1e25c10ea70d211f7b4b62 (patch)
tree5b6278577f4720776eb20cabc8e16dbaeeee6554 /src/mesa/pipe/nouveau/nouveau_gldefs.h
parente0e9326bdadb268dbb5eeedb14404ac2f48c103e (diff)
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.
Diffstat (limited to 'src/mesa/pipe/nouveau/nouveau_gldefs.h')
-rw-r--r--src/mesa/pipe/nouveau/nouveau_gldefs.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/pipe/nouveau/nouveau_gldefs.h b/src/mesa/pipe/nouveau/nouveau_gldefs.h
index 556a1ec58b..8ba3bdef64 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;
}
}