st/nine: Improve CheckDeviceFormat debug output

Because the debug output of this function was cut in two parts,
sometimes the second part wasn't print when we would return earlier,
whereas we would like to get it.

The reason of the separation was that it's only at the end of the function
we can print what we map to the d3d9 arguments, but we can always retrieve
that info by hand.

Reviewed-by: Tiziano Bacocco <tizbac2@gmail.com>
Signed-off-by: Axel Davy <axel.davy@ens.fr>

diff --git a/src/gallium/state_trackers/nine/adapter9.c b/src/gallium/state_trackers/nine/adapter9.c
index 6ff197e1dfe8c716a5cfe824a99c788c3f9f455d..154d8beb5257d2d416e11c880ee92604eedf30ad 100644 (file)
--- a/src/gallium/state_trackers/nine/adapter9.c
+++ b/src/gallium/state_trackers/nine/adapter9.c
@@ -261,11 +261,11 @@ NineAdapter9_CheckDeviceFormat( struct NineAdapter9 *This,
 
     /* Check adapter format. */
 
-    /* Nicer output if we only have the line at the end. */
-#if 1
     DBG("This=%p DeviceType=%s AdapterFormat=%s\n", This,
         nine_D3DDEVTYPE_to_str(DeviceType), d3dformat_to_string(AdapterFormat));
-#endif
+    DBG("Usage=%x RType=%u CheckFormat=%s\n", Usage, RType,
+        d3dformat_to_string(CheckFormat));
+
     user_assert(display_format(AdapterFormat, FALSE), D3DERR_INVALIDCALL);
 
     hr = NineAdapter9_GetScreen(This, DeviceType, &screen);
@@ -334,12 +334,6 @@ NineAdapter9_CheckDeviceFormat( struct NineAdapter9 *This,
     if (Usage & (D3DUSAGE_QUERY_SRGBREAD | D3DUSAGE_QUERY_SRGBWRITE))
         pf = util_format_srgb(pf);
 
-    DBG("Format=%s/%s Usage/Bind=%x/%d RType/Target=%u/%s\n", // replace %d to %s
-        d3dformat_to_string(CheckFormat), util_format_name(pf),
-        Usage, bind, // temporary simplified for merge, FIXME
-        /* Usage, util_dump_bind_flags(bind), */
-        RType, util_dump_tex_target(target, TRUE));
-
     if (pf == PIPE_FORMAT_NONE ||
         !screen->is_format_supported(screen, pf, target, 0, bind)) {
         DBG("NOT AVAILABLE\n");