st/nine: Refactor format d3d9 to pipe conversion

Move the checks of whether the format is supported
into a common place.
The advantage is that allows to handle when a d3d9
format can be mapped to several formats, and that
cards don't support all of them.

Reviewed-by: Tiziano Bacocco <[email protected]>
Signed-off-by: Axel Davy <[email protected]>

1 files changed, 8 insertions, 1 deletions

diff --git a/src/gallium/state_trackers/nine/volume9.c b/src/gallium/state_trackers/nine/volume9.c
index 9e83d6b5819..fce89396204 100644
--- a/src/gallium/state_trackers/nine/volume9.c
+++ b/src/gallium/state_trackers/nine/volume9.c
@@ -92,7 +92,6 @@ NineVolume9_ctor( struct NineVolume9 *This,
 
     This->info.screen = pParams->device->screen;
     This->info.target = PIPE_TEXTURE_3D;
-    This->info.format = d3d9_to_pipe_format(pDesc->Format);
     This->info.width0 = pDesc->Width;
     This->info.height0 = pDesc->Height;
     This->info.depth0 = pDesc->Depth;
@@ -102,6 +101,14 @@ NineVolume9_ctor( struct NineVolume9 *This,
     This->info.usage = PIPE_USAGE_DEFAULT;
     This->info.bind = PIPE_BIND_SAMPLER_VIEW;
     This->info.flags = 0;
+    This->info.format = d3d9_to_pipe_format_checked(This->info.screen,
+                                                    pDesc->Format,
+                                                    This->info.target,
+                                                    This->info.nr_samples,
+                                                    This->info.bind, FALSE);
+
+    if (This->info.format == PIPE_FORMAT_NONE)
+        return D3DERR_DRIVERINTERNALERROR;
 
     This->stride = util_format_get_stride(This->info.format, pDesc->Width);
     This->stride = align(This->stride, 4);