summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Marchesin <[email protected]>2014-11-22 00:11:21 -0800
committerStéphane Marchesin <[email protected]>2014-11-22 00:13:40 -0800
commit90207340c7ea0d729c8738fd0171316ada6f0ad7 (patch)
treee734459e7ca91145fa6ba66ea5c01ecb6bc02572
parent1e47510df72ccc43fde33e5026bcf71f201d90ae (diff)
i915g: Add back 4444 and 5551 formats
Now that we have the transfers working, we can re-add those formats. Signed-off-by: Stéphane Marchesin <[email protected]>
-rw-r--r--src/gallium/drivers/i915/TODO2
-rw-r--r--src/gallium/drivers/i915/i915_screen.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915/TODO b/src/gallium/drivers/i915/TODO
index cf4414a030d..8856a7e45ca 100644
--- a/src/gallium/drivers/i915/TODO
+++ b/src/gallium/drivers/i915/TODO
@@ -34,7 +34,5 @@ Random list of problems with i915g:
- Fix fragment discard
-- Fix 4444 and 5551 formats
-
Other bugs can be found here:
https://bugs.freedesktop.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&component=Drivers/Gallium/i915g
diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c
index e9f10bce609..1c604998ce9 100644
--- a/src/gallium/drivers/i915/i915_screen.c
+++ b/src/gallium/drivers/i915/i915_screen.c
@@ -362,7 +362,9 @@ i915_is_format_supported(struct pipe_screen *screen,
PIPE_FORMAT_B8G8R8X8_UNORM,
PIPE_FORMAT_R8G8B8A8_UNORM,
PIPE_FORMAT_R8G8B8X8_UNORM,
+ PIPE_FORMAT_B4G4R4A4_UNORM,
PIPE_FORMAT_B5G6R5_UNORM,
+ PIPE_FORMAT_B5G5R5A1_UNORM,
PIPE_FORMAT_B10G10R10A2_UNORM,
PIPE_FORMAT_L8_UNORM,
PIPE_FORMAT_A8_UNORM,
@@ -386,6 +388,8 @@ i915_is_format_supported(struct pipe_screen *screen,
PIPE_FORMAT_R8G8B8A8_UNORM,
PIPE_FORMAT_R8G8B8X8_UNORM,
PIPE_FORMAT_B5G6R5_UNORM,
+ PIPE_FORMAT_B5G5R5A1_UNORM,
+ PIPE_FORMAT_B4G4R4A4_UNORM,
PIPE_FORMAT_B10G10R10A2_UNORM,
PIPE_FORMAT_L8_UNORM,
PIPE_FORMAT_A8_UNORM,