summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-10-28 11:58:13 -0700
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-10-28 12:15:35 -0700
commit23d8d15bedb7178bedde9b994be3925a160c193d (patch)
tree136b5aaec85e0853874b8fc341d0dc7d797faa71
parente7c8a2763855c35af1d141b67551b364e6579051 (diff)
r300g: Keep texture formats organized.
-rw-r--r--src/gallium/drivers/r300/r300_texture.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index a18e0cbe1a..55ceb1a513 100644
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -43,6 +43,8 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format)
/* X8 */
case PIPE_FORMAT_I8_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X8);
+ case PIPE_FORMAT_L8_UNORM:
+ return R300_EASY_TX_FORMAT(X, X, X, ONE, X8);
/* X16 */
case PIPE_FORMAT_R16_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X16);
@@ -51,6 +53,9 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format)
R300_TX_FORMAT_SIGNED;
case PIPE_FORMAT_Z16_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X16);
+ /* Y8X8 */
+ case PIPE_FORMAT_A8L8_UNORM:
+ return R300_EASY_TX_FORMAT(X, X, X, Y, Y8X8);
/* W8Z8Y8X8 */
case PIPE_FORMAT_A8R8G8B8_UNORM:
return R300_EASY_TX_FORMAT(X, Y, Z, W, W8Z8Y8X8);
@@ -86,12 +91,6 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format)
case PIPE_FORMAT_Z24X8_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, W24_FP);
- case PIPE_FORMAT_A8L8_UNORM:
- return R300_EASY_TX_FORMAT(X, X, X, Y, Y8X8);
-
- case PIPE_FORMAT_L8_UNORM:
- return R300_EASY_TX_FORMAT(X, X, X, ONE, X8);
-
default:
debug_printf("r300: Implementation error: "
"Got unsupported texture format %s in %s\n",