Module: Mesa Branch: master Commit: 5b8900ded3988084c5bf005c0780efbec912d755 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b8900ded3988084c5bf005c0780efbec912d755
Author: Emil Velikov <[email protected]> Date: Thu Aug 28 21:54:20 2014 +0100 hgl: trivial bits Signed-off-by: Emil Velikov <[email protected]> --- src/gallium/Makefile.am | 8 ++++++++ src/gallium/state_trackers/hgl/SConscript | 2 +- src/gallium/state_trackers/hgl/hgl.c | 2 +- src/gallium/targets/haiku-softpipe/SConscript | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index caf29ad..e4ef003 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -173,6 +173,14 @@ SUBDIRS += state_trackers/xvmc targets/xvmc endif ## +## Don't forget to bundle the remaining (non autotools) state-trackers/targets +## + +EXTRA_DIST += \ + state_trackers/hgl targets/haiku-softpipe + + +## ## Gallium tests ## diff --git a/src/gallium/state_trackers/hgl/SConscript b/src/gallium/state_trackers/hgl/SConscript index 05b8214..82a0ce0 100644 --- a/src/gallium/state_trackers/hgl/SConscript +++ b/src/gallium/state_trackers/hgl/SConscript @@ -13,7 +13,7 @@ env.Append(CPPPATH = [ sources = [ 'hgl.c', - 'bitmap_wrapper.cpp', + 'bitmap_wrapper.cpp', ] st_haiku = env.ConvenienceLibrary( diff --git a/src/gallium/state_trackers/hgl/hgl.c b/src/gallium/state_trackers/hgl/hgl.c index 1d6fa73..8dcd6e3 100644 --- a/src/gallium/state_trackers/hgl/hgl.c +++ b/src/gallium/state_trackers/hgl/hgl.c @@ -95,7 +95,7 @@ hgl_st_framebuffer_validate(struct st_context_iface *stctx, for (unsigned i = 0; i < count; i++) { enum pipe_format format = PIPE_FORMAT_NONE; unsigned bind = 0; - + switch(statts[i]) { case ST_ATTACHMENT_FRONT_LEFT: case ST_ATTACHMENT_BACK_LEFT: diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript index d89a2af..d5fd699 100644 --- a/src/gallium/targets/haiku-softpipe/SConscript +++ b/src/gallium/targets/haiku-softpipe/SConscript @@ -2,7 +2,7 @@ Import('*') env.Prepend(LIBS = [ ws_haiku, - st_haiku, + st_haiku, trace, rbug, mesautil, _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
