diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-16 15:42:59 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-23 11:06:12 +0100 |
| commit | 80a45bfc26e20d1d481f13cb15c0720d165a8306 (patch) | |
| tree | e6e5287c6ffd20d88e1e870669d5d1f92acd4295 /src | |
| parent | 84c3900b5179a8d2cc5f925e94ed5b2bbdee1ad9 (diff) | |
radeon: add compat-api.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/compat-api.h | 41 | ||||
| -rw-r--r-- | src/radeon.h | 2 |
3 files changed, 44 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index dc77c024..26ceda7f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -137,6 +137,7 @@ EXTRA_DIST = \ cayman_reg.h \ cayman_reg_auto.h \ cayman_shader.h \ + compat-api.h \ ati.h \ ativersion.h \ bicubic_table.h \ diff --git a/src/compat-api.h b/src/compat-api.h new file mode 100644 index 00000000..1bb77241 --- /dev/null +++ b/src/compat-api.h @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie <airlied@redhat.com> + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#endif diff --git a/src/radeon.h b/src/radeon.h index cef09a20..90bcf8a1 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -66,6 +66,8 @@ /* Xv support */ #include "xf86xv.h" +#include "compat-api.h" + #include "radeon_probe.h" #include "radeon_tv.h" |