diff options
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index bac1bef968..29ffa7a017 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1910,11 +1910,10 @@ void r300ResetHwState(r300ContextPtr r300) r300->hw.unk2134.cmd[1] = 0x00FFFFFF; r300->hw.unk2134.cmd[2] = 0x00000000; -#ifdef MESA_BIG_ENDIAN - r300->hw.unk2140.cmd[1] = 0x00000002; -#else - r300->hw.unk2140.cmd[1] = 0x00000000; -#endif + if (_mesa_little_endian()) + r300->hw.unk2140.cmd[1] = 0x00000000; + else + r300->hw.unk2140.cmd[1] = 0x00000002; #if 0 /* Done in setup routing */ ((drm_r300_cmd_header_t*)r300->hw.vir[0].cmd)->packet0.count = 1; diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index 791427a6ab..1d78918a2b 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -172,18 +172,16 @@ static void r300SetTexImages(r300ContextPtr rmesa, GLint numLevels; GLint log2Width, log2Height, log2Depth; const GLuint ui = 1; - const GLubyte littleEndian = *((const GLubyte *) &ui); /* Set the hardware texture format */ if (VALID_FORMAT(baseImage->TexFormat->MesaFormat)) { - if (littleEndian) { + if (_mesa_little_endian()) { t->format = tx_table_le[baseImage->TexFormat->MesaFormat].format; t->filter |= tx_table_le[baseImage->TexFormat->MesaFormat].filter; - } - else { + } else { t->format = tx_table_be[baseImage->TexFormat->MesaFormat].format; t->filter |= |