diff options
| author | Matt Turner <mattst88@gmail.com> | 2015-02-20 20:18:47 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2015-02-23 10:49:47 -0800 |
| commit | bfcdb843830bba0190e00e35e3c5c18c4bdb5de1 (patch) | |
| tree | d4e8eebb5d58b3b1ac6caa383bfcda258b19c6c1 /src/mesa/drivers/dri/r200 | |
| parent | 52049f8fd83f2ef31c2a4d645cfb7d7b2ab518a6 (diff) | |
| download | external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.zip external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.tar.gz external_mesa3d-bfcdb843830bba0190e00e35e3c5c18c4bdb5de1.tar.bz2 | |
mesa: Use assert() instead of ASSERT wrapper.
Acked-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_texstate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 930ead8..8327187 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1651,7 +1651,7 @@ static void r200LogicOpCode( struct gl_context *ctx, GLenum opcode ) r200ContextPtr rmesa = R200_CONTEXT(ctx); GLuint rop = (GLuint)opcode - GL_CLEAR; - ASSERT( rop < 16 ); + assert( rop < 16 ); R200_STATECHANGE( rmesa, msk ); rmesa->hw.msk.cmd[MSK_RB3D_ROPCNTL] = r200_rop_tab[rop]; diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index 5f74096..43ecdb9 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -1432,7 +1432,7 @@ static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t) } else if (t->base.Target == GL_TEXTURE_CUBE_MAP) { - ASSERT(log2Width == log2Height); + assert(log2Width == log2Height); t->pp_txformat |= ((log2Width << R200_TXFORMAT_F5_WIDTH_SHIFT) | (log2Height << R200_TXFORMAT_F5_HEIGHT_SHIFT) | /* don't think we need this bit, if it exists at all - fglrx does not set it */ |