Module: wine Branch: master Commit: 0c4201d5fd4c746347bc214ebd808bc7115d6daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4201d5fd4c746347bc214ebd...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Aug 21 09:12:30 2009 +0200
wined3d: Properly check if an attribute is used in TRACE_STRIDED.
---
dlls/wined3d/wined3d_private.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 44bb10e..3627078 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -941,10 +941,11 @@ do { \ } while(0)
/* Trace vector and strided data information */ -#define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w); -#define TRACE_STRIDED(si, name) TRACE( #name "=(data:%p, stride:%d, format:%#x, vbo %d, stream %u)\n", \ +#define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w) +#define TRACE_STRIDED(si, name) do { if (si->use_map & (1 << name)) \ + TRACE( #name "=(data:%p, stride:%d, format:%#x, vbo %d, stream %u)\n", \ si->elements[name].data, si->elements[name].stride, si->elements[name].format_desc->format, \ - si->elements[name].buffer_object, si->elements[name].stream_idx); + si->elements[name].buffer_object, si->elements[name].stream_idx); } while(0)
/* Defines used for optimizations */