Re: [Mesa-dev] [PATCH] swr/rast: fix build break for llvm-6
Le mardi 2 janvier 2018, 17:57:03 CET Tim Rowley a écrit :
> LLVM api change.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104381
Tested-by: Laurent Carlier
> ---
> src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp index
> 3f0772c942..59672bb545 100644
> --- a/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> +++ b/src/gallium/drivers/swr/rasterizer/jitter/JitManager.cpp
> @@ -498,7 +498,11 @@ std::unique_ptr
> JitCache::getObject(const llvm::Module* M) break;
> }
>
> +#if LLVM_VERSION_MAJOR < 6
> pBuf =
> llvm::MemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSize()));
> +#else
> +pBuf =
> llvm::WritableMemoryBuffer::getNewUninitMemBuffer(size_t(header.GetBufferSi
> ze())); +#endif
> if (!fread(const_cast(pBuf->getBufferStart()),
> header.GetBufferSize(), 1, fpIn)) {
> pBuf = nullptr;
--
Laurent Carlier
http://www.archlinux.org
signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] How to build 32-bit Mesa
Le samedi 7 octobre 2017, 19:53:48 CEST Marek Olšák a écrit : > Hi, > > Recently I discovered that my configure hacks are not enough to build > 32-bit Mesa successfully anymore. > > Would you please share how you build 32-bit Mesa on Linux. I think it > would be useful to everybody. > > Thanks, > Marek > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev For lib32-mesa-git with archlinux i build it that way: " export CC="gcc -m32" export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" # for our 32 bit llvm-config export LLVM_CONFIG="/usr/bin/llvm-config32" ./autogen.sh \ --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \ --libdir=/usr/lib32 \ --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ ." & make -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] swr/rast: remove llvm fence/atomics from generated files
Le mardi 19 septembre 2017, 21:25:42 CEST Tim Rowley a écrit : > We currently don't use these instructions, and since their API > changed in llvm-5.0 having them in the autogen files broke the mesa > release tarballs which ship with generated autogen files. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102847 > CC: mesa-sta...@lists.freedesktop.org > --- Tested-by: Laurent Carlier > src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py | 8 > 1 file changed, 8 insertions(+) > > diff --git > a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py > b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py index > 025d38a..ce892a9 100644 > --- a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py > +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py > @@ -140,6 +140,14 @@ def parse_ir_builder(input_file): > > ignore = False > > +# The following functions need to be ignored in > openswr. +# API change in llvm-5.0 breaks baked autogen > files +if ( > +(func_name == 'CreateFence' or > + func_name == 'CreateAtomicCmpXchg' or > + func_name == 'CreateAtomicRMW')): > +ignore = True > + > # The following functions need to be ignored. > if (func_name == 'CreateInsertNUWNSWBinOp' or > func_name == 'CreateMaskedIntrinsic' or -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] swr/rast: do not crash on NULL strings returned by getenv
Le lundi 18 septembre 2017, 12:48:45 CEST Eric Engestrom a écrit :
> On Monday, 2017-09-18 11:29:21 +0100, Emil Velikov wrote:
> > From: Bernhard Rosenkraenzer
> >
> > The current convinince function GetEnv feeds the results of getenv
> > directly into std::string(). That is a bad idea, since the variable
> > may be unset, thus we feed NULL into the C++ construct.
> >
> > The latter of which is not allowed and leads to a crash.
> >
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101832
> > Fixes: a25093de718 ("swr/rast: Implement JIT shader caching to disk")
> > Cc: Tim Rowley
> > Cc: Laurent Carlier
> > Cc: Bernhard Rosenkraenzer
> > [Emil Velikov: make an actual commit from the misc diff]
> > Signed-off-by: Emil Velikov
>
> Laurent just sent this to the ML an hour before you, but this commit
> message is much better.
>
> Reviewed-by: Eric Engestrom
>
Yes, really better
Reviewed-by: Laurent Carlier
--
Laurent Carlier
http://www.archlinux.org
signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] swr/rast: Fix GetEnv() returned value
Return an empty string instead of a NULL pointer.
Patch from Bernhard Rosenkraenzer.
https://bugs.freedesktop.org/show_bug.cgi?id=101832
Fixes: a25093de718 ("swr/rast: Implement JIT shader caching to disk")
---
src/gallium/drivers/swr/rasterizer/core/utils.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h
b/src/gallium/drivers/swr/rasterizer/core/utils.h
index b096d2120c..3c849e82d3 100644
--- a/src/gallium/drivers/swr/rasterizer/core/utils.h
+++ b/src/gallium/drivers/swr/rasterizer/core/utils.h
@@ -365,7 +365,8 @@ static INLINE std::string GetEnv(const std::string&
variableName)
output.resize(valueSize - 1); // valueSize includes null, output.resize()
does not
GetEnvironmentVariableA(variableName.c_str(), &output[0], valueSize);
#else
-output = getenv(variableName.c_str());
+char *o = getenv(variableName.c_str());
+output = o ? std::string(o) : std::string();
#endif
return output;
--
2.14.1
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH mesa] util: improve compiler guard
Le jeudi 31 août 2017, 18:54:48 CEST Eric Engestrom a écrit :
Reviewed-by: Laurent Carlier
> Glibc 2.26 has dropped xlocale.h, but the functions needed (strtod_l()
> and strdof_l()) can be found in stdlib.h.
> Improve the detection method to allow newer builds to still make use of
> the locale-setting.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102454
> Cc: Laurent Carlier
> Cc: Emil Velikov
> Cc: Rob Herring
> Signed-off-by: Eric Engestrom
> ---
>
> Rob, any idea if android needs locale-setting? Emil suggested it might
> always use "C" anyway.
>
> For SCons, I added a trivial "does this function exist" check, but
> I don't even know what headers it includes when checking that. There's
> a chance this might break the scons build (appveyor is happy though,
> fwiw).
>
> If anyone knows how to do the same check in scons that I'm doing in
> autoconf, speak up :)
>
> ---
> configure.ac | 21 +
> scons/gallium.py | 16
> src/util/strtod.c | 12 ++--
> 3 files changed, 43 insertions(+), 6 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 53d52f6d52..f4d83e1c10 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -826,6 +826,27 @@ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES
> -DHAVE_SYS_SYSCTL_H"]) AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES
> -DHAVE_STRTOF"])
> AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
>
> +AC_MSG_CHECKING([whether strtod has locale support])
> +AC_LINK_IFELSE([AC_LANG_SOURCE([[
> +#define _GNU_SOURCE
> +#include
> +#include
> +#ifdef HAVE_XLOCALE_H
> +#include
> +#endif
> +int main() {
> + locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL);
> + const char *s = "1.0";
> + char *end;
> + double d = strtod_l(s, end, loc);
> + float f = strtof_l(s, end, loc);
> + freelocale(loc);
> + return 0;
> +}]])],
> + [DEFINES="$DEFINES -DHAVE_STRTOD_L"];
> + AC_MSG_RESULT([yes]),
> + AC_MSG_RESULT([no]))
> +
> dnl Check to see if dlopen is in default libraries (like Solaris, which
> dnl has it in libc), or if libdl is needed to get it.
> AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"],
> diff --git a/scons/gallium.py b/scons/gallium.py
> index c8e47a39db..1e35ef434a 100755
> --- a/scons/gallium.py
> +++ b/scons/gallium.py
> @@ -157,6 +157,19 @@ def check_header(env, header):
> env = conf.Finish()
> return have_header
>
> +def check_functions(env, functions):
> +'''Check if all of the functions exist'''
> +
> +conf = SCons.Script.Configure(env)
> +have_functions = True
> +
> +for function in functions:
> +if not conf.CheckFunc(function):
> +have_functions = False
> +
> +env = conf.Finish()
> +return have_functions
> +
> def check_prog(env, prog):
> """Check whether this program exists."""
>
> @@ -339,6 +352,9 @@ def generate(env):
> if check_header(env, 'xlocale.h'):
> cppdefines += ['HAVE_XLOCALE_H']
>
> +if check_functions(env, ['strtod_l', 'strtof_l']):
> +cppdefines += ['HAVE_STRTOD_L']
> +
> if platform == 'windows':
> cppdefines += [
> 'WIN32',
> diff --git a/src/util/strtod.c b/src/util/strtod.c
> index ea7d395e2d..de695d64b4 100644
> --- a/src/util/strtod.c
> +++ b/src/util/strtod.c
> @@ -26,13 +26,13 @@
>
> #include
>
> -#ifdef _GNU_SOURCE
> +#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L)
> #include
> #ifdef HAVE_XLOCALE_H
> #include
> +#endif
> static locale_t loc;
> #endif
> -#endif
>
> #include "strtod.h"
>
> @@ -40,7 +40,7 @@ static locale_t loc;
> void
> _mesa_locale_init(void)
> {
> -#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
> +#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L)
> loc = newlocale(LC_CTYPE_MASK, "C", NULL);
> #endif
> }
> @@ -48,7 +48,7 @@ _mesa_locale_init(void)
> void
> _mesa_locale_fini(void)
> {
> -#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H)
> +#if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L)
> freelocale(loc);
> #endif
> }
> @@ -60,7 +60,7 @@ _mesa_locale_fini(void)
> double
> _mesa_strtod(const char *s, char **end)
> {
> -#if defined(_GNU_SOURCE) && defined
Re: [Mesa-dev] Call for community testing: OpenGL multithreading is ready
Le mardi 18 juillet 2017, 22:57:13 CEST siyia a écrit : > > > start.sh > > > > ~30% perfomance increase > > name= siyia > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] configure fails to find llvm since recent llvm commit.
Le lundi 3 juillet 2017, 13:53:12 CEST Andy Furniss a écrit : > Don't know if mesa needs changing or it's an llvm needs fixing issue, > but since llvm commit > > commit 78fbc18aed8024139cb87c5db69ab5b43dc615d6 > Author: Rafael Espindola > Date: Fri Jun 30 18:48:33 2017 + > > Completely disable git/svn version checking if not needed. > > Working with git on a branch I find it really annoying that committing > a change causes ninja to think that stuff needs to be rebuilt. > > With this change at least nothing in llvm needs to be rebuild when > something is committed. > > git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@306858 > 91177308-0d34-0410-b5e6-96231b3b80d8 > > configuring mesa bails after failing to find llvm shared libs (and gives > outdated suggestion). Shared libs are installed. > > checking for AMDGPU... yes > configure: error: Could not find llvm shared libraries: > Please make sure you have built llvm with the --enable-shared > option > and that your llvm libraries are installed in /usr/lib > If you have installed your llvm libraries to a different > directory you > can use the --with-llvm-prefix= configure flag to specify this > directory. > NOTE: Mesa is attempting to use llvm shared libraries by default. > If you do not want to build with llvm shared libraries and > instead want to > use llvm static libraries then add --disable-llvm-shared-libs > to your configure > invocation and rebuild. > ___ It's a llvm change, you need to add -DLLVM_APPEND_VC_REV=OFF when you build llvm, It should fix the issue. -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Proposal of date-based Mesa versioning for 2017
Le lundi 12 décembre 2016 19:01:12 CET, vous avez écrit : > Similar to the "libudev is no longer required by mesa" in the 13.0.0 > release notes ;-) > Sorry I could not resist. > "Sticks and stones may break my bones, but words will never hurt me." :) -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Proposal of date-based Mesa versioning for 2017
Le lundi 12 décembre 2016, 17:57:28 CET Marek Olšák a écrit :
>
> I second that. YY.AA where YY=year, AA \in {0,1,2,3}.
>
> Marek
I agree, using month is really confusing
--
Laurent Carlier
http://www.archlinux.org
signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Mesa 13.0.1 release candidate
Le vendredi 11 novembre 2016, 18:13:25 CET Emil Velikov a écrit : > Hello list, > > The candidate for the Mesa 12.0.4 is now available. Currently we have: > - 51 queued > - 18 nominated (outstanding) > - and 0 (self-)rejected patches > > As one can imagine huge hunk of the commits are fixes in the Vulkan drivers. > > Up-to 30% performance increase using the Intel ANV Vulkan driver. The Radeon > RADV Vulkan driver now ships with distinctly named json files, which > include the full Vulkan driver path. Making it possible for people to > install and use the drivers outside their /usr/lib directory. > > RADV correctly advertises support for the Xlib platform extension and one > can use it alongside the Dolphin emulator. ANV and RADV have improved > handling of Xlib/XCB connections and advertise the currect versions of the > extensions they support. > > We also have restored interop between third party OpenCL implementations and > Mesa's libGL/libEGL. The GLX GLVND driver has a few noticable fixes as > well. > > Take a look at section "Mesa stable queue" for more information. > > > Testing reports/general approval > > Any testing reports (or general approval of the state of the branch) will be > greatly appreciated. > > The plan is to have 13.0.1 this Sunday (13th of November), around or > shortly after > 18:00 GMT. > > If you have any questions or suggestions - be that about the current patch > queue or otherwise, please go ahead. > Could you add these commits, fixing segfault with gallium HUD and lm_sensors: 6ffed086795aaa84ab35668bb59d712cdde34da3 5a58323064b32442e2de23c95642bc421be696f8 381edca826ee27b1a49f19b0731c777bdf241b20 https://lists.freedesktop.org/archives/mesa-dev/2016-November/134561.html Thanks -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] clover: fix building since llvm r286566
pretty trivial fix --- src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp | 5 + 1 file changed, 5 insertions(+) diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp index 108f8d5..8e89a49 100644 --- a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp +++ b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp @@ -37,7 +37,12 @@ #include "util/algorithm.hpp" #include +#if HAVE_LLVM < 0x0400 #include +#else +#include +#include +#endif #include using namespace clover; -- 2.10.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/3] gallium/hud: fix a problem where objects are free'd while in use.
Le lundi 7 novembre 2016, 18:32:07 CET Nicolai Hähnle a écrit : > Looks good to me as well, and pushed! Thanks for the respin and sorry it > took so long. > > Cheers, > Nicolai > Maybe cc 13.0 ? It's buggy with 13.0 and it will be a nice fix -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] st_glsl_to_tgsi: only skip over slots of an input array that are present
Le 25/07/2016 à 18:08, Nicolai Hähnle a écrit : > From: Nicolai Hähnle > > When an application declares varying arrays but does not actually do any > indirect indexing, some array indices may end up unused in the consuming > shader, so the number of input slots that correspond to the array ends > up less than the array_size. This fixes Overlord rendering issues. You should add this and the upstream bug report: https://github.com/virtual-programming/overlord-linux/issues/2 -- Laurent Carlier http://www.archlinux.org signature.asc Description: OpenPGP digital signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Mesa (master): Revert "egl: Check if API is supported when using eglBindAPI."
Le 06/06/2016 à 11:19, Emil Velikov a écrit : > Fully agree behind that one. > > On the overall topic here is a (related) idea I've had lying around: > - Contact distribution maintainers to patch their glamor packages as > far back as possible. > Having a mesa-maintainers ML or alike might help, they are likely to > miss this in mesa-dev, plus pinging individuals does not scale. > - Decide on transition period, where we'll have a) the patch reverted > or b) a glamor hack in place. > - Transition period is over - patch is back in/hack is out. > > The communication medium can be used to get the maintainers attention > to other topics that directly concern them. They could also voice > their like/dislike towards X and Y. > This could be with the mesa release announcement with a link to the xorg patch? > How does the above sound ? > Emil > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev > -- Laurent Carlier http://www.archlinux.org signature.asc Description: OpenPGP digital signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 05/25] anv: remove custom rule to install the intel_icd.json
Le jeudi 21 avril 2016, 14:16:05 CEST Emil Velikov a écrit : > From: Emil Velikov > > Autoconf already does the exact same thing as the manually written rule. > > Signed-off-by: Emil Velikov > --- > > IMHO we can/should nuke --with-vulkan-icddir all together and/or > change it to /usr/share vs /etc (according to the Vulkan docs). If there > is something to control that should be the location of the module, right? > > -Emil > This should fix https://bugs.freedesktop.org/show_bug.cgi?id=94969 -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] anv: honor DESTDIR when installing icd file
https://bugs.freedesktop.org/show_bug.cgi?id=94969 --- src/intel/vulkan/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index cba6671..5aedef8 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -209,4 +209,4 @@ libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD) include $(top_srcdir)/install-lib-links.mk install-data-local: - $(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(VULKAN_ICD_INSTALL_DIR)/intel_icd.json + $(INSTALL_DATA) -D $(srcdir)/intel_icd.json $(DESTDIR)/$(VULKAN_ICD_INSTALL_DIR)/intel_icd.json -- 2.8.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] anv: fix building on i686 with -mcpu=generic
mcpu=generic doesn't enable sse2, and anvil definitly needs it --- src/intel/vulkan/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index cba6671..a84be72 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -67,7 +67,7 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/intel -libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init +libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init -msse2 VULKAN_SOURCES =\ anv_allocator.c \ -- 2.8.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] radeonsi: gate PIPE_CAP_SHADER_BUFFER_OFFSET_ALIGNMENT by LLVM version
Le mercredi 13 avril 2016, 09:16:48 CEST Nicolai Hähnle a écrit : > From: Nicolai Hähnle > > Otherwise we incorrectly claim ARB_ssbo support even with older LLVM > versions. --- And probably add https://bugs.freedesktop.org/show_bug.cgi?id=94917 ? -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH v2 0/8] gallium, radeonsi: raise number of samplers to 32
Le jeudi 7 avril 2016, 12:35:07 CEST Nicolai Hähnle a écrit : > Hi, > > following feedback from Brian and Bas, minor changes to make the series more > paranoid: three v2 patches and one new patch, using 1u << idx instead of 1 > << idx and adding assert(sizeof(bitfield) * 8 >= PIPE_MAX_SAMPLERS) in a > number of places. > > Thanks, > Nicolai > Tested your first serie with Compagny of Heroes 2 and the corruption is fixed, also quickly tested Metro LL Redux and Painkiller H&D without seeing regression. -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] radeonsi: avoid crash when a sampler state is bound for a buffer texture
Le vendredi 11 mars 2016, 11:17:21 CET Nicolai Hähnle a écrit : > From: Nicolai Hähnle > > Sampler states don't really make sense with buffer textures, but the PBO > upload code sets one because apparently nouveau needs it. It would be > nice to work that out at some point, but in any case being defensive > here is a good idea. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94284 > Cc: mesa-sta...@lists.freedesktop.org > --- > src/gallium/drivers/radeonsi/si_descriptors.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c > b/src/gallium/drivers/radeonsi/si_descriptors.c index 9aa4877..f5ad113 > 100644 > --- a/src/gallium/drivers/radeonsi/si_descriptors.c > +++ b/src/gallium/drivers/radeonsi/si_descriptors.c > @@ -324,6 +324,7 @@ static void si_bind_sampler_states(struct pipe_context > *ctx, unsigned shader, */ > if (samplers->views.views[i] && > samplers->views.views[i]->texture && > + samplers->views.views[i]->texture->target != PIPE_BUFFER && > ((struct > r600_texture*)samplers->views.views[i]->texture)->fmask.size) continue; That fixed bug 94284, thanks -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] gallium AoA support and indirect sampler fixes
2016-02-07 15:13 GMT+01:00 Laurent Carlier : > Le vendredi 5 février 2016, 13:40:26 CET Dave Airlie a écrit : > > Hi, > > > > In fixing some indirect sampler issues with ARB_gpu_shader5, > > I realised AoA was mostly fixed as well by the same things. > > > > Ilia made me fix atomics as well. > > > > So thise patch set enables AoA support on all gallium drivers > > exposing GLSL 1.30. > > > > Dave. > > > > ___ > > mesa-dev mailing list > > mesa-dev@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > > I 've quickly tested the series, Shadow of Mordor segfault on start and > first > intro movie from witcher 2 is greenish then it segfault. > > On top of mesa-git with llvm-svn (both trunk) and amdgpu/kernel-4.5rc2 > -- > Laurent Carlier > http://www.archlinux.org Here is the backtrace from Shadow of Morder with gdb: Program received signal SIGTRAP, Trace/breakpoint trap. [Switching to Thread 0x7fffca5b9700 (LWP 30471)] 0x7fffe92c81f6 in _debug_assert_fail (expr=expr@entry=0x7fffe94843f0 "idx < (int)ARRAY_SIZE(v->sampler_types)", file=file@entry=0x7fffe9483a18 "state_tracker/st_glsl_to_tgsi.cpp", line=line@entry=4033, function=function@entry=0x7fffe9485f00 "count_resources") at util/u_debug.c:324 324os_abort(); (gdb) bt full #0 0x7fffe92c81f6 in _debug_assert_fail (expr=expr@entry=0x7fffe94843f0 "idx < (int)ARRAY_SIZE(v->sampler_types)", file=file@entry=0x7fffe9483a18 "state_tracker/st_glsl_to_tgsi.cpp", line=line@entry=4033, function=function@entry=0x7fffe9485f00 "count_resources") at util/u_debug.c:324 No locals. #1 0x7fffe915a8a2 in count_resources (prog=0x7fff8d8804e0, v=0x7fff8d8849c0) at state_tracker/st_glsl_to_tgsi.cpp:4033 idx = i = inst = 0x7fff8d883750 #2 get_mesa_program (ctx=ctx@entry=0xbde0d20, shader_program=shader_program@entry=0x7fff8d7f90b0, shader=0x7fff8d8800d0) at state_tracker/st_glsl_to_tgsi.cpp:6158 v = 0x7fff8d8849c0 prog = 0x7fff8d8804e0 progress = options = pscreen = stfp = stgp = sttcp = sttep = __PRETTY_FUNCTION__ = "gl_program* get_mesa_program(gl_context*, gl_shader_program*, gl_shader*)" #3 0x7fffe9161054 in st_link_shader (ctx=0xbde0d20, prog=0x7fff8d7f90b0) at state_tracker/st_glsl_to_tgsi.cpp:6398 linked_prog = 0x0 i = 4 pscreen = 0xb86fb30 __PRETTY_FUNCTION__ = "GLboolean st_link_shader(gl_context*, gl_shader_program*)" #4 0x7fffe917823a in _mesa_glsl_link_shader (ctx=0xbde0d20, prog=0x7fff8d7f90b0) at program/ir_to_mesa.cpp:2963 i = #5 0x7fffe909357a in link_program (ctx=0xbde0d20, program=) at main/shaderapi.c:1048 shProg = __func__ = "link_program" #6 0x0243a81a in ?? () No symbol table info available. #7 0x0243802c in ?? () No symbol table info available. #8 0x024385dd in ?? () No symbol table info available. #9 0x021da358 in ?? () No symbol table info available. #10 0x021dacb4 in ?? () No symbol table info available. #11 0x021c3512 in ?? () No symbol table info available. #12 0x005a4dae in ?? () No symbol table info available. #13 0x0053f4f9 in ?? () No symbol table info available. #14 0x0053f567 in ?? () No symbol table info available. #15 0x0059ce4e in ?? () No symbol table info available. #16 0x0236c9d9 in ?? () No symbol table info available. #17 0x0252fee1 in ?? () No symbol table info available. #18 0x774ba4a4 in start_thread () from /usr/lib/libpthread.so.0 No symbol table info available. #19 0x7594d13d in clone () from /usr/lib/libc.so.6 No symbol table info available. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] gallium AoA support and indirect sampler fixes
Le vendredi 5 février 2016, 13:40:26 CET Dave Airlie a écrit : > Hi, > > In fixing some indirect sampler issues with ARB_gpu_shader5, > I realised AoA was mostly fixed as well by the same things. > > Ilia made me fix atomics as well. > > So thise patch set enables AoA support on all gallium drivers > exposing GLSL 1.30. > > Dave. > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev I 've quickly tested the series, Shadow of Mordor segfault on start and first intro movie from witcher 2 is greenish then it segfault. On top of mesa-git with llvm-svn (both trunk) and amdgpu/kernel-4.5rc2 -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] clover: fix building fix clang-3.8
https://bugs.freedesktop.org/show_bug.cgi?id=92705
v2.1: use Linker::Flags::None instead of 0 and emplace_back()
Signed-off-by: Laurent Carlier
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index d74b50d..a36dbd6 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -247,8 +247,12 @@ namespace {
// attribute. This attribute will prevent Clang from creating
// illegal uses of barrier() (e.g. Moving barrier() inside a conditional
// that is no executed by all threads) during its optimizaton passes.
+#if HAVE_LLVM >= 0x0308
+
c.getCodeGenOpts().LinkBitcodeFiles.emplace_back(llvm::Linker::Flags::None,
+ libclc_path);
+#else
c.getCodeGenOpts().LinkBitcodeFile = libclc_path;
-
+#endif
optimization_level = c.getCodeGenOpts().OptimizationLevel;
// Compile the code
--
2.6.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] clover: fix building fix clang-3.8
https://bugs.freedesktop.org/show_bug.cgi?id=92705
v2: use Linker::Flags::None instead of 0
Signed-off-by: Laurent Carlier
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index d74b50d..a36dbd6 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -247,8 +247,12 @@ namespace {
// attribute. This attribute will prevent Clang from creating
// illegal uses of barrier() (e.g. Moving barrier() inside a conditional
// that is no executed by all threads) during its optimizaton passes.
+#if HAVE_LLVM >= 0x0308
+
c.getCodeGenOpts().LinkBitcodeFiles.push_back(std::make_pair(llvm::Linker::Flags::None,
+
libclc_path));
+#else
c.getCodeGenOpts().LinkBitcodeFile = libclc_path;
-
+#endif
optimization_level = c.getCodeGenOpts().OptimizationLevel;
// Compile the code
--
2.6.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] clover: fix building fix clang-3.8
https://bugs.freedesktop.org/show_bug.cgi?id=92705
Signed-off-by: Laurent Carlier
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index d74b50d..e5bee03 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -247,7 +247,12 @@ namespace {
// attribute. This attribute will prevent Clang from creating
// illegal uses of barrier() (e.g. Moving barrier() inside a conditional
// that is no executed by all threads) during its optimizaton passes.
+#if HAVE_LLVM >= 0x0308
+ // passing 0 means llvm::Linker::Flags::None
+ c.getCodeGenOpts().LinkBitcodeFiles.push_back(std::make_pair(0,
libclc_path));
+#else
c.getCodeGenOpts().LinkBitcodeFile = libclc_path;
+#endif
optimization_level = c.getCodeGenOpts().OptimizationLevel;
--
2.6.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] radeonsi: add support for ARB_texture_view
Le Saturday 17 October 2015, 15:09:13 Marek Olšák a écrit : > From: Marek Olšák > > All tests pass. We don't need to do much - just set CUBE if the view > target is CUBE or CUBE_ARRAY, otherwise set the resource target. > > The reason this is so simple can be that texture instructions > have a greater effect on the target than the sampler view. > > Thanks Glenn for the piglit test. gl3.txt update is missing -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] configure.ac: handle llvm built with cmake in one shared library
llvm can be built with cmake in a libray with the name libLLVM.so.$version
Tested with both llvm-3.7.0 and llvm-3.8.0svn
v2: check and use llvm build-system feature, update comments
Signed-off-by: Laurent Carlier
---
configure.ac | 60 +---
1 file changed, 37 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 217281f..6101836 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2188,39 +2188,53 @@ dnl by calling llvm-config --libs
${DRIVER_LLVM_COMPONENTS}, but
dnl this was causing the same libraries to be appear multiple times
dnl in LLVM_LIBS.
+llvm_cmake_check_libs() {
+dnl If LLVM was built with CMake, there will be one shared object per
+dnl component or one shared object.
+LLVM_SO_NAME=LLVM.$IMP_LIB_EXT.`$LLVM_CONFIG --version`
+AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME"], [llvm_have_one_so=yes])
+
+if test "x$llvm_have_one_so" = xyes; then
+dnl LLVM was built with cmake with only one shared versioned object.
+LLVM_LIBS="-l:lib$LLVM_SO_NAME"
+else
+AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT"],
+ [AC_MSG_ERROR([Could not find llvm shared libraries:
+ Please make sure you have built llvm with the --enable-shared option
+ and that your llvm libraries are installed in $LLVM_LIBDIR
+ If you have installed your llvm libraries to a different directory you
+ can use the --with-llvm-prefix= configure flag to specify this
directory.
+ NOTE: Mesa is attempting to use llvm shared libraries by default.
+ If you do not want to build with llvm shared libraries and instead want
to
+ use llvm static libraries then add --disable-llvm-shared-libs to your
configure
+ invocation and rebuild.])])
+fi
+}
+
if test "x$MESA_LLVM" != x0; then
LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`"
+dnl with llvm 3.8 we can try to determine libray name from the buildsystem
+AS_IF([test "$LLVM_VERSION_INT" -ge "308"],
[llvm_build_system="`$LLVM_CONFIG --build-system`"])
dnl llvm-config may not give the right answer when llvm is a built as a
dnl single shared library, so we must work the library name out for
dnl ourselves.
dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823)
if test "x$enable_llvm_shared_libs" = xyes; then
-dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
-LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
-AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"],
[llvm_have_one_so=yes])
-
-if test "x$llvm_have_one_so" = xyes; then
-dnl LLVM was built using auto*, so there is only one shared object.
-LLVM_LIBS="-l$LLVM_SO_NAME"
+if test "x$llvm_build_system" = xcmake; then
+llvm_cmake_check_libs
else
-dnl If LLVM was built with CMake, there will be one shared object
per
-dnl component.
-AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT"],
-[AC_MSG_ERROR([Could not find llvm shared libraries:
- Please make sure you have built llvm with the --enable-shared option
- and that your llvm libraries are installed in $LLVM_LIBDIR
- If you have installed your llvm libraries to a different directory you
- can use the --with-llvm-prefix= configure flag to specify this
directory.
- NOTE: Mesa is attempting to use llvm shared libraries by default.
- If you do not want to build with llvm shared libraries and instead want
to
- use llvm static libraries then add --disable-llvm-shared-libs to your
configure
- invocation and rebuild.])])
-
- dnl We don't need to update LLVM_LIBS in this case because the LLVM
- dnl install uses a shared object for each component and we have
- dnl already added all of these objects to LLVM_LIBS.
+dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
+LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
+AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"],
[llvm_have_one_so=yes])
+
+if test "x$llvm_have_one_so" = xyes; then
+dnl LLVM was built using auto*, so there is only one shared
object.
+LLVM_LIBS="-l$LLVM_SO_NAME"
+else
+llvm_cmake_check_libs
+fi
fi
else
AC_MSG_WARN([Building mesa with statically linked LLVM may cause
compilation issues])
--
2.6.0
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] configure.ac: handle llvm built with cmake in one shared library.
llvm can be built with cmake in a libray with the name libLLVM.so.$version Signed-off-by: Laurent Carlier --- configure.ac | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 217281f..361ffba 100644 --- a/configure.ac +++ b/configure.ac @@ -2206,8 +2206,15 @@ if test "x$MESA_LLVM" != x0; then LLVM_LIBS="-l$LLVM_SO_NAME" else dnl If LLVM was built with CMake, there will be one shared object per -dnl component. -AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT"], +dnl component or one shared object since LLVM 3.8. +LLVM_SO_NAME=LLVM.$IMP_LIB_EXT.`$LLVM_CONFIG --version` +AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME"], [llvm_have_one_so=yes]) + +if test "x$llvm_have_one_so" = xyes; then +dnl LLVM was built with cmake with only one shared versioned object. +LLVM_LIBS="-l:lib$LLVM_SO_NAME" +else +AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.$IMP_LIB_EXT"], [AC_MSG_ERROR([Could not find llvm shared libraries: Please make sure you have built llvm with the --enable-shared option and that your llvm libraries are installed in $LLVM_LIBDIR @@ -2218,9 +2225,10 @@ if test "x$MESA_LLVM" != x0; then use llvm static libraries then add --disable-llvm-shared-libs to your configure invocation and rebuild.])]) - dnl We don't need to update LLVM_LIBS in this case because the LLVM - dnl install uses a shared object for each component and we have - dnl already added all of these objects to LLVM_LIBS. +dnl We don't need to update LLVM_LIBS in this case because the LLVM +dnl install uses a shared object for each component and we have +dnl already added all of these objects to LLVM_LIBS. +fi fi else AC_MSG_WARN([Building mesa with statically linked LLVM may cause compilation issues]) -- 2.5.3 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] configure.ac: print LLVM_LDFLAGS
Le mardi 14 avril 2015, 15:19:08 Marek Olšák a écrit : > On Tue, Apr 14, 2015 at 2:55 PM, Emil Velikov wrote: > > On 14 April 2015 at 13:32, Marek Olšák wrote: > >> On Tue, Apr 14, 2015 at 2:19 PM, Emil Velikov wrote: > >>> On 13 April 2015 at 21:06, Marek Olšák wrote: > >>>> From: Marek Olšák > >>>> > >>>> --- > >>>> > >>>> configure.ac | 1 + > >>>> 1 file changed, 1 insertion(+) > >>>> > >>>> diff --git a/configure.ac b/configure.ac > >>>> index 9e8c1d8..6ccf3b4 100644 > >>>> --- a/configure.ac > >>>> +++ b/configure.ac > >>>> @@ -2543,6 +2543,7 @@ if test "x$MESA_LLVM" = x1; then > >>>> > >>>> echo "LLVM_CFLAGS: $LLVM_CFLAGS" > >>>> echo "LLVM_CXXFLAGS: $LLVM_CXXFLAGS" > >>>> echo "LLVM_CPPFLAGS: $LLVM_CPPFLAGS" > >>>> > >>>> +echo "LLVM_LDFLAGS:$LLVM_LDFLAGS" > >>> > >>> I'm puzzled - why do we need this ? Does commit message (ahem) does > >>> not mention either. > >> > >> I'd like to know what the LLVM path is for the linker. Things can go > >> crazy when building 32-bit Mesa on 64-bit and this will help to catch > >> incorrect LLVM paths before compilation. > > > > Fair enough. With the above note in the commit message: > > Reviewed-by: Emil Velikov > > > > Out of curiosity - which distro is this happening on, are you building > > your own multilib llvm ? Don't think I've ever had such issue before. > > The main problem is that there can be only one llvm-config in > /usr/bin, so you have to be sure you have installed the correct one. > If you configure for 32-bit Mesa, you need the 32-bit version of > llvm-config. Otherwise, you need the 64-bit version. Reading > LLVM_LDFLAGS is one way to know which one of the two LLVMs is being > used. > > The workaround is to use non-standard prefixes, so that both 32-bit > and 64-bit llvm-config versions don't conflict, but not everybody uses > that. > You should rename llvm-config from your 32-bit version in llvm-config32 and use LLVM_CONFIG="/usr/bin/llvm-config32" ? It the way we choose in ArchLinux > Sadly, LLVM doesn't use pkg-config. > > Marek > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 3/3] radeonsi/compute: Default to the same PIPE_SHADER_CAP values as other shader types
Le samedi 21 mars 2015, 00:35:08 Tom Stellard a écrit : > --- > src/gallium/drivers/radeonsi/si_pipe.c | 6 +- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/gallium/drivers/radeonsi/si_pipe.c > b/src/gallium/drivers/radeonsi/si_pipe.c index f1a5388..545c156 100644 > --- a/src/gallium/drivers/radeonsi/si_pipe.c > +++ b/src/gallium/drivers/radeonsi/si_pipe.c > @@ -373,8 +373,12 @@ static int si_get_shader_param(struct pipe_screen* > pscreen, unsigned shader, enu return max_const_buffer_size; > } > default: > - return 0; > + /* If compute shaders don't require a speical value There is a typo here: speical > + * for this cap, we can return the same value we > + * do for other shader types. */ > + break; > } > + break; > default: > /* TODO: support tessellation */ > return 0; -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/1] clover: Fix build after llvm r221375
Le jeudi 6 novembre 2014, 09:45:40 Tom Stellard a écrit :
> On Thu, Nov 06, 2014 at 11:46:41AM -0500, Jan Vesely wrote:
> > Signed-off-by: Jan Vesely
>
> I've pushed this, thanks!
>
> -Tom
http://llvm.org/viewvc/llvm-project?view=revision&revision=221711
Bad luck, it's reverted, so now:
CXX core/libclover_la-event.lo
CXX core/libclover_la-format.lo
CXX core/libclover_la-kernel.lo
CXX core/libclover_la-memory.lo
CXX core/libclover_la-module.lo
CXX core/libclover_la-platform.lo
CXX core/libclover_la-program.lo
CXX core/libclover_la-queue.lo
CXX core/libclover_la-resource.lo
CXX core/libclover_la-sampler.lo
CXX core/libclover_la-timestamp.lo
CXX util/libclover_la-compat.lo
CXX tgsi/libcltgsi_la-compiler.lo
CXX llvm/libclllvm_la-invocation.lo
CXXLDlibcltgsi.la
llvm/invocation.cpp: In function 'void {anonymous}::find_kernels(llvm::Module*,
std::vector&)':
llvm/invocation.cpp:286:50: error: 'const class llvm::NamedMDNode' has no
member named 'getOperandAsMDNode'
kernel_node->getOperandAsMDNode(i)-
>getOperand(0)));
^
Makefile:843: recipe for target 'llvm/libclllvm_la-invocation.lo' failed
make[3]: *** [llvm/libclllvm_la-invocation.lo] Error 1
make[3]: Leaving directory '/build/mesa-
git/src/mesa/src/gallium/state_trackers/clover'
Makefile:558: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
--
Laurent Carlier
http://www.archlinux.org
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] gallivm: Disable gallivm to fix build with LLVM 3.6
Le mardi 23 septembre 2014, 16:23:03 Tom Stellard a écrit : > LLVM commit r218316 removes the JITMemoryManager class, which is > the parent for a seemingly important class in gallivm. In order to > fix the build, I've wrapped most of lp_bld_misc.cpp in > if HAVE_LLVM < 0x0306 and modifyed the > lp_build_create_jit_compiler_for_module() function to return false > for 3.6 and newer which effectively disables the gallivm functionality. > > I realize this is overkill, but I could not come up with a simple > solution to fix the build. Also, since 3.6 will be the first release > without the old JIT, it would be really great if we could > move gallivm to use the C API only for accessing MCJIT. There > is still time before the 3.6 release to extend the C API in > case it is missing some functionality that is required by gallivm. This fix isn't enough: make[4]: Entering directory '/build/mesa-git/src/mesa/src/gallium/auxiliary' GEN indices/u_indices_gen.c GEN indices/u_unfilled_gen.c GEN util/u_format_table.c CC draw/draw_llvm.lo CC draw/draw_llvm_sample.lo CC draw/draw_vs_llvm.lo CC draw/draw_pt_fetch_shade_pipeline_llvm.lo CXX gallivm/lp_bld_debug.lo CXX gallivm/lp_bld_misc.lo gallivm/lp_bld_misc.cpp:58:51: fatal error: llvm/ExecutionEngine/JITMemoryManager.h: No such file or directory #include ^ compilation terminated. Makefile:1705: recipe for target 'gallivm/lp_bld_misc.lo' failed -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] radeon/llvm: Use the llvm.rsq.clamped intrinsic for RSQ
Le mercredi 25 juin 2014, 11:58:47 Michel Dänzer a écrit : > On 25.06.2014 09:15, Tom Stellard wrote: > > https://bugs.freedesktop.org/show_bug.cgi?id=80015 > > > > CC: "10.1 10.2" > > --- > > > > src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c > > b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c index > > 217fa32..119e613 100644 > > --- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c > > +++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c > > @@ -1385,7 +1385,7 @@ void radeon_llvm_context_init(struct > > radeon_llvm_context * ctx)> > > bld_base->rsq_action.emit = build_tgsi_intrinsic_nomem; > > > > #if HAVE_LLVM >= 0x0305 > > > > - bld_base->rsq_action.intr_name = "llvm.AMDGPU.rsq."; > > + bld_base->rsq_action.intr_name = "llvm.AMDGPU.rsq.clamped.f32"; > > > > #else > > > > bld_base->rsq_action.intr_name = "llvm.AMDGPU.rsq"; > > > > #endif > > Reviewed-and-Tested-by: Michel Dänzer Tested-by: Laurent Carlier Anyone to commit it? -- Laurent Carlier http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] radeonsi: Fix build error introduced in 5ab9a9c
Le vendredi 6 juin 2014, 22:11:43 Ian Romanick a écrit :
> From: Ian Romanick
>
> While resolving conflicts in cherry picking commit d226191, I
> accidentally introduced some garbage. Because radeonsi isn't built by
> default, the problem went unnoticed by me.
>
> Signed-off-by: Ian Romanick
> Reported-by: Laurent Carlier
> ---
>
> Laurent, can you verify that this fixes your build?
>
> src/gallium/drivers/radeonsi/si_blit.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_blit.c
> b/src/gallium/drivers/radeonsi/si_blit.c index 892ee84..1dfff49 100644
> --- a/src/gallium/drivers/radeonsi/si_blit.c
> +++ b/src/gallium/drivers/radeonsi/si_blit.c
> @@ -692,7 +692,6 @@ static bool do_hardware_msaa_resolve(struct pipe_context
> *ctx, !(dst->surface.flags & RADEON_SURF_SCANOUT) &&
> (!dst->cmask.size || !dst->dirty_level_mask) /* dst cannot be
> fast-cleared */) { si_blitter_begin(ctx, SI_COLOR_RESOLVE);
> -t-cleared
> util_blitter_custom_resolve_color(sctx->blitter,
> info->dst.resource,
> info->dst.level,
> info->dst.box.z,
Now mesa builds fine. Thanks
--
Laurent Carlier
ArchLinux Developer
http://www.archlinux.org
signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Mesa 10.2 release
Le vendredi 6 juin 2014 21:38:23, vous avez écrit : > On 06/06/2014 09:35 PM, Laurent Carlier wrote: > > Le vendredi 6 juin 2014, 21:20:12 Ian Romanick a écrit : > >> Mesa 10.2 has been released! Mesa 10.2 is a feature release that > >> includes many updates and enhancements. The full list is available in > >> the release notes file in docs/relnotes/10.2.html. > > > > It fails to build here: > What configure options did you use? Does it work if you use the same > ones I used? > http://cgit.freedesktop.org/mesa/mesa/commit/?h=10.2&id=5ab9a9c0ccff8218e9625f43a25535cf7d1d8ae0 There is a 't-cleared' to remove. It's built with --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Mesa 10.2 release
Le vendredi 6 juin 2014, 21:38:23 Ian Romanick a écrit : > On 06/06/2014 09:35 PM, Laurent Carlier wrote: > > Le vendredi 6 juin 2014, 21:20:12 Ian Romanick a écrit : > >> Mesa 10.2 has been released! Mesa 10.2 is a feature release that > >> includes many updates and enhancements. The full list is available in > >> the release notes file in docs/relnotes/10.2.html. > > > > It fails to build here: > What configure options did you use? Does it work if you use the same > ones I used? It work if i use the same ones you used. -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] Mesa 10.2 release
Le vendredi 6 juin 2014, 21:20:12 Ian Romanick a écrit : > Mesa 10.2 has been released! Mesa 10.2 is a feature release that > includes many updates and enhancements. The full list is available in > the release notes file in docs/relnotes/10.2.html. > It fails to build here: make[3]: Leaving directory '/build/mesa/src/Mesa-10.2.0/src/gallium/drivers/r600' Making all in radeonsi make[3]: Entering directory '/build/mesa/src/Mesa-10.2.0/src/gallium/drivers/radeonsi' CC si_blit.lo CC si_commands.lo CC si_compute.lo CC si_descriptors.lo si_blit.c: In function 'do_hardware_msaa_resolve': si_blit.c:695:1: error: 't' undeclared (first use in this function) t-cleared ^ si_blit.c:695:1: note: each undeclared identifier is reported only once for each function it appears in si_blit.c:695:3: error: 'cleared' undeclared (first use in this function) t-cleared ^ si_blit.c:696:3: error: expected ';' before 'util_blitter_custom_resolve_color' util_blitter_custom_resolve_color(sctx->blitter, ^ si_blit.c:668:11: warning: unused variable 'sample_mask' [-Wunused-variable] unsigned sample_mask = ~0; ^ si_blit.c:663:21: warning: unused variable 'sctx' [-Wunused-variable] struct si_context *sctx = (struct si_context*)ctx; ^ Makefile:671: recipe for target 'si_blit.lo' failed make[3]: *** [si_blit.lo] Error 1 make[3]: *** Waiting for unfinished jobs si_descriptors.c: In function 'si_emit_descriptors': si_descriptors.c:233:11: warning: 'packet_start' may be used uninitialized in this function [-Wmaybe-uninitialized] cs->buf[packet_start] = PKT3(PKT3_WRITE_DATA, packet_size, 0); ^ make[3]: Leaving directory '/build/mesa/src/Mesa-10.2.0/src/gallium/drivers/radeonsi' Makefile:525: recipe for target 'all-recursive' failed make[2]: *** [all-recursive] Error 1 make[2]: Leaving directory '/build/mesa/src/Mesa-10.2.0/src/gallium/drivers' Makefile:529: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/build/mesa/src/Mesa-10.2.0/src' Makefile:578: recipe for target 'all-recursive' failed make: *** [all-recursive] Error 1 -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] mesa: Use get_local_param_pointer in glProgramLocalParameters4fvEXT().
Le dimanche 5 janvier 2014, 20:10:17 Kenneth Graunke a écrit : > Using the get_local_param_pointer helper ensures that the LocalParams > arrays have actually been allocated before attempting to use them. > > glProgramLocalParameters4fvEXT needs to do a bit of extra checking, > but it can be simplified since the helper has already validated the > target. > > Fixes crashes in programs that use Cg (such as Awesomenauts) since > commit e5885c119de1e508099cce1c9f8ff00fab88 (mesa: Dynamically > allocate the storage for program local parameters.). > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73136 > Signed-off-by: Kenneth Graunke > Cc: Eric Anholt This fixes al least "Tiny and Big: Granpa's Leftover" and "Rocketbirds: Hardboiled Chicken" games here. -- Laurent Carlier ArchLinux Developer http://www.archlinux.org ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] clover: fix building with llvm-3.4 since rev191922
http://llvm.org/viewvc/llvm-project?view=revision&revision=191922
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index e6cd415..bdc3aee 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -278,8 +278,12 @@ namespace {
llvm::Function *kernel = *I;
export_list.push_back(kernel->getName().data());
}
+#if HAVE_LLVM < 0x0304
PM.add(llvm::createInternalizePass(export_list));
-
+#else
+ std::vector dso_list;
+ PM.add(llvm::createInternalizePass(export_list, dso_list));
+#endif
// Run link time optimizations
Builder.OptLevel = 2;
Builder.populateLTOPassManager(PM, false, true);
--
1.8.4
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] R600/SI: Fix another case of illegal VGPR to SGPR copy
Le mercredi 21 août 2013 14:00:12 Tom Stellard a écrit : > From: Tom Stellard > > This fixes a crash in Unigine Tropics. > --- This fixes the following failure and now Tropics woks fine for me: Tropics: SIInstrInfo.cpp:94: virtual void llvm::SIInstrInfo::copyPhysReg(llvm::MachineBasicBlock&, llvm::MachineBasicBlock::iterator, llvm::DebugLoc, unsigned int, unsigned int, bool) const: Assertion `AMDGPU::SReg_32RegClass.contains(SrcReg)' failed. Stack dump: 0. Running pass 'Function Pass Manager' on module 'tgsi'. 1. Running pass 'Post-RA pseudo instruction expansion pass' on function -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 2/2] radeonsi: Always pre-load separate VGPRs for centroid vs. center interpolation
Le lundi 19 août 2013 16:08:57 Michel Dänzer a écrit : > From: Michel Dänzer > > The LLVM R600 backend currently always uses separate VGPRs for these. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68162 > (Centroid interpolation is identical to center interpolation without > multisampling, so the shader hardware was only pre-loading one set of > interpolation coefficients, and the pixel shader code was using > uninitialized values as the centroid interpolation coefficients) > > Cc: mesa-sta...@lists.freedesktop.org > Signed-off-by: Michel Dänzer > --- Tested both patches, and they are fixing Portal, Counter Strike:Source, Half Life 2 -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] radeonsi: Don't leave gaps between position exports from vertex shader
Le vendredi 16 août 2013 10:59:13 Michel Dänzer a écrit : > On Fre, 2013-08-09 at 23:41 +0200, Laurent Carlier wrote: > > Le vendredi 9 août 2013 18:50:20 Michel Dänzer a écrit : > > > From: Michel Dänzer > > > > > > Exporting position 2/3 (clip distances) but not position 1 (point size) > > > causes geometry corruption for some reason. > > > > > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66974 > > > > > > Cc: mesa-sta...@lists.freedesktop.org > > > Signed-off-by: Michel Dänzer > > > > Tested with Dota2 and L4D2, and it fixes the rendering > > Thanks for testing. Did you overlook the corruption you reported in > https://bugs.freedesktop.org/show_bug.cgi?id=68162 when you tested that > series, or was it not there? I've been looking into that as well, but > haven't found the problem yet. The problem was already there, because i've noticed similar corruption months ago with a R600g card (HD6870) with r600-llvm-compiler enabled. This problam was difficult to notice on radeonsi before your fix because of broken rendering. -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] radeonsi: Don't leave gaps between position exports from vertex shader
Le vendredi 9 août 2013 18:50:20 Michel Dänzer a écrit : > From: Michel Dänzer > > Exporting position 2/3 (clip distances) but not position 1 (point size) > causes geometry corruption for some reason. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66974 > > Cc: mesa-sta...@lists.freedesktop.org > Signed-off-by: Michel Dänzer Tested with Dota2 and L4D2, and it fixes the rendering -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] Remove TargetOptions.RealignStack for llvm>=3.4
Since llvm -3.4svn r187618, TargetOptions doesn't provide anymore RealignStack, so only enable it with llvm<3.4 --- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index e09bb78..e8d2db2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -273,8 +273,10 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, TargetOptions options; #if defined(PIPE_ARCH_X86) options.StackAlignmentOverride = 4; +#if HAVE_LLVM < 0x0304 options.RealignStack = true; #endif +#endif #if defined(DEBUG) options.JITEmitDebugInfo = true; -- 1.8.3.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] mesa fail to build since llvm-3.4svn r187618
Since llvm-3.4svn r187618 TargetOptions doesn't provide anymore RealignStack: make[3]: Entering directory `/home/lordh/archdevel/mesa/git/mesatst/src/gallium/auxiliary' CXX gallivm/lp_bld_misc.lo gallivm/lp_bld_misc.cpp: In function 'LLVMBool lp_build_create_jit_compiler_for_module(LLVMOpaqueExecutionEngine**, LLVMModuleRef, unsigned int, int, char**)': gallivm/lp_bld_misc.cpp:276:12: error: 'class llvm::TargetOptions' has no member named 'RealignStack' options.RealignStack = true; ^ make[3]: *** [gallivm/lp_bld_misc.lo] Error 1 Commenting the line seems to fix the problem -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 2/2] radeonsi: Use pointers rather than resource descriptors for shader constants v3
186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: CPU3: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: CPU4: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: CPU5: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: Node 0 Normal per-cpu: Aug 06 11:08:12 archMain kernel: CPU0: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: CPU1: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: CPU2: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: CPU3: hi: 186, btch: 31 usd: 28 Aug 06 11:08:12 archMain kernel: CPU4: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: CPU5: hi: 186, btch: 31 usd: 0 Aug 06 11:08:12 archMain kernel: active_anon:1319503 inactive_anon:448794 isolated_anon:0 active_file:13755 inactive_file:13477 isolated_file:0 unevictable:37 dirty:722 writeback:0 unstable:0 free:35116 slab_reclaimable:16819 slab_unreclaimable:24942 mapped:34099 shmem:13836 pagetables:15410 bounce:0 free_cma:0 Aug 06 11:08:12 archMain kernel: Node 0 DMA free:15872kB min:128kB low:160kB high:192kB active_anon:0kB inactive_anon:0kB active_file:0kB inactive_file:0kB unevictable:0kB isolated(anon):0kB isolated(file):0kB present:15972kB managed:158 Aug 06 11:08:12 archMain kernel: lowmem_reserve[]: 0 3233 7968 7968 Aug 06 11:08:12 archMain kernel: Node 0 DMA32 free:61444kB min:27372kB low:34212kB high:41056kB active_anon:2058304kB inactive_anon:957380kB active_file:12504kB inactive_file:12020kB unevictable:132kB isolated(anon):0kB isolated(file):0k Aug 06 11:08:12 archMain kernel: lowmem_reserve[]: 0 0 4734 4734 Aug 06 11:08:12 archMain kernel: Node 0 Normal free:63148kB min:40076kB low:50092kB high:60112kB active_anon:3219708kB inactive_anon:837796kB active_file:42516kB inactive_file:41888kB unevictable:16kB isolated(anon):0kB isolated(file):0k Aug 06 11:08:12 archMain kernel: lowmem_reserve[]: 0 0 0 0 Aug 06 11:08:12 archMain kernel: Node 0 DMA: 0*4kB 0*8kB 0*16kB 0*32kB 2*64kB (U) 1*128kB (U) 1*256kB (U) 0*512kB 1*1024kB (U) 1*2048kB (R) 3*4096kB (M) = 15872kB Aug 06 11:08:12 archMain kernel: Node 0 DMA32: 1194*4kB (UEM) 115*8kB (UEM) 3105*16kB (UEM) 202*32kB (M) 1*64kB (M) 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 61904kB Aug 06 11:08:12 archMain kernel: Node 0 Normal: 15004*4kB (UEM) 260*8kB (UM) 65*16kB (UM) 7*32kB (UM) 1*64kB (M) 0*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 63424kB Aug 06 11:08:12 archMain kernel: Node 0 hugepages_total=0 hugepages_free=0 hugepages_surp=0 hugepages_size=2048kB Aug 06 11:08:12 archMain kernel: 188367 total pagecache pages Aug 06 11:08:12 archMain kernel: 147293 pages in swap cache Aug 06 11:08:12 archMain kernel: Swap cache stats: add 2106427, delete 1959134, find 1134141/1247396 Aug 06 11:08:12 archMain kernel: Free swap = 19736044kB Aug 06 11:08:12 archMain kernel: Total swap = 22557396kB Aug 06 11:08:12 archMain kernel: 2097151 pages RAM Aug 06 11:08:12 archMain kernel: 52600 pages reserved Aug 06 11:08:12 archMain kernel: 1482060 pages shared Aug 06 11:08:12 archMain kernel: 1899474 pages non-shared Aug 06 11:08:12 archMain kernel: [drm:radeon_cs_ioctl] *ERROR* Failed to parse relocation -12! Aug 06 11:08:14 archMain kernel: traps: DungeonDefender[15927] trap int3 ip:f5756ad4 sp:f06fe050 error:0 -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 2/2] radeonsi: Use pointers rather than resource descriptors for shader constants v3
Le lundi 5 août 2013 14:58:44 Tom Stellard a écrit : > From: Tom Stellard > > The TGSI->LLVM pass for radeonsi preloads constants and relies on LLVM's > sinking pass to reduce SGPR usage by lowering constant reads to an > optimal place in the code. However, LLVM's machine sink pass will not > lower instructions that have been selected from llvm.SI.load.const > intrinsics, because these instructions do not have a MachineMemOperand, > which LLVM needs in order to determine whether or not it is safe to sink > a load. Replacing this intrinsic with a real load instruction will > enable the sinking optimization and probably a few others. > > The other advantages of using pointers are: > + Reduced register usage (pointers take 2 registers, descriptors take 4) > + More code sharing with compute > > This should also fix some crashes due to the compiler running out of > registers like in this bug: > > https://bugs.freedesktop.org/show_bug.cgi?id=66805 > > v2: > - Mark constant loads as invariant, so the machine sink pass will > actually lower them. > > v3: > - Correctly specify the invariant.load metadata > --- Both patches are working properly with Portal, but got these with Dungeon Defenders (game segfault before the game menu): si_state_draw.c:242:si_pipe_shader_ps: Assertion `num_sgprs <= 104' failed. si_state_draw.c:242:si_pipe_shader_ps: Assertion `num_sgprs <= 104' failed. Steam: An X Error occurred X Error of failed request: BadWindow (invalid Window parameter) Major opcode of failed request: 40 (X_TranslateCoords) Resource id in failed request: 0x1cfa9cb Serial number of failed request: 116812 xerror_handler: X failed, continuing Game removed: AppID 65800 "Dungeon Defenders", ProcID 1078 -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 4/4] mesa/program: Switch from the deprecated YYLEX_PARAM to %lex-param.
Attached patch fixes latest failure:
program_parse.tab.c:1958:3: error: implicit declaration of function 'YYID' [-
Werror=implicit-function-declaration]
YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
^
--
Laurent Carlier
ArchLinux Developer
http://www.archlinux.org>From e3c19953c2f8ab5afe473b6080dcc29fdbebd50c Mon Sep 17 00:00:00 2001
From: Laurent Carlier
Date: Wed, 31 Jul 2013 15:18:52 +0200
Subject: [PATCH 7/7] mesa/program: remove useless YYID
This fixes the build with Bison 3.0. Also works with Bison 2.7.1.
---
src/mesa/program/program_parse.y | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y
index e2da633..80f1998 100644
--- a/src/mesa/program/program_parse.y
+++ b/src/mesa/program/program_parse.y
@@ -98,7 +98,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
#define YYLLOC_DEFAULT(Current, Rhs, N) \
do { \
- if (YYID(N)) { \
+ if (N) { \
(Current).first_line = YYRHSLOC(Rhs, 1).first_line; \
(Current).first_column = YYRHSLOC(Rhs, 1).first_column; \
(Current).position = YYRHSLOC(Rhs, 1).position; \
@@ -112,7 +112,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
(Current).position = YYRHSLOC(Rhs, 0).position \
+ (Current).first_column; \
} \
- } while(YYID(0))
+ } while(0)
#define YYLEX_PARAM state->scanner
%}
--
1.8.3.4
signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/4] glsl: Change the lexer's namespace.
Le lundi 29 juillet 2013 16:07:35 Kenneth Graunke a écrit :
> Bison 3.0 removes the YYLEX_PARAM macro. In preparation for handling
> this using %lex-param, the parser needs a wrapper function for the
> actual Flex lex() function.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67354
> Signed-off-by: Kenneth Graunke
> Cc: mesa-sta...@lists.freedesktop.org
> Cc: Sandeep
> Cc: Bruno Jacquet
> Cc: Laurent Carlier
> Cc: Nikita Malyavin
> ---
> src/glsl/glsl_lexer.ll| 2 +-
> src/glsl/glsl_parser.yy | 6 ++
> src/glsl/glsl_parser_extras.h | 4 ++--
> 3 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll
> index 9375230..e24df80 100644
> --- a/src/glsl/glsl_lexer.ll
> +++ b/src/glsl/glsl_lexer.ll
> @@ -149,7 +149,7 @@ literal_integer(char *text, int len, struct
> _mesa_glsl_parse_state *state, %option bison-bridge bison-locations
> reentrant noyywrap
> %option nounput noyy_top_state
> %option never-interactive
> -%option prefix="_mesa_glsl_"
> +%option prefix="_mesa_glsl_lexer_"
> %option extra-type="struct _mesa_glsl_parse_state *"
>
> %x PP PRAGMA
> diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
> index bf31236..0b16d1d 100644
> --- a/src/glsl/glsl_parser.yy
> +++ b/src/glsl/glsl_parser.yy
> @@ -39,6 +39,12 @@ static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state
> *st, const char *msg) {
> _mesa_glsl_error(loc, st, "%s", msg);
> }
> +
> +static int
> +_mesa_glsl_lex(YYSTYPE *val, YYLTYPE *loc, void *scanner)
> +{
> + return _mesa_glsl_lexer_lex(val, loc, scanner);
> +}
> %}
>
> %expect 0
> diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
> index 7f478df..1e386dd 100644
> --- a/src/glsl/glsl_parser_extras.h
> +++ b/src/glsl/glsl_parser_extras.h
> @@ -337,8 +337,8 @@ extern void _mesa_glsl_lexer_ctor(struct
> _mesa_glsl_parse_state *state, extern void _mesa_glsl_lexer_dtor(struct
> _mesa_glsl_parse_state *state);
>
> union YYSTYPE;
> -extern int _mesa_glsl_lex(union YYSTYPE *yylval, YYLTYPE *yylloc,
> - void *scanner);
> +extern int _mesa_glsl_lexer_lex(union YYSTYPE *yylval, YYLTYPE *yylloc,
> +void *scanner);
>
> extern int _mesa_glsl_parse(struct _mesa_glsl_parse_state *);
Got the following error with bison3:
make[4]: Leaving directory `/build/mesa-git/src/mesa/src/glsl'
make[3]: Leaving directory `/build/mesa-git/src/mesa/src/glsl'
make[2]: Leaving directory `/build/mesa-git/src/mesa/src/glsl'
Making all in mesa
make[2]: Entering directory `/build/mesa-git/src/mesa/src/mesa'
GEN main/get_hash.h
updating main/git_sha1.h
make all-recursive
make[3]: Entering directory `/build/mesa-git/src/mesa/src/mesa'
Making all in program
make[4]: Entering directory `/build/mesa-git/src/mesa/src/mesa/program'
GEN program_parse.tab.c
GEN program_parse.tab.h
GEN lex.yy.c
make all-am
make[5]: Entering directory `/build/mesa-git/src/mesa/src/mesa/program'
CC libdricore_program_la-arbprogparse.lo
CC libdricore_program_la-prog_hash_table.lo
CXX libdricore_program_la-ir_to_mesa.lo
CC libdricore_program_la-program.lo
CC libdricore_program_la-program_parse_extra.lo
CC libdricore_program_la-prog_cache.lo
CC libdricore_program_la-prog_execute.lo
CC libdricore_program_la-prog_instruction.lo
CC libdricore_program_la-prog_noise.lo
CC libdricore_program_la-prog_optimize.lo
CC libdricore_program_la-prog_opt_constant_fold.lo
CC libdricore_program_la-prog_parameter.lo
CC libdricore_program_la-prog_parameter_layout.lo
CC libdricore_program_la-prog_print.lo
CC libdricore_program_la-prog_statevars.lo
CC libdricore_program_la-programopt.lo
CC libdricore_program_la-register_allocate.lo
CXX libdricore_program_la-sampler.lo
CXX libdricore_program_la-string_to_uint_map.lo
CC libdricore_program_la-symbol_table.lo
CC libdricore_program_la-lex.yy.lo
CC libdricore_program_la-program_parse.tab.lo
CC arbprogparse.lo
CC prog_hash_table.lo
program_parse.tab.c: In function '_mesa_program_parse':
program_parse.tab.c:1958:3: error: implicit declaration of function 'YYID' [-
Werror=implicit-function-declaration]
YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
^
cc1: some warnings being treated as errors
make[5]: *** [libdricore_program_la-program_parse.tab.lo] Error 1
make[5]: *** Waiting for unfinished jobs
make[5]: Leaving directory `/build/mesa-git/src/mesa/src/mesa/program'
make[4]: *** [all] Error 2
make[4]: Leaving directory `/build/
Re: [Mesa-dev] Error building Mesa 32 bit version on Arch Linux
Le samedi 27 juillet 2013 18:03:44 Sandeep a écrit : > Hi, > > When I try to build 32 bit Mesa on Arch Linux, I get the following error: > > /usr/bin/mkdir -p ../../src/glsl/glcpp > /usr/bin/mkdir -p ../../src/glsl/glcpp > YACC glcpp/glcpp-parse.c > LEX glsl_lexer.cpp > YACC glsl_parser.cpp > LEX glcpp/glcpp-lex.c > make all-recursive > make[3]: Entering directory `/home/user/src/mesa/src/glsl' > Making all in builtin_compiler > make[4]: Entering directory `/home/user/src/mesa/src/glsl/builtin_compiler' > CXX glsl_parser.lo > CXX glsl_lexer.lo > CXX ast_array_index.lo > CXX ast_expr.lo > glsl_parser.cpp: In function 'int > _mesa_glsl_parse(_mesa_glsl_parse_state*)': > glsl_parser.cpp:2616:41: error: 'scanner' was not declared in this scope > > This error happens even if I try building at a commit 4 weeks ago. I'm sure > I was able to get Mesa to build atleast 1-2 weeks ago. I'm not sure if this > is a recent bug introduced in Mesa code, or if it's because of some other > software like bison/lex being buggy. > > glsl_parser.cpp doesn't seem to be part of the source code, I'm guessing > it's automatically generated from glsl_parser.yy as part of the build > process. Any ideas on how I can resolve this problem? > > -Sandeep Because now ArchLinux uses bison 3.0 in testing https://bugs.freedesktop.org/show_bug.cgi?id=67354 -- Laurent Carlier ArchLinux Developer http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] Security fixes applied in mesa trunk
Two security fixes were applied recently (CVE-2013-1993), it would be nice to see a new mesa stable release with these fixes applied. Thanks. -- Laurent Carlier ArchLinux Trusted User http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] gallivm: Fix build with LLVM >= 3.4 r181680.
Le dimanche 12 mai 2013 20:37:17 Vinson Lee a écrit : > Signed-off-by: Vinson Lee > --- > src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp > b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 86617d4..1c886ea > 100644 > --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp > +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp > @@ -212,7 +212,9 @@ disassemble(const void* func, llvm::raw_ostream & Out) > std::string Error; > const Target *T = TargetRegistry::lookupTarget(Triple, Error); > > -#if HAVE_LLVM >= 0x0300 > +#if HAVE_LLVM >= 0x0304 > + OwningPtr > AsmInfo(T->createMCAsmInfo(*T->createMCRegInfo(Triple), Triple)); +#elif > HAVE_LLVM >= 0x0300 > OwningPtr AsmInfo(T->createMCAsmInfo(Triple)); > #else > OwningPtr AsmInfo(T->createAsmInfo(Triple)); Works fine here. Tested-by: Laurent Carlier -- Laurent Carlier ArchLinux Trusted User http://www.archlinux.org signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] [r200] fix building regression introduces with 9a32203e1618486e87c7baf494134e05f0e38cf3
Signed-off-by: Laurent Carlier
---
src/mesa/drivers/dri/r200/r200_vertprog.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c
b/src/mesa/drivers/dri/r200/r200_vertprog.c
index ee867c2..461b7cb 100644
--- a/src/mesa/drivers/dri/r200/r200_vertprog.c
+++ b/src/mesa/drivers/dri/r200/r200_vertprog.c
@@ -95,7 +95,6 @@ static struct{
OPN(SUB, 2),
OPN(SWZ, 1),
OPN(XPD, 2),
- OPN(PRINT, 0),
OPN(END, 0),
};
#undef OPN
--
1.8.2.1
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] r200: fix build failure introduced with cbbcb0247e6aa8d7adc274a94206ee02f9c70bea
---
src/mesa/drivers/dri/r200/r200_swtcl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c
b/src/mesa/drivers/dri/r200/r200_swtcl.c
index 274e338..0f1e013 100644
--- a/src/mesa/drivers/dri/r200/r200_swtcl.c
+++ b/src/mesa/drivers/dri/r200/r200_swtcl.c
@@ -257,7 +257,7 @@ void r200ChooseVertexState( struct gl_context *ctx )
* bigger one.
*/
if ((0 == (tnl->render_inputs_bitset & BITFIELD64_RANGE(_TNL_ATTRIB_TEX0,
_TNL_NUM_TEX)))
- || (ctx->_TriangleCaps & DD_TRI_LIGHT_TWOSIDE)
+ || twosided
|| unfilled) {
rmesa->swtcl.needproj = GL_TRUE;
vte |= R200_VTX_XY_FMT | R200_VTX_Z_FMT;
--
1.8.2.1
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] radeon fail to link to libdricore
mesa from git/x86_64;
with the following install script:
make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
# gallium3D driver for r300,r600
make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
Produce:
---8<---
make: Entering directory `/build/src/mesa-git/src/mesa/drivers/dri/radeon'
/bin/mkdir -p ../../../../../lib;
ln -f .libs/radeon_dri.so ../../../../../lib/radeon_dri.so;
make[1]: Entering directory `/build/src/mesa-git/src/mesa/drivers/dri/radeon'
make[1]: Nothing to be done for `install-exec-am'.
/bin/mkdir -p '/build/pkg/ati-dri-git/usr/lib/xorg/modules/dri'
/bin/sh ../../../../../libtool --mode=install /usr/bin/install -c
radeon_dri.la '/build/pkg/ati-dri-git/usr/lib/xorg/modules/dri'
libtool: install: warning: relinking `radeon_dri.la'
libtool: install: (cd /build/src/mesa-git/src/mesa/drivers/dri/radeon; /bin/sh
/build/src/mesa-git/libtool --silent --tag CC --mode=relink gcc -DRADEON_R100
-I../../../../../include -I../../../../../src/ -I../../../../../src/mapi -
I../../../../../src/mesa/ -I../../../../../src/mesa/drivers/dri/common -
I../../../../../src/mesa/drivers/dri/radeon/server -D_GNU_SOURCE -DPTHREADS -
DTEXTURE_FLOAT_ENABLED -DUSE_X86_64_ASM -DHAVE_POSIX_MEMALIGN -DIN_DRI_DRIVER
-DUSE_XCB -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DGLX_USE_TLS -
DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -
DHAVE_MINCORE -DHAVE_LIBUDEV -DHAVE_LLVM=0x0301 -DFEATURE_GL=1 -DFEATURE_ES1=1
-DFEATURE_ES2=1 -I/usr/include/libdrm -march=x86-64 -mtune=generic -O2 -pipe -
fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -Wall -std=c99
-Werror=implicit-function-declaration -Werror=missing-prototypes -fno-strict-
aliasing -fno-builtin-memcmp -march=x86-64 -mtune=generic -O2 -pipe -fstack-
protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -module -avoid-version
-shared -Wl,-O1,--sort-common,--as-needed,-z,relro -o radeon_dri.la -rpath
/usr/lib/xorg/modules/dri radeon_buffer_objects.lo radeon_common_context.lo
radeon_common.lo radeon_dma.lo radeon_debug.lo radeon_fbo.lo radeon_fog.lo
radeon_mipmap_tree.lo radeon_pixel_read.lo radeon_queryobj.lo radeon_span.lo
radeon_texture.lo radeon_tex_copy.lo radeon_tile.lo radeon_context.lo
radeon_ioctl.lo radeon_screen.lo radeon_state.lo radeon_state_init.lo
radeon_tex.lo radeon_texstate.lo radeon_tcl.lo radeon_swtcl.lo radeon_maos.lo
radeon_sanity.lo radeon_blit.lo
../../../../../src/mesa/libdricore/libdricore8.1.0.la -ldrm -lexpat -lm -
lpthread -ldl -ldrm_radeon ../common/libdricommon.la -inst-prefix-dir
/build/pkg/ati-dri-git)
/usr/bin/ld: cannot find -ldricore8.1.0
collect2: error: ld returned 1 exit status
libtool: install: error: relink `radeon_dri.la' with the above command before
installing it
make[1]: *** [install-driLTLIBRARIES] Error 1
make[1]: Leaving directory `/build/src/mesa-git/src/mesa/drivers/dri/radeon'
make: *** [install-am] Error 2
make: Leaving directory `/build/src/mesa-git/src/mesa/drivers/dri/radeon'
---8<---
signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] automake: convert libOSmesa building
This also currently fix the installation of libOSmesa. v2: Remove old Makefile, libOSmesa is now versioned, fix typos v3: Keep config substitution alphabetized --- configure.ac| 5 src/mesa/drivers/osmesa/Makefile| 51 - src/mesa/drivers/osmesa/Makefile.am | 50 3 files changed, 55 insertions(+), 51 deletions(-) delete mode 100644 src/mesa/drivers/osmesa/Makefile create mode 100644 src/mesa/drivers/osmesa/Makefile.am diff --git a/configure.ac b/configure.ac index 46265a2..e5ac791 100644 --- a/configure.ac +++ b/configure.ac @@ -1370,10 +1370,14 @@ if test "x$enable_osmesa" = xyes; then OSMESA_MESA_DEPS="" OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" fi + +OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'` + AC_SUBST([OSMESA_LIB_DEPS]) AC_SUBST([OSMESA_MESA_DEPS]) AC_SUBST([OSMESA_PC_REQ]) AC_SUBST([OSMESA_PC_LIB_PRIV]) +AC_SUBST([OSMESA_VERSION]) dnl dnl gbm configuration @@ -2188,6 +2192,7 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/dri/r200/Makefile src/mesa/drivers/dri/radeon/Makefile src/mesa/drivers/dri/swrast/Makefile + src/mesa/drivers/osmesa/Makefile src/mesa/drivers/x11/Makefile src/mesa/gl.pc src/mesa/osmesa.pc]) diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile deleted file mode 100644 index 39ab09a..000 --- a/src/mesa/drivers/osmesa/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# src/mesa/drivers/osmesa/Makefile for libOSMesa.so - -# Note that we may generate libOSMesa.so or libOSMesa16.so or libOSMesa32.so -# with this Makefile - - -TOP = ../../../.. - -include $(TOP)/configs/current - - - -SOURCES = osmesa.c - -OBJECTS = $(SOURCES:.c=.o) - -INCLUDE_DIRS = \ - -I$(TOP)/include \ - -I$(TOP)/src/mapi \ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main - -CORE_MESA = \ - $(TOP)/src/mesa/libmesa.a \ - $(TOP)/src/mapi/glapi/libglapi.a \ - $(TOP)/src/glsl/libglsl.a - -.c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ - - -default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) - - -# libOSMesa can be used in conjuction with libGL or with all other Mesa -# sources. We can also build libOSMesa16/libOSMesa32 by setting -# -DCHAN_BITS=16/32. -$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA) - $(MKLIB) -o $(OSMESA_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \ - -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ - $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) - - - -clean: - -rm -f *.o *~ - - -# XXX todo install rule? diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am new file mode 100644 index 000..863c8f7 --- /dev/null +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -0,0 +1,50 @@ + + +# Copyright © 2012 Laurent Carlier +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +# Hack to make some of the non-automake variables work. +TOP=$(top_builddir) + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa/ \ + $(DEFINES) \ + $(API_DEFINES) + +if HAVE_OSMESA_DRIVER +lib_LTLIBRARIES = lib@OSMESA_LIB@.la +endif + +lib@OSMESA_LIB@_la_SOURCES = osmesa.c + +lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared +lib@OSMESA_LIB@_la_LIBADD = \ + $(top_srcdir)/src/mesa/libmesa.a \ + $(top_srcdir)/src/mapi/glapi/libglapi.a \ + $(top_srcdir)/src/glsl/libglsl.a + +# Provide compatibility with scri
[Mesa-dev] [PATCH] automake: convert libOSmesa building
This also currently fix the installation of libOSmesa. v2: Remove old Makefile, libOSmesa is now versioned, fix typos --- configure.ac| 5 src/mesa/drivers/osmesa/Makefile| 51 - src/mesa/drivers/osmesa/Makefile.am | 50 3 files changed, 55 insertions(+), 51 deletions(-) delete mode 100644 src/mesa/drivers/osmesa/Makefile create mode 100644 src/mesa/drivers/osmesa/Makefile.am diff --git a/configure.ac b/configure.ac index 46265a2..44756a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1370,10 +1370,14 @@ if test "x$enable_osmesa" = xyes; then OSMESA_MESA_DEPS="" OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" fi + +OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'` + AC_SUBST([OSMESA_LIB_DEPS]) AC_SUBST([OSMESA_MESA_DEPS]) AC_SUBST([OSMESA_PC_REQ]) AC_SUBST([OSMESA_PC_LIB_PRIV]) +AC_SUBST([OSMESA_VERSION]) dnl dnl gbm configuration @@ -2189,6 +2193,7 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/dri/radeon/Makefile src/mesa/drivers/dri/swrast/Makefile src/mesa/drivers/x11/Makefile + src/mesa/drivers/osmesa/Makefile src/mesa/gl.pc src/mesa/osmesa.pc]) diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile deleted file mode 100644 index 39ab09a..000 --- a/src/mesa/drivers/osmesa/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# src/mesa/drivers/osmesa/Makefile for libOSMesa.so - -# Note that we may generate libOSMesa.so or libOSMesa16.so or libOSMesa32.so -# with this Makefile - - -TOP = ../../../.. - -include $(TOP)/configs/current - - - -SOURCES = osmesa.c - -OBJECTS = $(SOURCES:.c=.o) - -INCLUDE_DIRS = \ - -I$(TOP)/include \ - -I$(TOP)/src/mapi \ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main - -CORE_MESA = \ - $(TOP)/src/mesa/libmesa.a \ - $(TOP)/src/mapi/glapi/libglapi.a \ - $(TOP)/src/glsl/libglsl.a - -.c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ - - -default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) - - -# libOSMesa can be used in conjuction with libGL or with all other Mesa -# sources. We can also build libOSMesa16/libOSMesa32 by setting -# -DCHAN_BITS=16/32. -$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA) - $(MKLIB) -o $(OSMESA_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \ - -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ - $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) - - - -clean: - -rm -f *.o *~ - - -# XXX todo install rule? diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am new file mode 100644 index 000..863c8f7 --- /dev/null +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -0,0 +1,50 @@ + + +# Copyright © 2012 Laurent Carlier +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +# Hack to make some of the non-automake variables work. +TOP=$(top_builddir) + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa/ \ + $(DEFINES) \ + $(API_DEFINES) + +if HAVE_OSMESA_DRIVER +lib_LTLIBRARIES = lib@OSMESA_LIB@.la +endif + +lib@OSMESA_LIB@_la_SOURCES = osmesa.c + +lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared +lib@OSMESA_LIB@_la_LIBADD = \ + $(top_srcdir)/src/mesa/libmesa.a \ + $(top_srcdir)/src/mapi/glapi/libglapi.a \ + $(top_srcdir)/src/glsl/libglsl.a + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib o
[Mesa-dev] [PATCH] automake: convert libOSmesa building
This also currently fix the installation of libOSmesa. --- configure.ac | 1 + src/mesa/drivers/osmesa/Makefile | 51 src/mesa/drivers/osmesa/Makefile.am | 50 +++ src/mesa/drivers/osmesa/Makefile.old | 51 4 files changed, 102 insertions(+), 51 deletions(-) delete mode 100644 src/mesa/drivers/osmesa/Makefile create mode 100644 src/mesa/drivers/osmesa/Makefile.am create mode 100644 src/mesa/drivers/osmesa/Makefile.old diff --git a/configure.ac b/configure.ac index 46265a2..0b4a6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -2189,6 +2189,7 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/dri/radeon/Makefile src/mesa/drivers/dri/swrast/Makefile src/mesa/drivers/x11/Makefile + src/mesa/drivers/osmesa/Makefile src/mesa/gl.pc src/mesa/osmesa.pc]) diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile deleted file mode 100644 index 39ab09a..000 --- a/src/mesa/drivers/osmesa/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# src/mesa/drivers/osmesa/Makefile for libOSMesa.so - -# Note that we may generate libOSMesa.so or libOSMesa16.so or libOSMesa32.so -# with this Makefile - - -TOP = ../../../.. - -include $(TOP)/configs/current - - - -SOURCES = osmesa.c - -OBJECTS = $(SOURCES:.c=.o) - -INCLUDE_DIRS = \ - -I$(TOP)/include \ - -I$(TOP)/src/mapi \ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main - -CORE_MESA = \ - $(TOP)/src/mesa/libmesa.a \ - $(TOP)/src/mapi/glapi/libglapi.a \ - $(TOP)/src/glsl/libglsl.a - -.c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ - - -default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) - - -# libOSMesa can be used in conjuction with libGL or with all other Mesa -# sources. We can also build libOSMesa16/libOSMesa32 by setting -# -DCHAN_BITS=16/32. -$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA) - $(MKLIB) -o $(OSMESA_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \ - -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ - $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) - - - -clean: - -rm -f *.o *~ - - -# XXX todo install rule? diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am new file mode 100644 index 000..6542722 --- /dev/null +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -0,0 +1,50 @@ + + +# Copyright © 2012 Matt Turner +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +# Hack to make some of the non-automake variables work. +TOP=$(top_builddir) + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa/ \ + $(DEFINES) \ + $(API_DEFINES) + +if HAVE_OSMESA_DRIVER +lib_LTLIBRARIES = lib@OSMESA_LIB@.la +endif + +lib@OSMESA_LIB@_la_SOURCES = osmesa.c + +lib@OSMESA_LIB@_la_LDFLAGS = -module -avoid-version -shared +lib@OSMESA_LIB@_la_LIBADD = \ + $(top_srcdir)/src/mesa/libmesa.a \ + $(top_srcdir)/src/mapi/glapi/libglapi.a \ + $(top_srcdir)/src/glsl/libglsl.a + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib of the build tree. +all-local: lib@OSMESA_LIB@.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); + ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; diff --git a/src/mesa/drivers/osmesa/Makefile.old b/src/mesa/drivers/osmesa/Makefile.old new file mode 100644 index 000..39ab09a --- /dev/null +++ b/src/mesa/drivers/osmesa/Makefile.old @@ -0,0 +1,51 @@ +# src/mesa/drivers/osmesa/Makefile for libO
Re: [Mesa-dev] build error after recent master changes.
Le vendredi 22 juin 2012 18:17:24 Andy Furniss a écrit : > Brian Paul wrote: > > Can you see if the patch/info on bug > > https://bugs.freedesktop.org/show_bug.cgi?idQ335 helps? > > Yes editing src/mesa/x86/Makefile.am to add -I$(top_srcdir)/include \ > > fixed it, thanks. > > Git apply complained when I tried to use the actual patch (save as on > the link) > > bash-3.2$ git apply --check --verbose > ~/0001-automake-add-missing-inclusion-of-GL-headers.patch > fatal: corrupt patch at line 20 > > looks like a rogue space before a + > just fixed the space problem, bad cut & paste! ++ signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] automake: add missing inclusion of GL headers
Building fail when GL headers are not installed in the system, so add inclusion of these headers. --- src/mesa/x86-64/Makefile.am |1 + src/mesa/x86/Makefile.am|1 + 2 files changed, 2 insertions(+) diff --git a/src/mesa/x86-64/Makefile.am b/src/mesa/x86-64/Makefile.am index 79cbb53..271ece9 100644 --- a/src/mesa/x86-64/Makefile.am +++ b/src/mesa/x86-64/Makefile.am @@ -24,6 +24,7 @@ if HAVE_X86_64_ASM AM_CPPFLAGS = \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/include \ $(API_DEFINES) \ $(DEFINES) diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am index f241de5..2b43f9d 100644 --- a/src/mesa/x86/Makefile.am +++ b/src/mesa/x86/Makefile.am @@ -24,6 +24,7 @@ if HAVE_X86_ASM AM_CPPFLAGS = \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/include \ $(API_DEFINES) \ $(DEFINES) -- 1.7.10.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] glx: More hacking around versions of XCB that lack GLX_ARB_create_context support
> From: Ian Romanick > > Detect whether a new enough version of XCB is installed at configure > time. If it is not, don't enable the extension and don't build the > unit tests. > > v2: Move the AM_CONDIATION outside the case-statement so that it is > invoked even for non-GLX builds. This prevents build failures with > osmesa, for example. > Works fine for me, thanks. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 1/2] mesa: XCB is no longer optional for GLX or DRI
> On Tue, Jan 3, 2012 at 10:25 AM, Kenneth Graunke > wrote: > > On 01/02/2012 05:44 PM, Ian Romanick wrote: > >> From: Ian Romanick > >> > >> Signed-off-by: Ian Romanick > >> --- > >> configure.ac | 28 ++-- > >> 1 files changed, 6 insertions(+), 22 deletions(-) > > > > At some point, you'll want to check for libxcb >= 1.8, i.e. a version > > that has the new support that you need. Of course, until there is such > > a release...not really sure what to do. > > His second patch means he doesn't need that, > > I've pushed both of these just so I can get some work done today. > > Dave. > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev Still fail here, it succeed to built but not to run :-) Yes, mesa is built with --enable-xcb, here it's libxcb v1.7. Here is the output of wine and ldd: [lordh@archMain FurMark_1.9.2]$ wine FurMark.exe err:module:load_builtin_dll failed to load .so lib for builtin L"GLU32.dll": /usr/lib32/libGL.so.1: undefined symbol: xcb_glx_set_client_info_2arb err:module:import_dll Loading library GLU32.dll (which is needed by L"C:\\Program Files\\Geeks3D\\Benchmarks\\FurMark_1.9.2\\core3d.dll") failed (error c07a). err:module:load_builtin_dll failed to load .so lib for builtin L"OPENGL32.dll": /usr/lib32/libGL.so.1: undefined symbol: xcb_glx_set_client_info_2arb err:module:import_dll Loading library OPENGL32.dll (which is needed by L"C:\\Program Files\\Geeks3D\\Benchmarks\\FurMark_1.9.2\\core3d.dll") failed (error c07a). err:module:import_dll Library core3d.dll (which is needed by L"C:\\Program Files\\Geeks3D\\Benchmarks\\FurMark_1.9.2\\FurMark.exe") not found err:module:load_builtin_dll failed to load .so lib for builtin L"OPENGL32.dll": /usr/lib32/libGL.so.1: undefined symbol: xcb_glx_set_client_info_2arb err:module:import_dll Loading library OPENGL32.dll (which is needed by L"C:\\Program Files\\Geeks3D\\Benchmarks\\FurMark_1.9.2\\FurMark.exe") failed (error c07a). err:module:LdrInitializeThunk Main exe initialization for L"C:\\Program Files\\Geeks3D\\Benchmarks\\FurMark_1.9.2\\FurMark.exe" failed, status c135 [lordh@archMain FurMark_1.9.2]$ ldd /usr/lib32/libGL.so.1 linux-gate.so.1 => (0xf77a6000) libglapi.so.0 => /usr/lib32/libglapi.so.0 (0xf76e6000) libXext.so.6 => /usr/lib32/libXext.so.6 (0xf76d3000) libXdamage.so.1 => /usr/lib32/libXdamage.so.1 (0xf76d) libXfixes.so.3 => /usr/lib32/libXfixes.so.3 (0xf76ca000) libX11-xcb.so.1 => /usr/lib32/libX11-xcb.so.1 (0xf76c6000) libX11.so.6 => /usr/lib32/libX11.so.6 (0xf758e000) libxcb-glx.so.0 => /usr/lib32/libxcb-glx.so.0 (0xf757d000) libxcb.so.1 => /usr/lib32/libxcb.so.1 (0xf7565000) libXxf86vm.so.1 => /usr/lib32/libXxf86vm.so.1 (0xf756) libdrm.so.2 => /usr/lib32/libdrm.so.2 (0xf7553000) libpthread.so.0 => /lib32/libpthread.so.0 (0xf7537000) libdl.so.2 => /lib32/libdl.so.2 (0xf7532000) libstdc++.so.6 => /usr/lib32/libstdc++.so.6 (0xf7449000) libm.so.6 => /lib32/libm.so.6 (0xf741b000) libgcc_s.so.1 => /usr/lib32/libgcc_s.so.1 (0xf740) libc.so.6 => /lib32/libc.so.6 (0xf725c000) libXau.so.6 => /usr/lib32/libXau.so.6 (0xf7259000) libXdmcp.so.6 => /usr/lib32/libXdmcp.so.6 (0xf7254000) librt.so.1 => /lib32/librt.so.1 (0xf724b000) /lib/ld-linux.so.2 (0xf77a7000) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
