diff options
author | Eric Anholt <eric@anholt.net> | 2013-12-05 11:10:51 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2013-12-05 11:12:23 -0800 |
commit | 111c54992b54f090b63278daa541e29b341bb2ad (patch) | |
tree | f13b226fbae56fb98b378bb7292c84ba605c8fd5 /include | |
parent | 2be86a9a9c229423a5d87b772093ab58c1ebe7a2 (diff) | |
download | libepoxy-111c54992b54f090b63278daa541e29b341bb2ad.tar.gz |
Drop the installed _common.h headers.
I was thinking at one point that part of the build was going to
require not including the #defines from the generated code, but would
want these prototypes. It turns out that's not the case (and if it
is, I'll just wrap the #defines in an ifdef).
Diffstat (limited to 'include')
-rw-r--r-- | include/epoxy/gl.h | 7 | ||||
-rw-r--r-- | include/epoxy/gl_common.h | 39 | ||||
-rw-r--r-- | include/epoxy/glx.h | 8 | ||||
-rw-r--r-- | include/epoxy/glx_common.h | 41 |
4 files changed, 13 insertions, 82 deletions
diff --git a/include/epoxy/gl.h b/include/epoxy/gl.h index 102d705..3eae4b6 100644 --- a/include/epoxy/gl.h +++ b/include/epoxy/gl.h @@ -41,6 +41,8 @@ extern "C" { #endif +#include <stdbool.h> + #if defined(__gl_h_) || defined(__glext_h_) #error epoxy/gl.h must be included before (or in place of) GL/gl.h #else @@ -66,10 +68,13 @@ extern "C" { #endif #endif /* _WIN32 */ -#include "epoxy/gl_common.h" #include "epoxy/gl_generated.h" #include "epoxy/gl_generated_vtable_defines.h" +bool epoxy_has_gl_extension(const char *extension); +bool epoxy_is_desktop_gl(void); +int epoxy_gl_version(void); + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/include/epoxy/gl_common.h b/include/epoxy/gl_common.h deleted file mode 100644 index 5246900..0000000 --- a/include/epoxy/gl_common.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright © 2013 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -/** @file gl_common.h - * - * Provides prototypes for epoxy GL functions independent of dispatch mechanism. - */ - -#ifndef EPOXY_GL_COMMON_H -#define EPOXY_GL_COMMON_H - -#include <stdbool.h> - -bool epoxy_has_gl_extension(const char *extension); -bool epoxy_is_desktop_gl(void); -int epoxy_gl_version(void); - -#endif /* EPOXY_GL_COMMON_H */ - diff --git a/include/epoxy/glx.h b/include/epoxy/glx.h index fa7077f..9deb99f 100644 --- a/include/epoxy/glx.h +++ b/include/epoxy/glx.h @@ -39,6 +39,10 @@ extern "C" { #endif +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <stdbool.h> + #if defined(GLX_H) || defined(__glxext_h_) #error epoxy/glx.h must be included before (or in place of) GL/glx.h #else @@ -48,10 +52,12 @@ extern "C" { #pragma once -#include "epoxy/glx_common.h" #include "epoxy/glx_generated.h" #include "epoxy/glx_generated_vtable_defines.h" +bool epoxy_has_glx_extension(Display *dpy, int screen, const char *extension); +int epoxy_glx_version(Display *dpy, int screen); + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/include/epoxy/glx_common.h b/include/epoxy/glx_common.h deleted file mode 100644 index 4ad08c7..0000000 --- a/include/epoxy/glx_common.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2013 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -/** @file gl_common.h - * - * Provides prototypes for epoxy GL functions independent of dispatch mechanism. - */ - -#ifndef EPOXY_GLX_COMMON_H -#define EPOXY_GLX_COMMON_H - -#include <stdbool.h> - -#include <X11/Xlib.h> -#include <X11/Xutil.h> - -bool epoxy_has_glx_extension(Display *dpy, int screen, const char *extension); -int epoxy_glx_version(Display *dpy, int screen); - -#endif /* EPOXY_GLX_COMMON_H */ - |