From 92288da76e879149179292f90dd2760f587c9132 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 20 Nov 2019 22:38:49 +0100 Subject: Rename "backend" headers Working on Vulkan clarified what has always been slightly smelly about the design and organization here: not everything that is API specific is really in a "backend" (a PuglBackend). The concrete example is puglGetProcAddress(), which only makes sense for GL and is actually implemented in the "backend" files. Arguably puglGetContext() is also such a thing. So, rename the headers so they can be the place where API-specific things go in general, which happens to include a backend most of the time. The stub is a bit of an exception to this, but whatever. The includes look tidier this way. In place of the old headers are compatibility stubs that just emit a warning and include the new version, which will be maintained for a while. --- pugl/detail/mac.m | 2 +- pugl/detail/mac_cairo.m | 4 ++-- pugl/detail/mac_gl.m | 4 ++-- pugl/detail/win.c | 2 +- pugl/detail/win_cairo.c | 2 +- pugl/detail/win_gl.c | 4 ++-- pugl/detail/x11.c | 2 +- pugl/detail/x11_cairo.c | 2 +- pugl/detail/x11_gl.c | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pugl/detail') diff --git a/pugl/detail/mac.m b/pugl/detail/mac.m index 7534281..efa4d78 100644 --- a/pugl/detail/mac.m +++ b/pugl/detail/mac.m @@ -24,7 +24,7 @@ #include "pugl/detail/implementation.h" #include "pugl/detail/mac.h" #include "pugl/pugl.h" -#include "pugl/pugl_stub_backend.h" +#include "pugl/pugl_stub.h" #import diff --git a/pugl/detail/mac_cairo.m b/pugl/detail/mac_cairo.m index 1e4149c..6b9f36c 100644 --- a/pugl/detail/mac_cairo.m +++ b/pugl/detail/mac_cairo.m @@ -20,8 +20,8 @@ #include "pugl/detail/implementation.h" #include "pugl/detail/mac.h" -#include "pugl/pugl_cairo_backend.h" -#include "pugl/pugl_stub_backend.h" +#include "pugl/pugl_cairo.h" +#include "pugl/pugl_stub.h" #include diff --git a/pugl/detail/mac_gl.m b/pugl/detail/mac_gl.m index f39c25e..428cc1a 100644 --- a/pugl/detail/mac_gl.m +++ b/pugl/detail/mac_gl.m @@ -20,8 +20,8 @@ #include "pugl/detail/implementation.h" #include "pugl/detail/mac.h" -#include "pugl/pugl_gl_backend.h" -#include "pugl/pugl_stub_backend.h" +#include "pugl/pugl_gl.h" +#include "pugl/pugl_stub.h" #ifndef __MAC_10_10 #define NSOpenGLProfileVersion4_1Core NSOpenGLProfileVersion3_2Core diff --git a/pugl/detail/win.c b/pugl/detail/win.c index d7026ae..9debb6d 100644 --- a/pugl/detail/win.c +++ b/pugl/detail/win.c @@ -21,7 +21,7 @@ #include "pugl/detail/implementation.h" #include "pugl/detail/win.h" #include "pugl/pugl.h" -#include "pugl/pugl_stub_backend.h" +#include "pugl/pugl_stub.h" #include #include diff --git a/pugl/detail/win_cairo.c b/pugl/detail/win_cairo.c index 27765ec..7966b07 100644 --- a/pugl/detail/win_cairo.c +++ b/pugl/detail/win_cairo.c @@ -20,7 +20,7 @@ #include "pugl/detail/types.h" #include "pugl/detail/win.h" -#include "pugl/pugl_cairo_backend.h" +#include "pugl/pugl_cairo.h" #include #include diff --git a/pugl/detail/win_gl.c b/pugl/detail/win_gl.c index d872303..ee3b032 100644 --- a/pugl/detail/win_gl.c +++ b/pugl/detail/win_gl.c @@ -20,8 +20,8 @@ #include "pugl/detail/types.h" #include "pugl/detail/win.h" -#include "pugl/pugl_gl_backend.h" -#include "pugl/pugl_stub_backend.h" +#include "pugl/pugl_gl.h" +#include "pugl/pugl_stub.h" #include diff --git a/pugl/detail/x11.c b/pugl/detail/x11.c index 133436c..9256b2e 100644 --- a/pugl/detail/x11.c +++ b/pugl/detail/x11.c @@ -26,7 +26,7 @@ #include "pugl/detail/types.h" #include "pugl/detail/x11.h" #include "pugl/pugl.h" -#include "pugl/pugl_stub_backend.h" +#include "pugl/pugl_stub.h" #include #include diff --git a/pugl/detail/x11_cairo.c b/pugl/detail/x11_cairo.c index 1c7df6e..523a569 100644 --- a/pugl/detail/x11_cairo.c +++ b/pugl/detail/x11_cairo.c @@ -21,7 +21,7 @@ #include "pugl/detail/types.h" #include "pugl/detail/x11.h" #include "pugl/pugl.h" -#include "pugl/pugl_cairo_backend.h" +#include "pugl/pugl_cairo.h" #include #include diff --git a/pugl/detail/x11_gl.c b/pugl/detail/x11_gl.c index a881510..d325f9d 100644 --- a/pugl/detail/x11_gl.c +++ b/pugl/detail/x11_gl.c @@ -21,8 +21,8 @@ #include "pugl/detail/types.h" #include "pugl/detail/x11.h" #include "pugl/pugl.h" -#include "pugl/pugl_gl_backend.h" -#include "pugl/pugl_stub_backend.h" +#include "pugl/pugl_gl.h" +#include "pugl/pugl_stub.h" #include #include -- cgit v1.2.1