1. 15 Sep, 2018 1 commit
    • Mauro Rossi's avatar
      android: broadcom/genxml: fix collision with intel/genxml header-gen macro · 3341429d
      Mauro Rossi authored
      Fixes the following building error, happening when building both intel and broadcom:
      
      Gen Header: libmesa_broadcom_genxml_32 <= v3d_packet_v21_pack.h
      FAILED: gen/STATIC_LIBRARIES/libmesa_broadcom_genxml_intermediates/broadcom/cle/v3d_packet_v21_pack.h
      /bin/bash -c "python external/mesa/src/broadcom/cle/gen_pack_header.py \
      external/mesa/src/broadcom/cle/v3d_packet_v21.xml \
      > gen/STATIC_LIBRARIES/libmesa_broadcom_genxml_intermediates/broadcom/cle/v3d_packet_v21_pack.h"
      Traceback (most recent call last):
        File "external/mesa/src/broadcom/cle/gen_pack_header.py", line 626, in <module>
          p = Parser(sys.argv[2])
      IndexError: list index out of range
      
      header-gen macro is already defined by Intel genxml building rules
      and the existing header-gen does not have the $(PRIVATE_VER) argument,
      infact the bash command line logged in the building error is missing
      exactly $(PRIVATE_VER) argument
      
      Renaming the macro as pack-header-gen in src/broadcom/Android.genxml.mk
      solves the building error, another possible way is to keep the gen rules
      commands expanded and not use the macros.
      
      Fixes: 7f80a9ff ("vc4: Introduce XML-based packet header generation like Intel's.")
      Cc: "18.2" <mesa-stable@lists.freedesktop.org>
      Acked-by: default avatarEric Anholt <eric@anholt.net>
      Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
      Signed-off-by: default avatarMauro Rossi <issor.oruam@gmail.com>
      3341429d
  2. 29 Jun, 2018 2 commits
    • Eric Anholt's avatar
      v3d: Merge the V3D 4.1 and 4.2 XML into V3D 3.3'x XML. · 38172dcb
      Eric Anholt authored
      The XML ends up noisier if you're only looking at one version, but from
      the diffstat there's obvious wins in terms of deduplication.  This will
      get even more significant if we ever support 3.2 or 4.0.
      38172dcb
    • Eric Anholt's avatar
      v3d: Pass the version being generated to the pack generator script. · 6f7ad7ed
      Eric Anholt authored
      It turns out that most V3D versions change very few packets, so keeping
      separate copies of the XML per version makes changing the XML a pain as
      you have to replicate your changes to each one.  This is the start of
      changing it so that one XML can generate headers for multiple versions.
      6f7ad7ed
  3. 27 Jan, 2018 2 commits
  4. 18 Aug, 2017 1 commit
  5. 25 Jul, 2017 1 commit
  6. 12 Jul, 2017 1 commit
    • Rob Herring's avatar
      Android: Fix vc4 build since XML changes. · 7a7a84c8
      Rob Herring authored
      Since commit 7f80a9ff ("vc4: Introduce XML-based packet header
      generation like Intel's."), the vc4 build on Android is broken:
      
      out/target/product/linaro_x86_64/gen/STATIC_LIBRARIES/libmesa_broadcom_genxml_intermediates/broadcom/cle/v3d_packet_v21_pack.h:12:10: fatal error: 'v3d_packet_helpers.h' file not found
      external/mesa3d/src/gallium/drivers/vc4/vc4_cl_dump.c:28:10: fatal error: 'vc4_packet.h' file not found
      
      The path of the generated header needs to be fixed since we build out of
      tree.
      Acked-by: default avatarEric Anholt <eric@anholt.net>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      7a7a84c8
  7. 30 Jun, 2017 1 commit
  8. 29 Jun, 2017 1 commit
  9. 15 Jun, 2017 1 commit
    • Mauro Rossi's avatar
      svga: fix git_sha1.h include path in Android.mk (v3) · d5523d91
      Mauro Rossi authored
      Adds libmesa_git_sha1 static (dummy) library to generate git_sha1.h
      with some polishing to header dependency on .git/HEAD and scripted rules.
      
      The now redundant generation rules are removed from Android.gen.mk
      libmesa_git_sha1 whole static depedency is added to libmesa_pipe_svga,
      libmesa_dricore and libmesa_st_mesa modules
      
      Fixes the following building error:
      
      external/mesa/src/gallium/drivers/svga/svga_screen.c:26:10:
      fatal error: 'git_sha1.h' file not found
               ^
      1 error generated.
      
      Fixes: 1ce3a272 ("svga: Add the ability to log messages to
      vmware.log on the host.")
      Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
      d5523d91
  10. 11 May, 2017 1 commit
  11. 06 Sep, 2016 1 commit
    • Rob Herring's avatar
      Android: glsl: add rules to generate ir_expression*.h header files · 244f0aba
      Rob Herring authored
      Recent changes to generate ir_expression*.h header files broke Android
      builds. This adds the generation rules. This change is complicated due to
      creating a circular dependency between libmesa_glsl, libmesa_nir, and
      libmesa_compiler. Normally, we add static libraries so that include paths
      are added even if there's no linking dependency. That is the case here.
      Instead, we explicitly add the include path using $(MESA_GEN_GLSL_H) to
      libmesa_compiler. This in turn requires shuffling the order of make
      includes. It also uncovered missing dependency tracking of glsl_parser.h.
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
      244f0aba
  12. 01 Apr, 2016 1 commit
    • Rob Herring's avatar
      Android: fix x86 gallium builds · 2d9e0f24
      Rob Herring authored
      Builds with gallium enabled fail on x86 with linker error:
      
      external/mesa3d/src/mesa/vbo/vbo_exec_array.c:127: error: undefined reference to '_mesa_uint_array_min_max'
      
      The problem is sse_minmax.c is not included in the libmesa_st_mesa
      library. Since the SSE4.1 files are needed for both libmesa_st_mesa
      and libmesa_dricore, move SSE4.1 files into a separate static library
      that can be used by both.
      
      Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
      2d9e0f24
  13. 29 Feb, 2016 1 commit
  14. 26 Jan, 2016 1 commit
  15. 16 Oct, 2015 1 commit
  16. 15 Oct, 2015 1 commit
  17. 22 Apr, 2015 6 commits
  18. 23 Jan, 2015 1 commit
  19. 06 Nov, 2014 1 commit
    • Timothy Arceri's avatar
      mesa: Add SSE 4.1 optimisation for glDrawElements. · 13786172
      Timothy Arceri authored
      Makes use of SSE 4.1 to speed up compute of min and max elements.
      
      Callgrind cpu usage results from pts benchmarks:
      
      Openarena 0.8.8: 3.67% -> 1.03%
      UrbanTerror: 2.36% -> 0.81%
      
      V5:
      - actually make use of the optimisation in android (Emil Velikov)
      - set a better array size limit for using SSE and added TODO
      
      V4:
      - fixed bugs with incrementing pointer and updating counters
      
      V3:
      - Removed sse_minmax.c from Makefile.sources
      - handle the first few values without SSE until the pointer is aligned
       and use _mm_load_si128 rather than _mm_loadu_si128
      - guard the call to the SSE code better at build time
      
      V2:
      - removed GL* types
      - use _mm_store_si128() rather than _mm_store_ps()
      - add runtime check for SSE
      - use aligned attribute for local mix/max
      - bunch of tidyups
      Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
      Reviewed-by: default avatarMatt Turner <mattst88@gmail.com>
      Signed-off-by: default avatarTimothy Arceri <t_arceri@yahoo.com.au>
      13786172
  20. 03 Oct, 2014 2 commits
    • Tomasz Figa's avatar
      st/mesa: Fix paths used in Android builds · b4ffd19e
      Tomasz Figa authored
      With current makefiles the build fails because source and build paths
      are generated incorrectly. With Android build system the top_srcdir and
      top_builddir variables are undefined and all paths are relative to where
      Android.mk is located. This ends up with path likes
      external/mesa/src/mesa/src/mesa/ for both source and build paths, which
      are obviously wrong.
      
      This patch fixes this by overriding resulting SRCDIR and BUILDDIR
      variables with empty string, so that paths end up being relative to
      Android.mk file again. Appending correct build path to generated files
      is already done in Android.gen.mk.
      Signed-off-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
      CC: <mesa-stable@lists.freedesktop.org>
      Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
      b4ffd19e
    • Tomasz Figa's avatar
      util: Include in Android builds · d703abf7
      Tomasz Figa authored
      This patch fixes Android build failures by including src/util directory
      in compilation. Files inside of this directory are compiled into
      libmesa_util static library and linked with resulting libGLES_mesa.
      Signed-off-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
      CC: <mesa-stable@lists.freedesktop.org>
      Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
      d703abf7
  21. 12 Aug, 2014 1 commit
    • Emil Velikov's avatar
      mesa: guard better when building with sse4.1 optimisations · b3121bfd
      Emil Velikov authored
      When the compiler is not capable/does not accept -msse4.1 while the target
      has the instruction set we'll blow up as _mesa_streaming_load_memcpy is
      going to be undefined.
      
      To make sure that never happens, wrap the runtime cpu check+caller in an
      ifdef thus do not compile that hunk of the code.
      
      Fix the android build by enabling the optimisation and adding the define
      where applicable.
      
      v2: autoconf conditionals end with "fi" rather than endif.
      v3: Wrap the definition and call to intel_miptree_{un,}map_movntdqa in
      if defined(USE_SSE41). Spotted by Matt.
      
      Cc: Matt Turner <mattst88@gmail.com>
      Cc: Adrian Negreanu <adrian.m.negreanu@intel.com>
      Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org>
      Signed-off-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
      Reviewed-by: default avatarMatt Turner <mattst88@gmail.com>
      b3121bfd
  22. 09 Jun, 2014 2 commits
  23. 16 Nov, 2013 1 commit
  24. 26 Sep, 2013 1 commit
  25. 15 Apr, 2013 1 commit
  26. 12 Nov, 2012 3 commits
  27. 29 Feb, 2012 1 commit
  28. 24 Jan, 2012 1 commit
  29. 20 Jan, 2012 1 commit