diff options
| author | Chia-I Wu <[email protected]> | 2010-02-07 19:20:52 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-03-12 09:57:07 +0800 |
| commit | de8a879f5c77dbf5c31251e07b2f1b8d2635716c (patch) | |
| tree | 77ad03688172ac016db0d1d9df4a7c4ecd64328a /src/gallium/state_trackers | |
| parent | 8bcd616a3ffd040ef28b61b38b22da2dad9e2242 (diff) | |
st/mesa: Implement st_api.h.
There is currently no user of this new interface. As the inteface can
coexist with st_public.h, everthing should work as before.
ST_TEXTURE_2D is both defined by st_public.h and st_api.h. Reorder the
headers in st/dri to avoid conflicts.
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_context.c | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_drawable.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c index 2f991c39e33..75ac2e8adae 100644 --- a/src/gallium/state_trackers/dri/dri_context.c +++ b/src/gallium/state_trackers/dri/dri_context.c @@ -35,7 +35,6 @@ #include "state_tracker/drm_api.h" #include "state_tracker/dri1_api.h" #include "state_tracker/st_public.h" -#include "state_tracker/st_context.h" #include "pipe/p_context.h" #include "dri_context.h" diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c index 458473853cf..c400725c7f2 100644 --- a/src/gallium/state_trackers/dri/dri_drawable.c +++ b/src/gallium/state_trackers/dri/dri_drawable.c @@ -39,8 +39,8 @@ #include "main/renderbuffer.h" #include "state_tracker/drm_api.h" #include "state_tracker/dri1_api.h" -#include "state_tracker/st_public.h" #include "state_tracker/st_context.h" +#include "state_tracker/st_public.h" #include "state_tracker/st_cb_fbo.h" #include "util/u_format.h" |