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

Author: Luca Barbieri <l...@luca-barbieri.com>
Date:   Fri Sep 24 14:28:24 2010 +0200

nvfx: add RGB framebuffer format support in addition to BGR

---

 src/gallium/drivers/nvfx/nvfx_screen.c   |    2 ++
 src/gallium/drivers/nvfx/nvfx_state_fb.c |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c 
b/src/gallium/drivers/nvfx/nvfx_screen.c
index 3f177b7..8024800 100644
--- a/src/gallium/drivers/nvfx/nvfx_screen.c
+++ b/src/gallium/drivers/nvfx/nvfx_screen.c
@@ -194,6 +194,8 @@ nvfx_screen_is_format_supported(struct pipe_screen *pscreen,
                switch (format) {
                case PIPE_FORMAT_B8G8R8A8_UNORM:
                case PIPE_FORMAT_B8G8R8X8_UNORM:
+               case PIPE_FORMAT_R8G8B8A8_UNORM:
+               case PIPE_FORMAT_R8G8B8X8_UNORM:
                case PIPE_FORMAT_B5G6R5_UNORM:
                        break;
                case PIPE_FORMAT_R16G16B16A16_FLOAT:
diff --git a/src/gallium/drivers/nvfx/nvfx_state_fb.c 
b/src/gallium/drivers/nvfx/nvfx_state_fb.c
index 4ffc4de..30e48c8 100644
--- a/src/gallium/drivers/nvfx/nvfx_state_fb.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_fb.c
@@ -140,6 +140,12 @@ nvfx_framebuffer_validate(struct nvfx_context *nvfx, 
unsigned prepare_result)
                case 0:
                        rt_format |= NV30_3D_RT_FORMAT_COLOR_A8R8G8B8;
                        break;
+               case PIPE_FORMAT_R8G8B8X8_UNORM:
+                       rt_format |= NV30_3D_RT_FORMAT_COLOR_X8B8G8R8;
+                       break;
+               case PIPE_FORMAT_R8G8B8A8_UNORM:
+                       rt_format |= NV30_3D_RT_FORMAT_COLOR_A8B8G8R8;
+                       break;
                case PIPE_FORMAT_B5G6R5_UNORM:
                        rt_format |= NV30_3D_RT_FORMAT_COLOR_R5G6B5;
                        break;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to