diff options
| author | Jason Ekstrand <[email protected]> | 2014-07-24 11:17:53 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2014-08-04 11:07:15 -0700 |
| commit | 992e1ea8e4290cf14d59f89415bfd13e0920aad7 (patch) | |
| tree | 1e3ce418960e77e5926e8e76d0f4bd9244e38caa /src/gallium/drivers | |
| parent | efa0aa8ffc63e8fdd23335e67ca76eb358cfd1ac (diff) | |
gallium: Move sRGB <-> RGB handling to libmesautil
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_state.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index 20500fd834f..1bea61151c6 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -20,7 +20,7 @@ env.Alias('llvmpipe', llvmpipe) if not env['embedded']: env = env.Clone() - env.Prepend(LIBS = [llvmpipe] + gallium) + env.Prepend(LIBS = [llvmpipe, gallium, mesautil]) tests = [ 'format', diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am index ef48380ac6a..82741d275b9 100644 --- a/src/gallium/drivers/nouveau/Makefile.am +++ b/src/gallium/drivers/nouveau/Makefile.am @@ -49,4 +49,5 @@ nouveau_compiler_SOURCES = \ nouveau_compiler_LDADD = \ libnouveau.la \ ../../auxiliary/libgallium.la \ + $(top_builddir)/src/util/libmesautil.la \ $(GALLIUM_COMMON_LIB_DEPS) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c index 915ee26ecac..48bc07974a2 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -24,7 +24,7 @@ #include "util/u_helpers.h" #include "util/u_inlines.h" #include "util/u_transfer.h" -#include "util/u_format_srgb.h" +#include "util/format_srgb.h" #include "tgsi/tgsi_parse.h" |