summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/i915simple/i915_screen.c
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-05-05 19:44:16 +1000
committerBen Skeggs <[email protected]>2008-05-05 19:44:16 +1000
commit33d9e213ee47aab32f662caf3e7c07c2697befbe (patch)
tree20fd91d378d396e8e2ace51ee23722d98f212fcc /src/gallium/drivers/i915simple/i915_screen.c
parent1e6191e0af2653aa69bd623e25d2e157662e560f (diff)
parent736f535b4f1c5e6912b5b2fe9415a3b44a678844 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_screen.c')
-rw-r--r--src/gallium/drivers/i915simple/i915_screen.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915simple/i915_screen.c
index 9ae594ce54c..646cfd921d1 100644
--- a/src/gallium/drivers/i915simple/i915_screen.c
+++ b/src/gallium/drivers/i915simple/i915_screen.c
@@ -154,10 +154,10 @@ i915_is_format_supported( struct pipe_screen *screen,
PIPE_FORMAT_R8G8B8A8_UNORM,
PIPE_FORMAT_A8R8G8B8_UNORM,
PIPE_FORMAT_R5G6B5_UNORM,
- PIPE_FORMAT_U_L8,
- PIPE_FORMAT_U_A8,
- PIPE_FORMAT_U_I8,
- PIPE_FORMAT_U_A8_L8,
+ PIPE_FORMAT_L8_UNORM,
+ PIPE_FORMAT_A8_UNORM,
+ PIPE_FORMAT_I8_UNORM,
+ PIPE_FORMAT_A8L8_UNORM,
PIPE_FORMAT_YCBCR,
PIPE_FORMAT_YCBCR_REV,
PIPE_FORMAT_S8Z24_UNORM,
@@ -182,6 +182,7 @@ i915_is_format_supported( struct pipe_screen *screen,
break;
default:
assert(0);
+ return FALSE;
}
for (i = 0; list[i] != PIPE_FORMAT_NONE; i++) {