mesa.git
11 years agor300g: advertise MSAA support for the RGB10_A2 format on r500
Marek Olšák [Sat, 12 Jan 2013 03:44:37 +0000 (04:44 +0100)]
r300g: advertise MSAA support for the RGB10_A2 format on r500

It seems to be working just fine.

11 years agor300g: allow separate depth and stencil clear
Marek Olšák [Sat, 12 Jan 2013 12:59:48 +0000 (13:59 +0100)]
r300g: allow separate depth and stencil clear

The handling of the CAP is broken in st/mesa anyway. Let's just kill it.

This commit pretty much enables fast Z clear for FBOs with Z24S8.
The driver falls back to clearing with a quad if the fast clear cannot be
used. It can still do fast color clear, for example.

11 years agor300g: if both Z and stencil are present, they must be fast-cleared together
Marek Olšák [Sat, 12 Jan 2013 02:19:03 +0000 (03:19 +0100)]
r300g: if both Z and stencil are present, they must be fast-cleared together

11 years agor300g: allow HiZ with a 16-bit zbuffer
Marek Olšák [Fri, 13 May 2011 00:26:08 +0000 (02:26 +0200)]
r300g: allow HiZ with a 16-bit zbuffer

11 years agor300g: random hyperz cleanups
Marek Olšák [Fri, 11 Jan 2013 16:10:36 +0000 (17:10 +0100)]
r300g: random hyperz cleanups

11 years agor300g: kill the X.Org state tracker target
Marek Olšák [Sun, 13 Jan 2013 21:58:08 +0000 (22:58 +0100)]
r300g: kill the X.Org state tracker target

This won't ever be made default and we don't need it anyway.

We should also consider doing this for other drivers.

11 years agoxmlpool: Fix out-of-tree builds.
Johannes Obermayr [Sat, 12 Jan 2013 14:34:22 +0000 (15:34 +0100)]
xmlpool: Fix out-of-tree builds.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agogtest: Build it only for 'make check'.
Johannes Obermayr [Fri, 28 Dec 2012 06:04:26 +0000 (07:04 +0100)]
gtest: Build it only for 'make check'.

Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agotests: AM_CPPFLAGS must include $(top_srcdir) instead of $(top_builddir).
Johannes Obermayr [Sat, 29 Dec 2012 00:52:11 +0000 (01:52 +0100)]
tests: AM_CPPFLAGS must include $(top_srcdir) instead of $(top_builddir).

Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
11 years agor200: Fix probable thinko in r200EmitArrays
Adam Jackson [Fri, 4 Jan 2013 19:26:20 +0000 (14:26 -0500)]
r200: Fix probable thinko in r200EmitArrays

Effectively this path would always assert.  Move the break statement to
the (probable) intended place.

Note: This is a candidate for the stable branches.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agotarget/dri-swrast: fix for nonstandard LLVM prefix
Nathan Schulte [Sun, 13 Jan 2013 01:42:04 +0000 (19:42 -0600)]
target/dri-swrast: fix for nonstandard LLVM prefix

Include LLVM_LDFLAGS when building with LLVM.  Fixes the following build
errors:
  CXXLD  swrast_dri.la
  /usr/bin/ld: cannot find -lLLVMR600CodeGen
  /usr/bin/ld: cannot find -lLLVMR600Desc
  /usr/bin/ld: cannot find -lLLVMR600Info
  /usr/bin/ld: cannot find -lLLVMR600AsmPrinter

Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
11 years agotargets/dri-r600: Force c++ linker in all cases
Andreas Boll [Sat, 12 Jan 2013 20:13:23 +0000 (21:13 +0100)]
targets/dri-r600: Force c++ linker in all cases

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59282

11 years agoglapi/gen: remove an obsolete comment from Makefile.am
Andreas Boll [Tue, 20 Nov 2012 14:45:56 +0000 (15:45 +0100)]
glapi/gen: remove an obsolete comment from Makefile.am

Glapi gets generated at build time.

See commit:
0ce0f7c0c8fa9902678af7f3ecad2541be5808d2
mesa: Remove the generated glapi from source control, and just build it.

11 years agoRemove hacks for static Makefiles
Matt Turner [Thu, 6 Sep 2012 04:08:39 +0000 (21:08 -0700)]
Remove hacks for static Makefiles

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - don't remove compatibility with scripts for the old build system

v3: Andreas Boll <andreas.boll.dev@gmail.com>
    - remove more obsolete hacks

v4: Andreas Boll <andreas.boll.dev@gmail.com>
    - add a previously removed TOP variable to fix vgapi build

11 years agoi965: Move program_id to intel_screen instead of brw_context.
Kenneth Graunke [Wed, 9 Jan 2013 01:00:13 +0000 (17:00 -0800)]
i965: Move program_id to intel_screen instead of brw_context.

According to bug #54524, I regressed oglconform's multicontext test
when I reenabled the fragment shader precompile.

However, these test cases only passed by miraculous coincedence.  We
assign each fragment program a unique ID (brw_fragment_program::id which
becomes brw_wm_prog_key::program_string_id) which we obtain by storing a
per-context counter.

The test case uses GLX context sharing to access the same fragment
program from two different contexts.  This means that we share a program
cache.  Before the precompile, if both contexts happened to use the same
shaders in the same order, we'd obtain the same program_string_ids (by
virtue of doing the same computation twice).  However, the more likely
scenario is that they completely disagree on program_string_id.

This meant that we'd have two completely different fragment shaders in
the cache with the same ID, tricking us to think they were the same
(aside from NOS), so we'd render using the wrong program.

This patch implements a simple fix suggested by Eric: it moves the
global counter out of brw_context and into intel_screen, which is shared
across all contexts.  A mutex protects it from concurrent access.

This is also the first direct usage of pthreads in the i965 driver.

Fixes 10 subcases of oglconform's multicontext test.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54524
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965: Fix build error with clang.
Kenneth Graunke [Tue, 8 Jan 2013 20:46:05 +0000 (12:46 -0800)]
i965: Fix build error with clang.

Technically, variable sized arrays are a required feature of C99,
redacted to be optional in C11, and not actually part of C++ whatsoever.

Gcc allows using them in C++ unless you specify -pedantic, and Clang
appears to allow them for simple/POD types.

exec_list is arguably POD, since it doesn't have virtual methods, but I
can see why Clang would be like "meh, it's a C++ struct, say no", seeing as
it's meant to support C99.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58970
Reviewed-by: Matt Turner <mattst88@gmail.com>
11 years agoi965/fs: Don't mix integer/float immediates in i2b handling.
Kenneth Graunke [Fri, 11 Jan 2013 22:19:56 +0000 (14:19 -0800)]
i965/fs: Don't mix integer/float immediates in i2b handling.

The simulator gets very angry about our i2b code:

cmp.ne(16)      g3<1>D          g2<0,1,0>D      0F

We can't mix integer DWord and float types.  The only reason to use 0F
here was to share code with f2b.  Split it and use 0D instead.

While we don't believe anything bad will actually happen because of
this, it's nice to fix the warnings and easy enough to do.

Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965: Add an INTEL_DEBUG=no16 option.
Kenneth Graunke [Fri, 11 Jan 2013 22:08:05 +0000 (14:08 -0800)]
i965: Add an INTEL_DEBUG=no16 option.

Often when debugging, I don't want to see SIMD16 shaders.  It makes
INTEL_DEBUG=vs/fs output much easier to read, especially when a program
dumps many shaders.  Plus, I also want to verify that SIMD8 works before
even considering SIMD16.

v2: Fix the likeliness check (caught by Chris and Eric).

Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoconfigure.ac: Fixing common dri dependency when using dri state tracker
Alexandre Demers [Sat, 12 Jan 2013 06:21:44 +0000 (01:21 -0500)]
configure.ac: Fixing common dri dependency when using dri state tracker

Fixes a regression caused by b587a7595e7aae0809a8e7392e89c39df0c955b1

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59261
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
11 years agost/mesa: set ctx->Const.UniformBufferOffsetAlignment
Fredrik Höglund [Sat, 12 Jan 2013 11:56:31 +0000 (12:56 +0100)]
st/mesa: set ctx->Const.UniformBufferOffsetAlignment

Reviewed-by: Marek Olšák <maraeo@gmail.com>
11 years agoscons: Update for xmlpool/options.h generation.
José Fonseca [Sat, 12 Jan 2013 18:58:31 +0000 (10:58 -0800)]
scons: Update for xmlpool/options.h generation.

11 years agonv50/nvc0: Build codegen in nv50.
Johannes Obermayr [Sat, 12 Jan 2013 11:55:08 +0000 (12:55 +0100)]
nv50/nvc0: Build codegen in nv50.

This is required to make libnv50 independent of libnvc0.

11 years agowinsys/sw/wayland: Fix build to properly use wayland cflags
Pekka Vuorela [Sat, 12 Jan 2013 13:46:00 +0000 (15:46 +0200)]
winsys/sw/wayland: Fix build to properly use wayland cflags

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59281
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
11 years agotexformat: use MESA_FORMAT_ARGB2101010 with GL_UNSIGNED_INT_2_10_10_10_REV
Jordan Justen [Thu, 27 Dec 2012 20:34:03 +0000 (12:34 -0800)]
texformat: use MESA_FORMAT_ARGB2101010 with GL_UNSIGNED_INT_2_10_10_10_REV

Choose MESA_FORMAT_ARGB2101010 when storing
GL_RGBA + GL_UNSIGNED_INT_2_10_10_10_REV or
GL_RGB + GL_UNSIGNED_INT_2_10_10_10_REV.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agotexstore argb2101010: merge GL_RGBA and GL_RGB cases
Jordan Justen [Thu, 3 Jan 2013 06:32:47 +0000 (22:32 -0800)]
texstore argb2101010: merge GL_RGBA and GL_RGB cases

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoglformats: support _mesa_bytes_per_pixel for 2101010+GL_RGB
Jordan Justen [Fri, 28 Dec 2012 19:08:20 +0000 (11:08 -0800)]
glformats: support _mesa_bytes_per_pixel for 2101010+GL_RGB

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoglformats: add _mesa_base_format_component_count
Jordan Justen [Fri, 28 Dec 2012 00:45:13 +0000 (16:45 -0800)]
glformats: add _mesa_base_format_component_count

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoglformats: add functions to detect signed/unsigned integer types
Jordan Justen [Thu, 27 Dec 2012 21:24:57 +0000 (13:24 -0800)]
glformats: add functions to detect signed/unsigned integer types

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agounpack: support unpacking MESA_FORMAT_ARGB2101010
Jordan Justen [Thu, 27 Dec 2012 21:21:01 +0000 (13:21 -0800)]
unpack: support unpacking MESA_FORMAT_ARGB2101010

Note: This is a candidate for the stable branches.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agomesa: Add extension tracking for {ARB,OES}_get_program_binary
Ian Romanick [Sun, 2 Dec 2012 22:20:04 +0000 (14:20 -0800)]
mesa: Add extension tracking for {ARB,OES}_get_program_binary

The ARB_get_program_binary spec says "OpenGL 3.0 is required."  The
nearly identical OES_get_program_binary extension is available for
OpenGL ES 2.0, so I don't see how / why OpenGL 3.0 is a requirement for
the ARB version.  Let's just enable whenever GL_ARB_shader_objects is
available.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Add GetProgramiv support for GL_PROGRAM_BINARY_LENGTH
Ian Romanick [Wed, 5 Dec 2012 02:29:24 +0000 (18:29 -0800)]
mesa: Add GetProgramiv support for GL_PROGRAM_BINARY_LENGTH

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Add Get support for PROGRAM_BINARY_FORMATS and NUM_PROGRAM_BINARY_FORMATS
Ian Romanick [Mon, 3 Dec 2012 18:34:19 +0000 (10:34 -0800)]
mesa: Add Get support for PROGRAM_BINARY_FORMATS and NUM_PROGRAM_BINARY_FORMATS

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Add tracking for GL_PROGRAM_BINARY_RETRIEVABLE_HINT state
Ian Romanick [Mon, 3 Dec 2012 15:47:36 +0000 (07:47 -0800)]
mesa: Add tracking for GL_PROGRAM_BINARY_RETRIEVABLE_HINT state

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Emit errors for geometry shader enums when ARB_gs4 is not supported
Ian Romanick [Sun, 2 Dec 2012 22:24:31 +0000 (14:24 -0800)]
mesa: Emit errors for geometry shader enums when ARB_gs4 is not supported

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglapi: Emit dispatch for {ARB,OES}_get_program_binary
Ian Romanick [Sun, 2 Dec 2012 22:19:00 +0000 (14:19 -0800)]
glapi: Emit dispatch for {ARB,OES}_get_program_binary

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglapi: Remove spurious space from end of extension name
Ian Romanick [Mon, 3 Dec 2012 18:30:30 +0000 (10:30 -0800)]
glapi: Remove spurious space from end of extension name

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Add stub implementations of glGetProgramBinary and glProgramBinary
Ian Romanick [Sun, 2 Dec 2012 03:14:21 +0000 (19:14 -0800)]
mesa: Add stub implementations of glGetProgramBinary and glProgramBinary

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Fix the naming of _mesa_ProgramParameteriARB
Ian Romanick [Sun, 2 Dec 2012 03:11:55 +0000 (19:11 -0800)]
mesa: Fix the naming of _mesa_ProgramParameteriARB

After recent changes in the XML, the dispatch generators will expect
this function to be named _mesa_ProgramParameteri.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglapi: Reorder and clean up some of the includes and comments
Ian Romanick [Mon, 3 Dec 2012 18:32:29 +0000 (10:32 -0800)]
glapi: Reorder and clean up some of the includes and comments

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Fix GL_SHADER_BINARY_FORMATS query
Ian Romanick [Tue, 4 Dec 2012 23:09:39 +0000 (15:09 -0800)]
mesa: Fix GL_SHADER_BINARY_FORMATS query

There were two bugs here.  First, this and several other queries were
not available in a desktop GL context with GL_ARB_ES2_compatibility.
Second, GL_NUM_SHADER_BINARY_FORMATS returns zero, but
GL_SHADER_BINARY_FORMATS writes one element of data to the buffer.  If
NUM is zero, no data should be written.

Fixes piglit test 'arb_get_program_binary-overrun shader'.

NOTE: This is a candidate for stable release branches.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodocs/GL3.txt: update GL3 status for r600g.
Dave Airlie [Sat, 12 Jan 2013 00:19:18 +0000 (00:19 +0000)]
docs/GL3.txt: update GL3 status for r600g.

Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agor600g: fix warnings for htile va
Dave Airlie [Fri, 11 Jan 2013 23:19:11 +0000 (23:19 +0000)]
r600g: fix warnings for htile va

This fixes a warning about mismatched types.

Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agor600g: texture buffer object + glsl 1.40 enable support (v2)
Dave Airlie [Sun, 16 Dec 2012 10:31:32 +0000 (10:31 +0000)]
r600g: texture buffer object + glsl 1.40 enable support (v2)

This adds TBO support to r600g, and with GLSL 1.40 enabled,
we now get 3.1 core profiles advertised for r600g.

The r600/700 implementation is a bit different from the evergreen one,
as r6/7 hw lacks vertex fetch swizzles. So we implement it by passing 5
constants per sampler to the shader, the shader uses the first 4 as masks
for each component and the 5th as the alpha value to OR in.

Now TXQ is also broken so we have to pass a constant for the buffer size,
on evergreen we just pass this, on r6/7 we pass it as the 6th element
in the const info buffer.

v1.1: drop return as DDX doesn't use a texture type
v2: add r600/700 support.

Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agor600g: uniform buffer object support
Dave Airlie [Sun, 16 Dec 2012 10:26:02 +0000 (10:26 +0000)]
r600g: uniform buffer object support

This adds 12 more constant buffers for use as UBOs,
along with adding relative constant fetching for 2D indices.

This with GLSL 1.40 enabled passes all the same tests as softpipe
on my evergreen system.

Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agor600: always export a position from vertex shader
Dave Airlie [Fri, 11 Jan 2013 03:30:30 +0000 (13:30 +1000)]
r600: always export a position from vertex shader

This fixes piglit glsl-1.40-tf-no-position from gpu hanging on my rv635
at least.

Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoglcpp: Add tests for line continuation
Carl Worth [Wed, 5 Dec 2012 21:36:31 +0000 (13:36 -0800)]
glcpp: Add tests for line continuation

First we test that line continuations are honored within a comment, (as
recently changed in glcpp), then we test that line continuations can be
disabled via an option within the context. This is tested via the new support
for a test-specific command-line option passed to glcpp.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglcpp: Rewrite line-continuation support to act globally.
Carl Worth [Thu, 29 Nov 2012 22:49:46 +0000 (14:49 -0800)]
glcpp: Rewrite line-continuation support to act globally.

Previously, we were only supporting line-continuation backslash characters
within lines of pre-processor directives, (as per the specification). With
OpenGL 4.2 and GLES3, line continuations are now supported anywhere within a
shader.

While changing this, also fix a bug where the preprocessor was ignoring
line continuation characters when a line ended in multiple backslash
characters.

The new code is also more efficient than the old. Previously, we would
perform a ralloc copy at each newline. We now perform copies only at each
occurrence of a line-continuation.

This commit fixes the line-continuation.vert test in piglit.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglcpp: Add --disable-line-continuations argument to standalone glcpp
Carl Worth [Wed, 5 Dec 2012 21:15:48 +0000 (13:15 -0800)]
glcpp: Add --disable-line-continuations argument to standalone glcpp

This will allow testing of disabled line-continuation on a case-by-case basis,
(with the option communicated to the preprocessor via the GL context).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglcpp: Allow test-specific arguments for standalone glcpp tests
Carl Worth [Wed, 5 Dec 2012 21:32:32 +0000 (13:32 -0800)]
glcpp: Allow test-specific arguments for standalone glcpp tests

This will allow the test exercising disabled line continuations to arrange
for the --disable-line-continuations argument to be passed to the standalone
glcpp.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglcpp: Honor the GL context's DisableGLSLLineContinuations option
Carl Worth [Wed, 5 Dec 2012 21:25:48 +0000 (13:25 -0800)]
glcpp: Honor the GL context's DisableGLSLLineContinuations option

And simply don't call into the function that removes line continuations.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoglcpp: Accept pointer to GL context rather than just the API version
Carl Worth [Wed, 5 Dec 2012 20:56:16 +0000 (12:56 -0800)]
glcpp: Accept pointer to GL context rather than just the API version

As the preprocessor becomes more sophisticated and gains more optional
behavior, it's easiest to just pass the GL context pointer to it so that
it can examine any fields there that it needs to (such as API version,
or the state of any driconf options, etc.).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodrirc: Add quirk to disable GLSL line continuations for Savage2
Carl Worth [Thu, 6 Dec 2012 00:36:06 +0000 (16:36 -0800)]
drirc: Add quirk to disable GLSL line continuations for Savage2

This application is known to contain shaders that:

1. Have a stray backslash as the last line of comment lines
2. Have a declaration immediately following that line

Hence, interpreting that backslash as a line continuation causes the
declaration to be hidden and the shader fails to compile.  Fortunately, the
shaders also:

3. Do not have any other intentional line-continuation characters

So disabling line continuations entirely for the application fixes this
problem without causing any other breakage.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodriconf: Add a new option: disable_glsl_line_continuations
Carl Worth [Wed, 5 Dec 2012 00:29:00 +0000 (16:29 -0800)]
driconf: Add a new option: disable_glsl_line_continuations

This is to enable a quirk for Savage2 which includes a shader with a stray '\'
at the end of a comment line. Interpreting that backslash as a line
continuation will break the compilation of the shader, so we need a way to
disable this.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodriconf: Add proper dependency for compiling .mo files from .po files.
Carl Worth [Sat, 8 Dec 2012 03:18:28 +0000 (19:18 -0800)]
driconf: Add proper dependency for compiling .mo files from .po files.

Previously this was happening unconditionally, leading to some excessive
rebuilding/relinking during builds.

Note that the .po files are not automatically updated due to changes to the
t_options.h file. Instead, translators should continue to use "make po"
manually. This is because after new strings are merged into the existing .po
file, manual work is still required by translators to ensure that the
translations are correct.

11 years agodriconf: Add translation-generation to build system, don't track generated files
Carl Worth [Mon, 3 Dec 2012 23:43:19 +0000 (15:43 -0800)]
driconf: Add translation-generation to build system, don't track generated files

Previously, the xmlpool directory had a lone Makefile to assist poeple in
manually invoking a deep make in order to update the translations in
options.h. We can observe that this wasn't happening in fact, (new
translations had been added to de.po without being generated into options.h,
and new options had been manually added directly to options.h rather than to
t_options.h).

Prevent both of these problems from occurring in the future by automatically
generating options.h as part of the standard build of mesa.

For this, the generated options.h is now removed from version control, (along
with Makefile in favor of Makefile.am).

[chadv: Port the Autotools changes to Android.]
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodriconf: Fix German translations by removing a couple of bogus backslashes
Carl Worth [Mon, 3 Dec 2012 23:43:20 +0000 (15:43 -0800)]
driconf: Fix German translations by removing a couple of bogus backslashes

As can be seen, many other translation strings already include a single
apostrophe just fine without any escaping. This strangely-escaped apostrophe
was causing a build failure ("invalid escape sequence") resulting in no "de"
translations in the final options.h file.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodriconf: Fix gen_xmlpool.py script to allow running from any directory
Chad Versace [Thu, 6 Dec 2012 04:47:52 +0000 (20:47 -0800)]
driconf: Fix gen_xmlpool.py script to allow running from any directory

The gen_xmlpool.py script would work correctly only when executed from the
directory that contained the script. This shortcoming was due to some
hard-coded paths in the script.

In order to easily invoke the script from the Android build system, we
must be able to execute the script from an arbitrary directory. To enable
that, this patch replaces the two hard-coded paths with new command line
arguments.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Carl Worth <cworth@cworth.org>
11 years agodriconf: Add some translations which have been available, but were not compiled
Carl Worth [Mon, 3 Dec 2012 23:43:17 +0000 (15:43 -0800)]
driconf: Add some translations which have been available, but were not compiled

These translations have existed in the de.po file, but were not in the
generated options.h file. This was fixed by simply running "make options.h".

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodriconf: Add option definitions to source file, not generated target
Carl Worth [Mon, 3 Dec 2012 23:43:16 +0000 (15:43 -0800)]
driconf: Add option definitions to source file, not generated target

For the last two most-recently-added driconf options, their definition was
manually added to options.h, a file which is intended to be automatically
generated, (as part of support for translated driconf option
descriptions). This means that these options would be eliminated if the
generation step were performed again.

Fix this by correctly adding the definitions of these options to t_options.h,
(the file used as input to the generator), and not the options.h file, which
is generated.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agotargets/opencl: Link against libgallium.la instead of libgallium.a
Tom Stellard [Fri, 11 Jan 2013 17:28:35 +0000 (17:28 +0000)]
targets/opencl: Link against libgallium.la instead of libgallium.a

11 years agodrivers/radeon: Don't link against libgallium.la
Tom Stellard [Fri, 11 Jan 2013 17:27:45 +0000 (17:27 +0000)]
drivers/radeon: Don't link against libgallium.la

This fixes several duplicate symbol errors.

libllvmradeon is a simple helper library.  If it requires symbols in
other libraries, this should be taken care of by the gallium target that
uses it (e.g. libr600.la)

11 years agomesa: Use _mesa_lookup_enum_by_nr in tex*_error_check
Matt Turner [Fri, 30 Nov 2012 19:10:20 +0000 (11:10 -0800)]
mesa: Use _mesa_lookup_enum_by_nr in tex*_error_check

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agomesa/es3: Add support for GL_PRIMITIVE_RESTART_FIXED_INDEX
Ian Romanick [Sat, 11 Aug 2012 05:28:27 +0000 (22:28 -0700)]
mesa/es3: Add support for GL_PRIMITIVE_RESTART_FIXED_INDEX

This requires some derived state.  The cut vertex used is either the
value specified by glPrimitiveRestartIndex or it's hard-coded to ~0.
The derived state gl_array_attrib::_RestartIndex captures this value.
In addition, the derived state gl_array_attrib::_PrimitiveRestart is set
whenever either gl_array_attrib::PrimitiveRestart or
gl_array_attrib::PrimitiveRestartFixedIndex is set.

v2: Use _mesa_is_gles3.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoi965: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE
Ian Romanick [Fri, 9 Nov 2012 18:23:30 +0000 (10:23 -0800)]
i965: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE

We just treat this as an alias for GL_ANY_SAMPLES_PASSED.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa/es3: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE query target
Ian Romanick [Sat, 11 Aug 2012 04:38:21 +0000 (21:38 -0700)]
mesa/es3: Add support for GL_ANY_SAMPLES_PASSED_CONSERVATIVE query target

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agomesa/es3: Allow transpose matrix uniforms in GLES3
Ian Romanick [Wed, 8 Aug 2012 20:11:32 +0000 (13:11 -0700)]
mesa/es3: Allow transpose matrix uniforms in GLES3

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoglcpp: Reject token pasting operator in GLES
Matt Turner [Tue, 27 Nov 2012 20:18:02 +0000 (12:18 -0800)]
glcpp: Reject token pasting operator in GLES

The GLSL ES 3.0 spec (Section 12.17) says:
"GLSL ES 1.00 removed token pasting and other functionality."

NOTE: This is a candidate for the stable branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Carl Worth <cworth@cworth.org>
11 years agoglcpp: Make undefined macros illegal in #if and #elif for GLES3
Carl Worth [Mon, 26 Nov 2012 23:00:05 +0000 (15:00 -0800)]
glcpp: Make undefined macros illegal in #if and #elif for GLES3

Simply emitting a nicely-formatted error message if any undefined macro is
encountered in a parser context expecting an expression.

With this commit, the following piglit test now passes:

spec/glsl-es-3.00/compiler/undefined-macro.vert

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoglcpp: Add a flag to the parser state to indicate GLES.
Carl Worth [Mon, 26 Nov 2012 22:53:54 +0000 (14:53 -0800)]
glcpp: Add a flag to the parser state to indicate GLES.

This can be triggered either by creation of a GLES context (with
api == API_OPENGLES2) or else by a #version directive with version
value 100 or with a string of "es" following the version value.

There's no behavioral change with this commit—just preparation for ES-specific
behavior in the preprocessor in the future.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoglcpp: Add back tests/*.out to .gitignore
Andreas Boll [Fri, 11 Jan 2013 10:46:18 +0000 (11:46 +0100)]
glcpp: Add back tests/*.out to .gitignore

Accidentally removed in ac2793cf3e1e004942c386dfa45f3b5507223f50

11 years agotargets/egl-static: fix link failure to libwayland-drm
Knut Andre Tidemann [Fri, 11 Jan 2013 09:35:48 +0000 (10:35 +0100)]
targets/egl-static: fix link failure to libwayland-drm

Fixes the following build error:
  CXXLD    egl_gallium.la
g++: error: ../../../../src/egl/wayland/wayland-drm/.libs/.libs/libwayland-drm.a: No
such file or directory

Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
11 years agotargets/dri-swrast: Force c++ linker in all cases.
Johannes Obermayr [Fri, 11 Jan 2013 05:06:33 +0000 (06:06 +0100)]
targets/dri-swrast: Force c++ linker in all cases.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59226
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
Tested-by: Vinson Lee <vlee@freedesktop.org>
11 years agollvmpipe: fix clearing integer color buffers
Roland Scheidegger [Fri, 11 Jan 2013 02:10:20 +0000 (18:10 -0800)]
llvmpipe: fix clearing integer color buffers

We get int/uint clear color value in this case, and util_pack_color can't
handle these formats at all (even if it could, float input color isn't what
we want).
Pass through the color union appropriately and handle the packing ourselves
(as I couldn't think of a good generic util solution).
This gets piglit fbo_integer_precision_clear and
fbo_integer_readpixels_sint_uint from the ext_texture_integer test group from
segfault to pass (which only leaves fbo-blending from that group not working).

v2: fix up comments

11 years agogallivm: fix border color for integer textures
Roland Scheidegger [Wed, 9 Jan 2013 22:38:14 +0000 (14:38 -0800)]
gallivm: fix border color for integer textures

Need to bitcast the float border color (luckily we already get
the color as int just disguised as float).
Fixes piglit texwrap GL_EXT_texture_integer bordercolor.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agogallivm: more integer texture format fetch fixes
Roland Scheidegger [Thu, 10 Jan 2013 19:16:40 +0000 (11:16 -0800)]
gallivm: more integer texture format fetch fixes

Change the texel type to int/uint instead of float throughout the sampling
code which makes it easier to catch errors (as llvm will complain about wrong
types if we mistakenly treat these values as real floats somewhere).
This should also get things like e.g. sampler swizzles (for unused channels)
right.
This fixes piglit texture_integer_glsl130 test.
Border color not working (crashing) yet.
(These formats are not exposed yet in llvmpipe.)

v2: couple cleanups according to José's comments

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agobuild: mapi/glapi/gen: Use BUILT_SOURCES
Matt Turner [Mon, 17 Sep 2012 22:16:06 +0000 (15:16 -0700)]
build: mapi/glapi/gen: Use BUILT_SOURCES

11 years agoClean up .gitignore files
Matt Turner [Mon, 10 Sep 2012 21:31:05 +0000 (14:31 -0700)]
Clean up .gitignore files

11 years agoRemove MESA_PIC_FLAGS macro
Matt Turner [Thu, 6 Sep 2012 03:41:08 +0000 (20:41 -0700)]
Remove MESA_PIC_FLAGS macro

11 years agoRemove installmesa
Matt Turner [Thu, 6 Sep 2012 03:39:11 +0000 (20:39 -0700)]
Remove installmesa

11 years agoRemove minstall
Matt Turner [Thu, 6 Sep 2012 03:38:44 +0000 (20:38 -0700)]
Remove minstall

11 years agoRemove checking for makedepend
Matt Turner [Thu, 6 Sep 2012 03:37:15 +0000 (20:37 -0700)]
Remove checking for makedepend

11 years agoRemove gallium's unused Makefile.template
Matt Turner [Thu, 6 Sep 2012 03:35:59 +0000 (20:35 -0700)]
Remove gallium's unused Makefile.template

11 years agoRemove gbm's unused Makefile.template
Matt Turner [Thu, 6 Sep 2012 03:35:41 +0000 (20:35 -0700)]
Remove gbm's unused Makefile.template

11 years agoRemove gallium targets' Makefile.{dri,vdpau,xorg,xvmc}
Matt Turner [Thu, 6 Sep 2012 03:34:53 +0000 (20:34 -0700)]
Remove gallium targets' Makefile.{dri,vdpau,xorg,xvmc}

11 years agoRemove mklib
Matt Turner [Thu, 6 Sep 2012 03:33:11 +0000 (20:33 -0700)]
Remove mklib

11 years agoRemove unused glsl Makefile.template
Matt Turner [Thu, 6 Sep 2012 03:31:57 +0000 (20:31 -0700)]
Remove unused glsl Makefile.template

11 years agoRemove configs/{current,default}
Matt Turner [Thu, 6 Sep 2012 03:29:20 +0000 (20:29 -0700)]
Remove configs/{current,default}

11 years agogallium/tests/unit: Convert to automake
Andreas Boll [Tue, 27 Nov 2012 18:18:25 +0000 (19:18 +0100)]
gallium/tests/unit: Convert to automake

11 years agogallium/tests/trivial: Convert to automake
Andreas Boll [Mon, 26 Nov 2012 18:58:12 +0000 (19:58 +0100)]
gallium/tests/trivial: Convert to automake

11 years agotargets/pipe-loader: Convert to automake
Matt Turner [Thu, 13 Sep 2012 17:45:01 +0000 (10:45 -0700)]
targets/pipe-loader: Convert to automake

C++ linking (controlled by the nodist_EXTRA idiom) is needed

unconditionally for:
nouveau (uses C++ in the driver)
r300 (since LLVM is always required)
radeonsi (since LLVM is always required)
swrast (if builting LLVM pipe)

and conditionally (depends whether LLVM is enabled) for
i915
r600
vmwgfx

and never needed for swrast (softpipe).

Unfortunately, automake seems to *always* link with C++ if nodist_EXTRA
is specified, even inside a false conditional. Not sure if this is a
bug, but it does seem to be weird behavior.

v2: Johannes Obermayr <johannesobermayr@gmx.de>
    - Fix some undefined symbols.

v3: Johannes Obermayr <johannesobermayr@gmx.de>
    - Install pipe_* to $(libdir)/gallium-pipe.

v4: Johannes Obermayr <johannesobermayr@gmx.de>
    - Build it only once on --enable-gallium-gbm / --enable-opencl.

11 years agotargets/gbm: Convert to automake
Matt Turner [Thu, 13 Sep 2012 17:10:14 +0000 (10:10 -0700)]
targets/gbm: Convert to automake

11 years agotargets/egl-static: Convert to automake
Matt Turner [Mon, 10 Sep 2012 18:21:26 +0000 (11:21 -0700)]
targets/egl-static: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system
    - Add missing Automake.inc

v3: Johannes Obermayr <johannesobermayr@gmx.de>
    - Fix linking.

v4: Andreas Boll <andreas.boll.dev@gmail.com>
    - Port changes from ff574d653b0731a324fd30324b0f211502219abf
  gallium/egl-static: Fix unresolved symbol 'clock_gettime'

11 years agotargets/xa-vmwgfx: Convert to automake
Matt Turner [Fri, 7 Sep 2012 22:24:24 +0000 (15:24 -0700)]
targets/xa-vmwgfx: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

11 years agotargets/xvmc-softpipe: Convert to automake
Matt Turner [Fri, 7 Sep 2012 21:03:27 +0000 (14:03 -0700)]
targets/xvmc-softpipe: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - add missing xvmc state tracker to _LIBADD variable

v3: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

11 years agotargets/xvmc-r600: Convert to automake
Matt Turner [Fri, 7 Sep 2012 20:56:04 +0000 (13:56 -0700)]
targets/xvmc-r600: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Add missing xvmc state tracker to _LIBADD variable

v3: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

11 years agotargets/xvmc-r300: Convert to automake
Matt Turner [Fri, 7 Sep 2012 20:53:51 +0000 (13:53 -0700)]
targets/xvmc-r300: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Add missing xvmc state tracker to _LIBADD variable

v3: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

11 years agotargets/xvmc-nouveau: Convert to automake
Matt Turner [Fri, 7 Sep 2012 20:50:43 +0000 (13:50 -0700)]
targets/xvmc-nouveau: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Add missing xvmc state tracker to _LIBADD variable

v3: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

11 years agobuild: AC_SUBST XVMC_MAJOR/MINOR
Matt Turner [Sat, 8 Sep 2012 03:47:04 +0000 (20:47 -0700)]
build: AC_SUBST XVMC_MAJOR/MINOR

11 years agotargets/xorg-radeonsi: Convert to automake
Matt Turner [Fri, 7 Sep 2012 20:25:59 +0000 (13:25 -0700)]
targets/xorg-radeonsi: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

11 years agotargets/xorg-r600: Convert to automake
Matt Turner [Fri, 7 Sep 2012 20:23:50 +0000 (13:23 -0700)]
targets/xorg-r600: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system