diff options
| author | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-06-15 11:43:48 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-06-15 11:43:48 +0200 |
| commit | f5888d9ca56ba68c01a4c9f111174650fac943aa (patch) | |
| tree | 2943286e0edda3342b4439e20c3d960c26096057 /src | |
| parent | e0eafde746fee546b16205e4a605e28f78e120f9 (diff) | |
| parent | cbe5af766eb52516e50d38c379bbde3391f6c0c2 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
progs/util/extfuncs.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/include/pipe/p_format.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index e31538c95fc..c4469d4a9e9 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -563,7 +563,11 @@ pf_is_depth_and_stencil( enum pipe_format format ) } /** DEPRECATED: For backwards compatibility */ -#define pf_is_depth_stencil pf_is_depth_or_stencil +static INLINE boolean +pf_is_depth_stencil( enum pipe_format format ) +{ + return pf_is_depth_or_stencil( format ); +} static INLINE boolean pf_is_compressed( enum pipe_format format ) |