diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-05-14 13:33:56 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-05-15 00:06:49 +0100 |
| commit | 04a1d6b89e5cd0367f95b64fe859866f946d448c (patch) | |
| tree | c162ef50b878a5ee3cc27f71f928009818120240 | |
| parent | 6f26f4fb86888520a33656cc04afd07c8224dd0c (diff) | |
Add Windows-DRI
HAVE_WINDOWSDRI enables building of a Windows-specific direct rendering
interface
XXX: TBD: add some code... :D
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/glx/Makefile.am | 8 | ||||
| -rw-r--r-- | src/glx/windows/Makefile.am | 0 |
3 files changed, 16 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bada47c8b9..883f7673e6 100644 --- a/configure.ac +++ b/configure.ac @@ -770,7 +770,9 @@ AM_CONDITIONAL(HAVE_DRI_GLX, test "x$enable_glx" = xyes -a \ case "$host_os" in darwin*) dri_platform='apple' ;; -gnu*|mingw*|cygwin*) +cygwin*|mingw*) + dri_platform='windows' ;; +gnu*) dri_platform='none' ;; *) dri_platform='drm' ;; @@ -781,6 +783,7 @@ AM_CONDITIONAL(HAVE_DRISW, test "x$enable_dri" = xyes ) AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes && test "x$dri_platform" = xdrm ) AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes && test "x$dri_platform" = xdrm ) AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes && test "x$dri_platform" = xapple ) +AM_CONDITIONAL(HAVE_WINDOWSDRI, test "x$enable_dri" = xyes && test "x$dri_platform" = xwindows ) AC_ARG_ENABLE([shared-glapi], [AS_HELP_STRING([--enable-shared-glapi], @@ -920,6 +923,9 @@ xyesno) if test x"$dri_platform" = xapple ; then DEFINES="$DEFINES -DGLX_USE_APPLEGL" fi + if test x"$dri_platform" = xwindows ; then + DEFINES="$DEFINES -DGLX_USE_WINDOWSGL" + fi fi # add xf86vidmode if available @@ -2198,6 +2204,7 @@ AC_CONFIG_FILES([Makefile src/glx/Makefile src/glx/apple/Makefile src/glx/tests/Makefile + src/glx/windows/Makefile src/gtest/Makefile src/loader/Makefile src/mapi/Makefile diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am index 1776918ba0..fce4e593a2 100644 --- a/src/glx/Makefile.am +++ b/src/glx/Makefile.am @@ -120,6 +120,14 @@ libglx_la_LIBADD += \ nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp endif +if HAVE_WINDOWSDRI +libglx_la_SOURCES += \ + windowsgl_glx.c + +SUBDIRS += windows +libglx_la_LIBADD += $(builddir)/windows/libwindowsglx.la +endif + GL_LIBS = \ libglx.la \ $(top_builddir)/src/mapi/glapi/libglapi.la \ diff --git a/src/glx/windows/Makefile.am b/src/glx/windows/Makefile.am new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/src/glx/windows/Makefile.am |