1. 02 Nov, 2012 1 commit
    • Matt Turner's avatar
      ralloc: Annotate printf functions with PRINTFLIKE(...) · 94cc306e
      Matt Turner authored
      
      
      This is a squash of the following two commits:
      
          ralloc: Annotate printf functions with PRINTFLIKE(...)
      
          Catches problems such as (in the gles3 branch)
      
          glcpp-parse.y: In function '_glcpp_parser_handle_version_declaration':
          glcpp-parse.y:1990:39: warning: format '%lli' expects argument of type
          	'long long int', but argument 4 has type 'int' [-Wformat]
      
          As a side-effect, remove ralloc.c's likely/unlikely macros and just use
          the ones from main/compiler.h.
      
          NOTE: This is a candidate for the release branches.
      Reviewed-by: default avatarIan Romanick <ian.d.romanick@intel.com>
          (cherry picked from commit 41b14d12)
      
      and
      
          src/glsl/tests/Makefile.am: Specify -I... in AM_CPPFLAGS
      
          When specifying per-target CFLAGS (e.g., ralloc_test_CFLAGS) AM_CFLAGS
          are not used. AM_CPPFLAGS should be used for includes anyway.
      
          Fixes a build problem since 41b14d12
      
      :
      
          CC       ralloc_test-ralloc.o
          In file included from ../../../src/glsl/ralloc.c:42:0:
          ../../../src/glsl/ralloc.h:57:27: fatal error: main/compiler.h: No such file or directory
      Acked-by: Paul Berry's avatarPaul Berry <stereotype441@gmail.com>
          (cherry picked from commit 67f1e7bf)
      94cc306e
  2. 03 Oct, 2012 1 commit
  3. 13 Jul, 2012 2 commits
    • Jon Turney's avatar
      automake: convert libmesa and libmesagallium · a112ca5d
      Jon Turney authored
      
      
      * "configure substitutions are not allowed in _SOURCES variables" in automake, so instead of
      MESA_ASM_FILES, use some AM_CONDITIONALS to choose which architecture's asm sources are used
      in libmesa_la_SOURCES. (Can't remove MESA_ASM_FILES autoconf variable as it's still used in
      sources.mak)
      
      * Update to link with the .la file in other Makefile.am files, and make a link to the
      .a file for the convenience of other Makefiles which have not yet been converted to automake
      
      v2: Remove stray -static from LDFLAGS
      v3: Remove .a compatibility link on clean
      Signed-off-by: Jon Turney's avatarJon TURNEY <jon.turney@dronecode.org.uk>
      Reviewed-by: Emma Anholt's avatarEric Anholt <eric@anholt.net>
      Tested-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
      a112ca5d
    • Jon Turney's avatar
      automake: convert libglsl · 68e04cc6
      Jon Turney authored
      
      
      v2: Use AM_V_GEN to silence generated code rules. Add BUILT_SOURCES to CLEANFILES
      v3:
      - Fix an accidental // in a path
      - Use automake make rules for lex/yacc rather than writing our own
      - Update .gitignore appropriately
      - Build a libglcpp convenience library rather than awkwardly including
      the files in libglsl and delegating the generation
      - Remove libglsl.a compatibility link on clean
      v4:
      - Automake's rules for lex/yacc make .cc if source is .ll or .yy, and apparently we
      must use those extensions "because of scons", so update everywhere glsl_parser.cpp
      -> glsl_parser.cc and glsl_lexer.cpp -> glsl_lexer.cc. This fixes 'make tarballs'
      and building with dricore enabled.
      Signed-off-by: Jon Turney's avatarJon TURNEY <jon.turney@dronecode.org.uk>
      Reviewed-by: Emma Anholt's avatarEric Anholt <eric@anholt.net>
      Tested-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
      68e04cc6
  4. 31 May, 2012 2 commits
  5. 23 May, 2012 1 commit
  6. 19 Apr, 2012 1 commit