Module: wine Branch: master Commit: 3c8635c8d7ef9a6f4c522f931c2be757022556fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8635c8d7ef9a6f4c522f931c...
Author: Andrey Gusev andrey.goosev@gmail.com Date: Fri Sep 18 16:54:41 2015 +0300
wined3d: TRACE fixes.
---
dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/device.c | 3 ++- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/palette.c | 4 ++-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 8 ++++---- 9 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 689bb5d..19df398 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1236,7 +1236,8 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr;
- TRACE("device %p, desc %p, data %p, parent %p, buffer %p\n", device, desc, data, parent, buffer); + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p\n", + device, desc, data, parent, parent_ops, buffer);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 88f0038..def042a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4503,7 +4503,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, HRESULT hr = WINED3D_OK; unsigned int i;
- TRACE("device %p, swapchain_desc %p, mode %p, callback %p.\n", device, swapchain_desc, mode, callback); + TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", + device, swapchain_desc, mode, callback, reset_state);
if (!(swapchain = wined3d_device_get_swapchain(device, 0))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5ac3ca7..6801bcc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5451,8 +5451,8 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e struct wined3d_device *object; HRESULT hr;
- TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, device_parent, device); + TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, surface_alignment %u, device_parent %p, device %p.\n", + wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, device_parent, device);
/* Validate the adapter number. If no adapters are available(no GL), ignore the adapter * number and create a device without a 3D adapter for 2D only operation. */ diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 1ebeb11..0d7bfa4 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -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 %u, entries %p, palette %p.\n", + device, flags, entry_count, entries, palette);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9e6f21a..b86adf1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -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("query %p, device %p.\n", query, device);
if (!query->context) { @@ -812,7 +812,7 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, struct wined3d_query *object; HRESULT hr;
- TRACE("device %p, type %#x, query %p.\n", device, type, query); + TRACE("device %p, type %#x, parent %p, query %p.\n", device, type, parent, query);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6e9fa9e..2d80877 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -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 %u.\n", + shader, byte_code, output_signature, float_const_count, type, max_version);
list_init(&shader->constantsF); list_init(&shader->constantsB); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 999423d8..b5133b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3557,7 +3557,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co struct wined3d_device *device = surface->resource.device; GLsizei w, h;
- TRACE("surface %p, new location %#x.\n", surface, location); + TRACE("surface %p, context %p, new location %#x.\n", surface, context, location);
/* TODO: Make this work for modes other than FBO */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; @@ -4980,7 +4980,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC | WINEDDBLT_DEPTHFILL | WINEDDBLT_DONOTWAIT;
- TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", + TRACE("dst_surface %p, dst_rect_in %s, src_surface %p, src_rect_in %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b369809..fdce24d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -443,7 +443,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, DWORD flag; UINT i;
- TRACE("texture %p, srgb %#x.\n", texture, srgb); + TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb);
if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) srgb = FALSE; @@ -826,7 +826,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi GLenum internal; UINT i;
- TRACE("texture %p, format %s.\n", texture, debug_d3dformat(format->id)); + TRACE("texture %p, context %p, format %s.\n", texture, context, debug_d3dformat(format->id));
if (format->convert) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1ff36da..846f7fd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -131,8 +131,8 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget { struct wined3d_rendertarget_view *object;
- TRACE("desc %p, resource %p, parent %p, view %p.\n", - desc, resource, parent, view); + TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", + desc, resource, parent, parent_ops, view);
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; @@ -150,7 +150,7 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surfa { struct wined3d_rendertarget_view_desc desc;
- TRACE("surface %p, view %p.\n", surface, view); + TRACE("surface %p, parent %p, parent_ops %p, view %p.\n", surface, parent, parent_ops, view);
desc.format_id = surface->resource.format->id; desc.u.texture.level_idx = surface->texture_level; @@ -199,7 +199,7 @@ HRESULT CDECL wined3d_shader_resource_view_create(struct wined3d_resource *resou { struct wined3d_shader_resource_view *object;
- TRACE("parent %p, parent_ops %p, view %p.\n", parent, parent_ops, view); + TRACE("resource %p, parent %p, parent_ops %p, view %p.\n", resource, parent, parent_ops, view);
if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY;