Re: wined3d: TRACE fixes. (try 2)

[Henri Verbeet]

On 16 September 2015 at 14:39, Andrey Gusev  wrote:
> @@ -1243,7 +1243,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC
>     unsigned int cfg_count = device->adapter->cfg_count;
>     unsigned int i;
> - TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n",
> - TRACE("device %p, hdc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n",
>        device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id),
>        auxBuffers, findCompatible);

This isn't wrong, but I'd be more inclined to change the parameter to
match the trace than the other way around.
> @@ -157,8 +157,8 @@ HRESULT CDECL wined3d_palette_create(struct wined3d_device *device, DWORD flags,
>     struct wined3d_palette *object;
>     HRESULT hr;
> - TRACE("device %p, flags %#x, entries %p, palette %p.\n",
> -
>        device, flags, entries, palette);
> - TRACE("device %p, flags %#x, entry_count %d, entries %p, palette %p.\n",
> -
>        device, flags, entry_count, entries, palette);

Unsigned values should use %u instead of %d.
> @@ -114,7 +114,7 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_
>     const struct wined3d_gl_info *gl_info;
>     enum wined3d_event_query_result ret;
> - TRACE("(%p)\n", query);
> - TRACE("(%p, %p)\n", query, device);

This isn't wrong per se either, but I'd prefer that as "query %p,
device %p.\n" like the rest of wined3d.
> @@ -1275,7 +1275,7 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti
>                 break;
>         case WINED3D_DECL_USAGE_BLEND_INDICES:
> -
>            TRACE("blend");
> -
>            TRACE("indices");

I'd either just leave that the way it is, or change it to
"blendindices". In the latter case you'd have to change the one for
WINED3D_DECL_USAGE_BLEND_WEIGHT to "blendweight", and the one for
WINED3D_DECL_USAGE_TEXCOORD to "texcoord%u" as well.
> @@ -2037,8 +2037,8 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b
>     unsigned int backend_version;
>     const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info;
> - TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u.\n",
> -
>        shader, byte_code, output_signature, float_const_count);
> - TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u, type %#x, max_version %d.\n",
> -
>        shader, byte_code, output_signature, float_const_count, type, max_version);

%d -> %u