diff options
| author | Paul Berry <[email protected]> | 2012-10-23 14:06:32 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-11-01 11:22:24 -0700 |
| commit | 33e000472080af2a48d9753847469789100fa613 (patch) | |
| tree | 01fd8e5e78c087c27c83529b24c1738fc7f62e73 | |
| parent | 47deaf6175c01cbdc6816444f7c02cf5c875865d (diff) | |
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 <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
| -rw-r--r-- | src/glx/tests/indirect_api.cpp | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_gentable.py | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/tests/check_table.cpp | 2 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/tests/check_table.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/glx/tests/indirect_api.cpp b/src/glx/tests/indirect_api.cpp index a9759e1d998..af9eca5a812 100644 --- 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 b0901323245..a00c9c27a54 100644 --- 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 dd029c2ca8c..807d3c3bb01 100644 --- 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 3252b35a805..47c0b2775d9 100644 --- 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" |