diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-27 12:59:39 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-07-27 12:59:53 -0400 |
| commit | fba6651a92af76d7a8d034e1acfdad5023cd311c (patch) | |
| tree | df3343bb6173ddb50a1dd99d50977c292166daa2 | |
| parent | 34b9d45be6cb0c42f031677a0bda8a5013472ae8 (diff) | |
Drop use of GL types in the driver
Still used in i810 for building the glx visuals.
| -rw-r--r-- | src/intel.h | 1 | ||||
| -rw-r--r-- | src/intel_batchbuffer.h | 2 | ||||
| -rw-r--r-- | src/intel_dri.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/intel.h b/src/intel.h index 01291a0e..da7ca573 100644 --- a/src/intel.h +++ b/src/intel.h @@ -65,7 +65,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define _XF86DRI_SERVER_ #include "dri.h" #include "dri2.h" -#include "GL/glxint.h" #include "intel_bufmgr.h" #include "i915_drm.h" diff --git a/src/intel_batchbuffer.h b/src/intel_batchbuffer.h index bf9b2794..02997bab 100644 --- a/src/intel_batchbuffer.h +++ b/src/intel_batchbuffer.h @@ -51,7 +51,7 @@ static inline int intel_vertex_space(intel_screen_private *intel) } static inline void -intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, GLuint sz) +intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, unsigned int sz) { assert(sz < intel->batch_bo->size - 8); if (intel_batch_space(intel) < sz) diff --git a/src/intel_dri.c b/src/intel_dri.c index 198d5d48..d5dc30fe 100644 --- a/src/intel_dri.c +++ b/src/intel_dri.c @@ -58,8 +58,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "windowstr.h" #include "shadow.h" -#include "GL/glxtokens.h" - #include "intel.h" #include "i830_reg.h" |