diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2009-12-13 17:18:50 +0100 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2009-12-13 17:20:11 +0100 |
| commit | 8403df33e070cf76af8ae96373d8090e8979c897 (patch) | |
| tree | 787b4be28f5879e5277f03ea3a8c48c3fc2ff0ac /src/mesa/drivers/dri/r300/r300_texstate.c | |
| parent | 9d8501bf2742519cc958c5f32122e196b64f8278 (diff) | |
r300: fix regression introduced by da73c1ed
The 0 value is correct for I8 format.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index 6db56ba618f..d4a728381e4 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -59,7 +59,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * identically. -- paulus */ -uint32_t r300TranslateTexFormat(gl_format mesaFormat) +int32_t r300TranslateTexFormat(gl_format mesaFormat) { switch (mesaFormat) { @@ -168,7 +168,7 @@ uint32_t r300TranslateTexFormat(gl_format mesaFormat) case MESA_FORMAT_SRGBA_DXT5: return R300_EASY_TX_FORMAT(Y, Z, W, X, DXT5) | R300_TX_FORMAT_GAMMA; default: - return 0; + return -1; } }; @@ -252,12 +252,13 @@ static void setup_hardware_state(r300ContextPtr rmesa, radeonTexObj *t) if (firstImage->_BaseFormat == GL_DEPTH_COMPONENT) { r300SetDepthTexMode(&t->base); } else { - t->pp_txformat = r300TranslateTexFormat(firstImage->TexFormat); - if (t->pp_txformat == 0) { + int32_t txformat = r300TranslateTexFormat(firstImage->TexFormat); + if (txformat < 0) { _mesa_problem(rmesa->radeon.glCtx, "%s: Invalid format %s", __FUNCTION__, _mesa_get_format_name(firstImage->TexFormat)); _mesa_exit(1); } + t->pp_txformat = (uint32_t) txformat; } } |