xf86-video-intel: src/intel_batchbuffer.h src/intel_dri.c src/intel.h
Kristian Høgsberg
krh at kemper.freedesktop.org
Tue Jul 27 10:00:57 PDT 2010
src/intel.h | 1 -
src/intel_batchbuffer.h | 2 +-
src/intel_dri.c | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit fba6651a92af76d7a8d034e1acfdad5023cd311c
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Tue Jul 27 12:59:39 2010 -0400
Drop use of GL types in the driver
Still used in i810 for building the glx visuals.
diff --git a/src/intel.h b/src/intel.h
index 01291a0..da7ca57 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 bf9b279..02997ba 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 198d5d4..d5dc30f 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"
More information about the xorg-commit
mailing list