diff options
author | Ian Romanick <[email protected]> | 2004-10-18 00:00:41 +0000 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2004-10-18 00:00:41 +0000 |
commit | b430a1ae226308c04dab2a62b5e9127dfed25b2c (patch) | |
tree | de1a1534de592ced5cdc11295ba1541574ed0d1e /src/mesa/drivers/dri/r200 | |
parent | 48da4a4a86fb17d972c4aa536a18988a3cdc51c1 (diff) |
Fix compile errors when DEBUG is defined.
Diffstat (limited to 'src/mesa/drivers/dri/r200')
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_texstate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index 934ffc13493..1e56c78f9be 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -279,7 +279,7 @@ static void r200SetTexImages( r200ContextPtr rmesa, t->pp_txformat_x |= R200_TEXCOORD_VOLUME; } else if (tObj->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) | (R200_TXFORMAT_CUBIC_MAP_ENABLE)); @@ -828,7 +828,7 @@ static void import_tex_obj_state( r200ContextPtr rmesa, if (texobj->base.tObj->Target == GL_TEXTURE_CUBE_MAP) { GLuint *cube_cmd = R200_DB_STATE( cube[unit] ); GLuint bytesPerFace = texobj->base.totalSize / 6; - ASSERT(texobj->totalSize % 6 == 0); + ASSERT(texobj->base.totalSize % 6 == 0); cube_cmd[CUBE_PP_CUBIC_FACES] = texobj->pp_cubic_faces; cube_cmd[CUBE_PP_CUBIC_OFFSET_F1] = texobj->pp_txoffset + 1 * bytesPerFace; cube_cmd[CUBE_PP_CUBIC_OFFSET_F2] = texobj->pp_txoffset + 2 * bytesPerFace; |