minigbm: dri: Don't redefine GL typedefs

dri_interface.h now #includes GL/gl.h so there is no need to define
these.

BUG=b:143621384
TEST=build/deploy minigbm and arc-cros-gralloc for grunt
Cq-Depend: chromium:1907530
Change-Id: Ic370dc1404156c8e5de5dc9490a8c68b49661c00
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/1912763
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>

diff --git a/dri.h b/dri.h
index f79de99..9c72b1e 100644 (file)
--- a/dri.h
+++ b/dri.h
@@ -6,11 +6,11 @@
 
 #ifdef DRV_AMDGPU
 
-typedef int GLint;
-typedef unsigned int GLuint;
-typedef unsigned char GLboolean;
-
+// Avoid transitively including a bunch of unnecessary headers.
+#define GL_GLEXT_LEGACY
 #include "GL/internal/dri_interface.h"
+#undef GL_GLEXT_LEGACY
+
 #include "drv.h"
 
 struct dri_driver {