Module: Mesa
Branch: master
Commit: 23405ef4679301a36694ffecbeaef38e3c7650fa
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=23405ef4679301a36694ffecbeaef38e3c7650fa

Author: Michel Dänzer <[email protected]>
Date:   Tue Feb  5 17:30:56 2013 +0100

radeonsi: Don't advertise PIPE_FORMAT_L8A8_SRGB support.

The hardware can't do it.

---

 src/gallium/drivers/radeonsi/si_state.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c 
b/src/gallium/drivers/radeonsi/si_state.c
index 7c0db62..ee8b765 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -720,7 +720,6 @@ static uint32_t si_translate_colorformat(enum pipe_format 
format)
        case PIPE_FORMAT_L8A8_SNORM:
        case PIPE_FORMAT_L8A8_UINT:
        case PIPE_FORMAT_L8A8_SINT:
-       case PIPE_FORMAT_L8A8_SRGB:
        case PIPE_FORMAT_R8G8_SNORM:
        case PIPE_FORMAT_R8G8_UNORM:
        case PIPE_FORMAT_R8G8_UINT:
@@ -908,7 +907,6 @@ static uint32_t si_translate_colorswap(enum pipe_format 
format)
        case PIPE_FORMAT_L8A8_SNORM:
        case PIPE_FORMAT_L8A8_UINT:
        case PIPE_FORMAT_L8A8_SINT:
-       case PIPE_FORMAT_L8A8_SRGB:
                return V_028C70_SWAP_ALT;
        case PIPE_FORMAT_R8G8_SNORM:
        case PIPE_FORMAT_R8G8_UNORM:
@@ -1195,6 +1193,8 @@ static uint32_t si_translate_texformat(struct pipe_screen 
*screen,
                goto out_unknown; /* TODO */
 
        case UTIL_FORMAT_COLORSPACE_SRGB:
+               if (desc->nr_channels != 4 && desc->nr_channels != 1)
+                       goto out_unknown;
                break;
 
        default:

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to