diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-06-10 22:16:57 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2009-10-04 17:10:29 +0100 |
| commit | 8ead013c83cec308567b211b82a2ec7e6fe3cb86 (patch) | |
| tree | a423e935ff89227f96c44b1979d64fa989ddae20 | |
| parent | 4523b88f6daab06173d5e8687d61d54d9bd1d2a2 (diff) | |
Fix build of native OpenGL for Xwin DDX
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/xwin/Makefile.am | 15 | ||||
| -rwxr-xr-x | hw/xwin/glx/glwrap.c | 7 |
3 files changed, 11 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index fb8f833a9..69e0320f0 100644 --- a/configure.ac +++ b/configure.ac @@ -1531,7 +1531,7 @@ AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes]) AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes]) AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes]) AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes]) -AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false]) +AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes]) AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes && false]) AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes && false]) AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes]) diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 097417c11..71eb42bc3 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -14,7 +14,10 @@ endif if XWIN_GLX_WINDOWS SRCS_GLX_WINDOWS = \ - winpriv.c + winpriv.c \ + glx/glwindows.h \ + glx/glwrap.c \ + glx/indirect.c DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS endif @@ -165,19 +168,13 @@ AM_LFLAGS = -i AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \ $(XWINMODULES_CFLAGS) \ -DBUILD_DATE=$(BUILD_DATE) \ - -DXFree86Server + -DXFree86Server \ + -I$(top_srcdir)/glx dist_man1_MANS = XWin.man dist_man5_MANS = XWinrc.man -GLX_EXTRAS = \ - glx/ChangeLog \ - glx/glwindows.h \ - glx/glwrap.c \ - glx/indirect.c - EXTRA_DIST = \ - $(GLX_EXTRAS) \ _usr_X11R6_lib_X11_system.XWinrc \ X-boxed.ico \ X.ico \ diff --git a/hw/xwin/glx/glwrap.c b/hw/xwin/glx/glwrap.c index f0b38b228..a60526a8b 100755 --- a/hw/xwin/glx/glwrap.c +++ b/hw/xwin/glx/glwrap.c @@ -27,12 +27,11 @@ ErrorF("glwrap: resolved \"%s\"\n", symbol); \ } \ if (proc == NULL) { \ - __glXErrorCallBack(NULL, 0); \ + __glXErrorCallBack(0); \ return retval; \ } #define RESOLVE(procname, symbol) RESOLVE_RET(procname, symbol,) - - + /* * GL_ARB_imaging */ @@ -105,6 +104,7 @@ GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname, proc(target, pname, params); } +#if 0 GLAPI void GLAPIENTRY glBlendEquation( GLenum mode ) { RESOLVE(PFNGLBLENDEQUATIONPROC, "glBlendEquation"); @@ -117,6 +117,7 @@ GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green, RESOLVE(PFNGLBLENDCOLORPROC, "glBlendColor"); proc(red, green, blue, alpha); } +#endif GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width, GLenum internalformat, GLboolean sink ) |