From f32c51277498887b348133ebcd947dbc8acce756 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Fri, 4 Apr 2008 21:10:07 +0200
Subject: gallium: state tracker fixes for compressed textures
---
src/mesa/state_tracker/st_format.c | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'src/mesa/state_tracker/st_format.c')
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 761645c105..20defd5e16 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -276,6 +276,14 @@ st_mesa_format_to_pipe_format(GLuint mesaFormat)
return PIPE_FORMAT_Z24S8_UNORM;
case MESA_FORMAT_YCBCR:
return PIPE_FORMAT_YCBCR;
+ case MESA_FORMAT_RGB_DXT1:
+ return PIPE_FORMAT_DXT1_RGB;
+ case MESA_FORMAT_RGBA_DXT1:
+ return PIPE_FORMAT_DXT1_RGBA;
+ case MESA_FORMAT_RGBA_DXT3:
+ return PIPE_FORMAT_DXT3_RGBA;
+ case MESA_FORMAT_RGBA_DXT5:
+ return PIPE_FORMAT_DXT5_RGBA;
default:
assert(0);
return 0;
--
cgit v1.2.3
From d28a2004b8a69d66595f2c6b5398085b73873533 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 7 Apr 2008 15:53:49 -0600
Subject: gallium: fix the texture case in default_deep_rgba_format()
Fixes glean pixelFormat test
---
src/mesa/state_tracker/st_format.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'src/mesa/state_tracker/st_format.c')
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 20defd5e16..cd41dc4684 100644
--- a/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@ -321,7 +321,10 @@ default_deep_rgba_format(struct pipe_screen *screen, uint type)
if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM, type)) {
return PIPE_FORMAT_R16G16B16A16_SNORM;
}
- return PIPE_FORMAT_NONE;
+ if (type == PIPE_TEXTURE)
+ return default_rgba_format(screen, type);
+ else
+ return PIPE_FORMAT_NONE;
}
--
cgit v1.2.3