Mesa (floating2): r300g: enable A/L/LA/I float render targets
Marek Olšák
mareko at kemper.freedesktop.org
Thu Mar 31 13:34:32 UTC 2011
Module: Mesa
Branch: floating2
Commit: 04ec602e059e2f4c7ea41d059779eced4cb8552b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=04ec602e059e2f4c7ea41d059779eced4cb8552b
Author: Marek Olšák <maraeo at gmail.com>
Date: Tue Mar 29 16:35:13 2011 +0200
r300g: enable A/L/LA/I float render targets
---
src/gallium/drivers/r300/r300_texture.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index 6214380..1d276ad 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -407,13 +407,13 @@ static uint32_t r300_translate_colorformat(enum pipe_format format)
/* These formats work fine with UV88 if US_OUT_FMT is set correctly. */
case PIPE_FORMAT_A16_UNORM:
case PIPE_FORMAT_A16_SNORM:
- /*case PIPE_FORMAT_A16_FLOAT:*/
+ case PIPE_FORMAT_A16_FLOAT:
case PIPE_FORMAT_L16_UNORM:
case PIPE_FORMAT_L16_SNORM:
- /*case PIPE_FORMAT_L16_FLOAT:*/
+ case PIPE_FORMAT_L16_FLOAT:
case PIPE_FORMAT_I16_UNORM:
case PIPE_FORMAT_I16_SNORM:
- /*case PIPE_FORMAT_I16_FLOAT:*/
+ case PIPE_FORMAT_I16_FLOAT:
case PIPE_FORMAT_R16_UNORM:
case PIPE_FORMAT_R16_SNORM:
case PIPE_FORMAT_R16_FLOAT:
@@ -454,10 +454,10 @@ static uint32_t r300_translate_colorformat(enum pipe_format format)
case PIPE_FORMAT_R16G16_FLOAT:
case PIPE_FORMAT_L16A16_UNORM:
case PIPE_FORMAT_L16A16_SNORM:
- /*case PIPE_FORMAT_L16A16_FLOAT:
+ case PIPE_FORMAT_L16A16_FLOAT:
case PIPE_FORMAT_A32_FLOAT:
case PIPE_FORMAT_L32_FLOAT:
- case PIPE_FORMAT_I32_FLOAT:*/
+ case PIPE_FORMAT_I32_FLOAT:
case PIPE_FORMAT_R32_FLOAT:
return R300_COLOR_FORMAT_ARGB8888;
@@ -473,7 +473,7 @@ static uint32_t r300_translate_colorformat(enum pipe_format format)
/* These formats work fine with ARGB16161616 if US_OUT_FMT is set
* correctly. */
case PIPE_FORMAT_R32G32_FLOAT:
- /*case PIPE_FORMAT_L32A32_FLOAT:*/
+ case PIPE_FORMAT_L32A32_FLOAT:
return R300_COLOR_FORMAT_ARGB16161616;
/* 128-bit buffers. */
@@ -656,8 +656,8 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format)
/*case PIPE_FORMAT_X8R8G8B8_SNORM:*/
case PIPE_FORMAT_A16_UNORM:
case PIPE_FORMAT_A16_SNORM:
- /*case PIPE_FORMAT_A16_FLOAT:
- case PIPE_FORMAT_A32_FLOAT:*/
+ case PIPE_FORMAT_A16_FLOAT:
+ case PIPE_FORMAT_A32_FLOAT:
return modifier |
R300_C0_SEL_A | R300_C1_SEL_R |
R300_C2_SEL_G | R300_C3_SEL_B;
@@ -691,12 +691,12 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format)
case PIPE_FORMAT_R32G32B32A32_FLOAT:
case PIPE_FORMAT_L16_UNORM:
case PIPE_FORMAT_L16_SNORM:
- /*case PIPE_FORMAT_L16_FLOAT:
- case PIPE_FORMAT_L32_FLOAT:*/
+ case PIPE_FORMAT_L16_FLOAT:
+ case PIPE_FORMAT_L32_FLOAT:
case PIPE_FORMAT_I16_UNORM:
case PIPE_FORMAT_I16_SNORM:
- /*case PIPE_FORMAT_I16_FLOAT:
- case PIPE_FORMAT_I32_FLOAT:*/
+ case PIPE_FORMAT_I16_FLOAT:
+ case PIPE_FORMAT_I32_FLOAT:
return modifier |
R300_C0_SEL_R | R300_C1_SEL_G |
R300_C2_SEL_B | R300_C3_SEL_A;
@@ -704,8 +704,8 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format)
/* LA outputs. */
case PIPE_FORMAT_L16A16_UNORM:
case PIPE_FORMAT_L16A16_SNORM:
- /*case PIPE_FORMAT_L16A16_FLOAT:
- case PIPE_FORMAT_L32A32_FLOAT:*/
+ case PIPE_FORMAT_L16A16_FLOAT:
+ case PIPE_FORMAT_L32A32_FLOAT:
return modifier |
R300_C0_SEL_R | R300_C1_SEL_A;
More information about the mesa-commit
mailing list