From 111c54992b54f090b63278daa541e29b341bb2ad Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 5 Dec 2013 11:10:51 -0800 Subject: [PATCH] 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). --- include/epoxy/gl.h | 7 ++++++- include/epoxy/gl_common.h | 39 ------------------------------------ include/epoxy/glx.h | 8 +++++++- include/epoxy/glx_common.h | 41 -------------------------------------- src/Makefile.am | 2 -- src/dispatch_common.h | 4 ++-- src/gen_dispatch.py | 2 +- 7 files changed, 16 insertions(+), 87 deletions(-) delete mode 100644 include/epoxy/gl_common.h delete mode 100644 include/epoxy/glx_common.h 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 + #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 - -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 +#include +#include + #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 - -#include -#include - -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 */ - diff --git a/src/Makefile.am b/src/Makefile.am index 1daea0a..720498a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,13 +35,11 @@ epoxyinclude_DATA = \ GL_INCLUDES = \ ../include/epoxy/gl.h \ - ../include/epoxy/gl_common.h \ $(GENERATED_GL_INCLUDES) \ $() GLX_INCLUDES = \ ../include/epoxy/glx.h \ - ../include/epoxy/glx_common.h \ $(GENERATED_GLX_INCLUDES) \ $() diff --git a/src/dispatch_common.h b/src/dispatch_common.h index 8256134..701c59c 100644 --- a/src/dispatch_common.h +++ b/src/dispatch_common.h @@ -22,8 +22,8 @@ */ #include -#include "epoxy/gl_common.h" -#include "epoxy/glx_common.h" +#include "epoxy/gl.h" +#include "epoxy/glx.h" #ifndef PUBLIC # if (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) diff --git a/src/gen_dispatch.py b/src/gen_dispatch.py index b052305..4310246 100755 --- a/src/gen_dispatch.py +++ b/src/gen_dispatch.py @@ -541,7 +541,7 @@ class Generator(object): self.outln('#include ') self.outln('') self.outln('#include "dispatch_common.h"') - self.outln('#include "epoxy/{0}_generated.h"'.format(self.target)) + self.outln('#include "epoxy/{0}.h"'.format(self.target)) self.outln('') self.outln('struct dispatch_table {')