dispatch: Include glheader.h in dispatch-related files.

This ensures that GLES1-only typedefs are available in these files.
In a future patch, this will allow us to expand the dispatch table to
include GLES1-only functions.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/src/glx/tests/indirect_api.cpp b/src/glx/tests/indirect_api.cpp
index a9759e1d998f506daab4060eca995a0a1320c435..af9eca5a812870edabbd0b32bb11d5c32ae94154 100644 (file)
--- a/src/glx/tests/indirect_api.cpp
+++ b/src/glx/tests/indirect_api.cpp
@@ -44,7 +44,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <GL/gl.h>
+#include "main/glheader.h"
 extern "C" {
 #include "../indirect_init.h"
 #include "glapi/glapi.h"

diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py
index b0901323245cf73c0f7c03168b4a1fb33d57a45d..a00c9c27a54313d838009b209653d56de3259832 100644 (file)
--- a/src/mapi/glapi/gen/gl_gentable.py
+++ b/src/mapi/glapi/gen/gl_gentable.py
@@ -54,7 +54,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <GL/gl.h>
+#include "main/glheader.h"
 
 #include "glapi.h"
 #include "glapitable.h"

diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index dd029c2ca8cbee37e2aa8c2a0a7be9306a93a05b..807d3c3bb01a5932ab59e5d9c9ec83924bf211d1 100644 (file)
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <GL/gl.h>
+#include "../mesa/main/glheader.h"
 
 extern "C" {
 #include "glapi/glapi.h"

diff --git a/src/mapi/shared-glapi/tests/check_table.cpp b/src/mapi/shared-glapi/tests/check_table.cpp
index 3252b35a805521542688f8bb12a9756b98c0be93..47c0b2775d9e831ca4c8d91d7f2e9ba96cb55f6f 100644 (file)
--- a/src/mapi/shared-glapi/tests/check_table.cpp
+++ b/src/mapi/shared-glapi/tests/check_table.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <GL/gl.h>
+#include "../../../mesa/main/glheader.h"
 
 extern "C" {
 #include "glapi/glapi.h"