hgl: trivial bits

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index caf29ad0b1858b17b9a4c4ea2934af306a41f1c0..e4ef0034610fc281c7061082b0b7929933f7b348 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -172,6 +172,14 @@ if HAVE_ST_XVMC
 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 05b8214c34aa75360481795914e887a23b87c05b..82a0ce0a34ec59038d9ceb777e544dcc0cb7eace 100644 (file)
--- 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 1d6fa73f23fa68423b92b2dade9e33e55f6590f6..8dcd6e315f3f208c871bc8951cc0cad8a04cb603 100644 (file)
--- 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 d89a2afb35fd29902613515e98a05bd54faabbdd..d5fd6994b2500c45573daa88fedfb266e35a4231 100644 (file)
--- 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,