diff options
| author | George Sapountzis <[email protected]> | 2011-11-03 13:57:41 +0200 |
|---|---|---|
| committer | George Sapountzis <[email protected]> | 2011-11-04 23:33:04 +0200 |
| commit | 78c076e6548f0bb44758d89ec434bcfddd902939 (patch) | |
| tree | 339048ca536e0ddb72df76c7b6cdd402a0b86d80 /src/gallium | |
| parent | 96bd41b315ce2943df2e59656fb200fedb866412 (diff) | |
dri: drop drisw_util.h
Diffstat (limited to 'src/gallium')
4 files changed, 3 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_context.h b/src/gallium/state_trackers/dri/common/dri_context.h index 58bc6139691..5fc81194ddd 100644 --- a/src/gallium/state_trackers/dri/common/dri_context.h +++ b/src/gallium/state_trackers/dri/common/dri_context.h @@ -32,8 +32,8 @@ #ifndef DRI_CONTEXT_H #define DRI_CONTEXT_H +#include "dri_util.h" #include "pipe/p_compiler.h" -#include "dri_wrapper.h" #include "postprocess/filters.h" struct pipe_context; diff --git a/src/gallium/state_trackers/dri/common/dri_screen.h b/src/gallium/state_trackers/dri/common/dri_screen.h index c7985e18f02..8c961955ac9 100644 --- a/src/gallium/state_trackers/dri/common/dri_screen.h +++ b/src/gallium/state_trackers/dri/common/dri_screen.h @@ -32,7 +32,7 @@ #ifndef DRI_SCREEN_H #define DRI_SCREEN_H -#include "dri_wrapper.h" +#include "dri_util.h" #include "xmlconfig.h" #include "pipe/p_compiler.h" diff --git a/src/gallium/state_trackers/dri/common/dri_wrapper.h b/src/gallium/state_trackers/dri/common/dri_wrapper.h deleted file mode 100644 index 141ba02706a..00000000000 --- a/src/gallium/state_trackers/dri/common/dri_wrapper.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef DRI_WRAPPER_H -#define DRI_WRAPPER_H - -#ifndef __NOT_HAVE_DRM_H -#include "dri_util.h" -#else -#include "drisw_util.h" -#endif - -#endif diff --git a/src/gallium/state_trackers/dri/drm/dri2_buffer.h b/src/gallium/state_trackers/dri/drm/dri2_buffer.h index 1cd8dbbda22..e8e474ddb76 100644 --- a/src/gallium/state_trackers/dri/drm/dri2_buffer.h +++ b/src/gallium/state_trackers/dri/drm/dri2_buffer.h @@ -1,7 +1,7 @@ #ifndef DRI2_BUFFER_H #define DRI2_BUFFER_H -#include "dri_wrapper.h" +#include "dri_util.h" struct pipe_surface; |