mesa.git
10 years agoconfigure: error out when building radeonsi without gallium-llvm
Emil Velikov [Fri, 7 Feb 2014 22:13:44 +0000 (22:13 +0000)]
configure: error out when building radeonsi without gallium-llvm

--enable-gallium-llvm is required by radeonsi. Currently we
check only for LLVM_VERSION_INT which is 0, whenever gallium-llvm
is disabled explicitly.

./configure --with-gallium-drivers=r600,radeonsi --disable-gallium-llvm

v2: Correct typo in error message. Spotted by Tom Stellard

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agoomx/radeonsi: fix target
Christian König [Tue, 11 Feb 2014 15:58:24 +0000 (16:58 +0100)]
omx/radeonsi: fix target

Another minor typo.

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agoomx: fix some minor configure.ac issues
Christian König [Tue, 11 Feb 2014 15:55:30 +0000 (16:55 +0100)]
omx: fix some minor configure.ac issues

Matt Turner noted the incorrect order, but I somehow forgotten to
change it before pushing upstream. The other one is a typo during rebase.

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agovl: add H264 encoding interface
Christian König [Mon, 15 Jul 2013 15:16:22 +0000 (09:16 -0600)]
vl: add H264 encoding interface

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Leo Liu <leo.liu@amd.com>
10 years agoi965: Don't call abort() on an unknown device.
Kenneth Graunke [Mon, 10 Feb 2014 09:54:23 +0000 (01:54 -0800)]
i965: Don't call abort() on an unknown device.

If we don't recognize the PCI ID, we can't reasonably load the driver.
However, calling abort() is quite rude - it means the application that
tried to initialize us (possibly the X server) can't continue via
fallback paths.  We already have a more polite mechanism - failing to
create the context.  So, just use that.

While we're at it, improve the error message.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73024
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Lu Hua <huax.lu@intel.com>
10 years agoglsl: Add locking to builtin_builder singleton
Daniel Kurtz [Fri, 7 Feb 2014 11:29:06 +0000 (19:29 +0800)]
glsl: Add locking to builtin_builder singleton

Consider a multithreaded program with two contexts A and B, and the
following scenario:

1. Context A calls initialize(), which allocates mem_ctx and starts
   building built-ins.
2. Context B calls initialize(), which sees mem_ctx != NULL and assumes
   everything is already set up.  It returns.
3. Context B calls find(), which fails to find the built-in since it
   hasn't been created yet.
4. Context A finally finishes initializing the built-ins.

This will break at step 3.  Adding a lock ensures that subsequent
callers of initialize() will wait until initialization is actually
complete.

Similarly, if any thread calls release while another thread is still
initializing, or calling find(), the mem_ctx/shader would get free'd while
from under it, leading to corruption or use-after-free crashes.

Fixes sporadic failures in Piglit's glx-multithread-shader-compile.

Bugzilla: https://bugs.freedesktop.org/69200
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "10.1 10.0" <mesa-stable@lists.freedesktop.org>
10 years agoi965/fs: Simplify FS_OPCODE_SET_OMASK stride mashing a bit.
Kenneth Graunke [Mon, 10 Feb 2014 23:37:09 +0000 (15:37 -0800)]
i965/fs: Simplify FS_OPCODE_SET_OMASK stride mashing a bit.

In the first case, we can simply call stride(mask, 16, 8, 2) rather than
creating a new register with a different stride, then immediately
changing it a second time.

In the second case, the stride was already what we wanted, so we can
just use mask without any changes at all.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoi965/fs: Simplify FS_OPCODE_SET_SAMPLE_ID stride mashing a bit.
Kenneth Graunke [Mon, 10 Feb 2014 22:46:49 +0000 (14:46 -0800)]
i965/fs: Simplify FS_OPCODE_SET_SAMPLE_ID stride mashing a bit.

stride(brw_vec1_reg(...) ...) takes some register, changes the strides,
then changes the strides again.  Let's do it once.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agodocs/GL3.txt: denote r600g support for ARB_viewport_array
Dave Airlie [Wed, 5 Feb 2014 01:00:38 +0000 (11:00 +1000)]
docs/GL3.txt: denote r600g support for ARB_viewport_array

Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agor600g: add support for multiple viewports.
Dave Airlie [Fri, 31 Jan 2014 08:06:25 +0000 (08:06 +0000)]
r600g: add support for multiple viewports.

tested on rv635 and barts.

Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agost/mesa: add support for GL_ARB_viewport_array (v0.2)
Dave Airlie [Tue, 21 Jan 2014 05:26:29 +0000 (15:26 +1000)]
st/mesa: add support for GL_ARB_viewport_array (v0.2)

this just ties the mesa code to the pre-existing gallium interface,
I'm not sure what to do with the CSO stuff yet.

0.2: fix min/max bounds

Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agost/mesa: add support for viewport index semantic
Dave Airlie [Tue, 21 Jan 2014 04:55:59 +0000 (14:55 +1000)]
st/mesa: add support for viewport index semantic

This adds GS output and FS input support, even though FS input
support isn't supported until GLSL 4.30 from what I can see.

Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agoi965: Program 2x MSAA sample positions.
Kenneth Graunke [Mon, 10 Feb 2014 00:41:30 +0000 (16:41 -0800)]
i965: Program 2x MSAA sample positions.

There are only two sensible placements for 2x MSAA samples - and one is
the mirror image of the other.  I chose (0.25, 0.25) and (0.75, 0.75).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
10 years agoi965: Store 4x MSAA sample positions in a scalar value, not an array.
Kenneth Graunke [Mon, 10 Feb 2014 00:34:22 +0000 (16:34 -0800)]
i965: Store 4x MSAA sample positions in a scalar value, not an array.

Storing a single value in an array is rather pointless.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
10 years agoi965: Duplicate less code in GetSamplePositions driver hook.
Kenneth Graunke [Mon, 10 Feb 2014 00:29:41 +0000 (16:29 -0800)]
i965: Duplicate less code in GetSamplePositions driver hook.

The 4x and 8x cases contained identical code for extracting the X and
Y sample offset values and converting them from U0.4 back to float.

Without this refactoring, we'd have to duplicate it a third time in
order to support 2x MSAA.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
10 years agonouveau/video: make sure that firmware is present when checking caps
Ilia Mirkin [Sat, 8 Feb 2014 20:22:46 +0000 (15:22 -0500)]
nouveau/video: make sure that firmware is present when checking caps

Apparently some players are ill-prepared for us claiming that a decoder
exists only to have creating it fail, and express this poor preparation
with crashes (e.g. flash). Check that firmware is there to increase the
chances of there being a high correlation between reported capabilities
and ability to create a decoder.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: 10.0 10.1 <mesa-stable@lists.freedesktop.org>
Tested-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agomesa: Fix MESA_FORMAT_Z24_UNORM_S8_UINT vs. X8_UINT mix-up.
Kenneth Graunke [Sat, 8 Feb 2014 05:53:18 +0000 (21:53 -0800)]
mesa: Fix MESA_FORMAT_Z24_UNORM_S8_UINT vs. X8_UINT mix-up.

In commit eeed49f5f290793870c60b5b635b977a732a1eb4, Mark accidentally
renamed MESA_FORMAT_S8_Z24 to MESA_FORMAT_Z24_UNORM_X8_UINT and
MESA_FORMAT_X8_Z24 to MESA_FORMAT_Z24_UNORM_S8_UINT, reversing their
sense.  The commit message was correct, but what sed commands actually
got run didn't match that.

This patch swaps the two enum names, reversing them.  This should undo
the damage, but might break things if people have manually fixed a few
instances in the meantime...

Mark's commit also failed to mention renames:
s/MESA_FORMAT_ARGB2101010_UINT\b/MESA_FORMAT_B10G10R10A2_UINT/g
s/MESA_FORMAT_ABGR2101010\b/MESA_FORMAT_R10G10B10A2_UNORM/g
but those seem okay.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
10 years agomesa: remove duplicated init of MaxViewports
Maxence Le Doré [Sun, 26 Jan 2014 10:25:44 +0000 (11:25 +0100)]
mesa: remove duplicated init of MaxViewports

Already declared 5 lines before.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agogallium: add geometry shader output limits
Grigori Goronzy [Sun, 9 Feb 2014 21:56:20 +0000 (22:56 +0100)]
gallium: add geometry shader output limits

v2: adjust limits for radeonsi and llvmpipe
v3: add documentation

Cc: "10.1" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
10 years agomesa: Removed unnecessary check for NULL pointer when freeing memory
Siavash Eliasi [Thu, 30 Jan 2014 08:08:55 +0000 (11:38 +0330)]
mesa: Removed unnecessary check for NULL pointer when freeing memory

Note that it is OK to pass NULL pointers to this function since this commit:

mesa: modified _mesa_align_free() to accept NULL pointer
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0cc59d68a9f5231e8e2111393a1834858820735

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
10 years agonv30: report 8 maximum inputs
Ilia Mirkin [Wed, 29 Jan 2014 17:36:13 +0000 (12:36 -0500)]
nv30: report 8 maximum inputs

nvfx_fragprog_assign_generic only allows for up to 10/8 texcoords for
nv40/nv30. This fixes compilation of the varying-packing tests.
Furthermore it appears that the last 2 inputs on nv4x don't seem to
work in those tests, so just report 8 everywhere for now.

Tested on NV42, NV44. NV4B appears to have additional problems.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: 9.1 9.2 10.0 10.1 <mesa-stable@lists.freedesktop.org>
10 years agonv50/ir/ra: some register spilling fixes
Christoph Bumiller [Sat, 8 Feb 2014 18:32:54 +0000 (19:32 +0100)]
nv50/ir/ra: some register spilling fixes

Cc: 10.1 <mesa-stable@lists.freedesktop.org>
10 years agomesa: update assertion in detach_shader() for geom shaders
Brian Paul [Sat, 8 Feb 2014 20:39:45 +0000 (13:39 -0700)]
mesa: update assertion in detach_shader() for geom shaders

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74723
Cc: "10.0" "10.1" <mesa-stable@lists.freedesktop.org>
Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
10 years agomesa: allocate gl_debug_state on demand
Brian Paul [Fri, 7 Feb 2014 01:21:58 +0000 (18:21 -0700)]
mesa: allocate gl_debug_state on demand

We don't need to allocate all the state related to GL_ARB_debug_output
until some aspect of that extension is actually needed.

The sizeof(gl_debug_state) is huge (~285KB on 64-bit systems), not even
counting the 54(!) hash tables and lists that it contains.  This change
reduces the size of gl_context alone from 431KB bytes to 145KB bytes on
64-bit systems and from 277KB bytes to 78KB bytes on 32-bit systems.

Reviewed-by: Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agomesa: trivial clean-ups in errors.c
Brian Paul [Fri, 7 Feb 2014 01:21:58 +0000 (18:21 -0700)]
mesa: trivial clean-ups in errors.c

Whitespace changes, 78-column rewrapping, comment clean-ups, add
some braces, etc.

Reviewed-by: Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agomesa: remove _mesa_ prefix from some static functions
Brian Paul [Fri, 7 Feb 2014 01:21:58 +0000 (18:21 -0700)]
mesa: remove _mesa_ prefix from some static functions

Reviewed-by: Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965: Label JIP and UIP in Broadwell shader disassembly.
Kenneth Graunke [Wed, 5 Feb 2014 09:47:10 +0000 (01:47 -0800)]
i965: Label JIP and UIP in Broadwell shader disassembly.

This makes it obvious which number is which.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Don't disassemble UIP field for Broadwell WHILE instructions.
Kenneth Graunke [Wed, 5 Feb 2014 09:35:50 +0000 (01:35 -0800)]
i965: Don't disassemble UIP field for Broadwell WHILE instructions.

The WHILE instruction doesn't have UIP.  It only has JIP.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Don't print source registers for Broadwell flow control.
Kenneth Graunke [Wed, 5 Feb 2014 09:32:39 +0000 (01:32 -0800)]
i965: Don't print source registers for Broadwell flow control.

The bits which normally contain the source register descriptions
actually contain the JIP/UIP jump targets, which we already printed.

Interpreting JIP/UIP as source registers results in some really creepy
looking output, like IF statements with acc14.4<0,1,0>UD sources.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Fix fast depth clear values on Broadwell.
Kenneth Graunke [Fri, 7 Feb 2014 21:56:27 +0000 (13:56 -0800)]
i965: Fix fast depth clear values on Broadwell.

Broadwell's 3DSTATE_CLEAR_PARAMS packet expects a floating point value
regardless of format.  This means we need to stop converting it to
UNORM.

Storing the value as float would make sense, but since we already have a
uint32_t field, this patch continues shoehorning it into that.  In a
sense, this makes mt->depth_clear_value the DWord you emit in the
packet, rather than the clear value itself.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agonvc0: handle TGSI_SEMANTIC_LAYER
Christoph Bumiller [Fri, 7 Feb 2014 22:04:43 +0000 (23:04 +0100)]
nvc0: handle TGSI_SEMANTIC_LAYER

Cc: 10.1 <mesa-stable@lists.freedesktop.org>
10 years agonvc0: create the SW object
Christoph Bumiller [Fri, 7 Feb 2014 21:51:27 +0000 (22:51 +0100)]
nvc0: create the SW object

It's required for being able to use software methods now.

10 years agonvc0/ir/emit: hardcode vertex output stream to 0 for now
Christoph Bumiller [Fri, 7 Feb 2014 21:39:44 +0000 (22:39 +0100)]
nvc0/ir/emit: hardcode vertex output stream to 0 for now

10 years agoi965: Enable ARB_texture_gather for one component on Gen6.
Chris Forbes [Sun, 2 Feb 2014 09:00:18 +0000 (22:00 +1300)]
i965: Enable ARB_texture_gather for one component on Gen6.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965/vec4: Emit shader w/a for Gen6 gather
Chris Forbes [Mon, 3 Feb 2014 09:15:41 +0000 (22:15 +1300)]
i965/vec4: Emit shader w/a for Gen6 gather

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965/fs: Emit shader w/a for Gen6 gather
Chris Forbes [Mon, 3 Feb 2014 09:15:16 +0000 (22:15 +1300)]
i965/fs: Emit shader w/a for Gen6 gather

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965: Add surface format overrides for Gen6 gather
Chris Forbes [Mon, 3 Feb 2014 09:14:45 +0000 (22:14 +1300)]
i965: Add surface format overrides for Gen6 gather

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965: Add Gen6 gather wa to sampler key
Chris Forbes [Mon, 3 Feb 2014 09:13:03 +0000 (22:13 +1300)]
i965: Add Gen6 gather wa to sampler key

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoglsl: Optimize triop_csel with all-true or all-false.
Eric Anholt [Fri, 1 Nov 2013 19:29:12 +0000 (12:29 -0700)]
glsl: Optimize triop_csel with all-true or all-false.

Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agoglsl: Optimize various cases of fma (aka MAD).
Eric Anholt [Sat, 18 Jan 2014 19:06:16 +0000 (11:06 -0800)]
glsl: Optimize various cases of fma (aka MAD).

Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agoglsl: Optimize lrp(x, x, coefficient) --> x.
Eric Anholt [Sat, 18 Jan 2014 19:00:51 +0000 (11:00 -0800)]
glsl: Optimize lrp(x, x, coefficient) --> x.

total instructions in shared programs: 1627754 -> 1624534 (-0.20%)
instructions in affected programs:     45748 -> 42528 (-7.04%)
GAINED:                                3
LOST:                                  0

(serious sam, humus domino demo)

Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agoglsl: Optimize pow(x, 1) -> x.
Eric Anholt [Sat, 18 Jan 2014 18:57:29 +0000 (10:57 -0800)]
glsl: Optimize pow(x, 1) -> x.

total instructions in shared programs: 1627826 -> 1627754 (-0.00%)
instructions in affected programs:     6640 -> 6568 (-1.08%)
GAINED:                                0
LOST:                                  0

(HoN and savage2)

Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agoglsl: Optimize log(exp(x)) and exp(log(x)) into x.
Eric Anholt [Sat, 18 Jan 2014 18:47:19 +0000 (10:47 -0800)]
glsl: Optimize log(exp(x)) and exp(log(x)) into x.

Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agoglsl: Optimize ~~x into x.
Eric Anholt [Sat, 18 Jan 2014 18:36:28 +0000 (10:36 -0800)]
glsl: Optimize ~~x into x.

v2: Fix pasteo of an extra abs being inserted (caught by many).  Rewrite
    to drop the silly switch statement.

Reviewed-by: Matt Turner <mattst88@gmail.com> (v1)
10 years agoi965: Add some informative debug when the X Server botches DRI2 GetBuffers.
Eric Anholt [Tue, 31 Dec 2013 02:19:21 +0000 (18:19 -0800)]
i965: Add some informative debug when the X Server botches DRI2 GetBuffers.

We've had various bug reports over the years where miptrees are missing,
and when I screwed it up while adding DRI2 to the modesetting driver, I
figured I should put the info necessary for debug here.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965: Remove redundant check in blitter-based glBlitFramebuffer().
Eric Anholt [Mon, 30 Sep 2013 22:19:54 +0000 (15:19 -0700)]
i965: Remove redundant check in blitter-based glBlitFramebuffer().

The intel_miptree_blit() code checks the format for us now, plus it
handles xrgb vs argb for us.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965: Fix Gen8+ disassembly of half float subregister numbers.
Kenneth Graunke [Wed, 29 Jan 2014 22:12:51 +0000 (14:12 -0800)]
i965: Fix Gen8+ disassembly of half float subregister numbers.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoi965: Use the new brw_load_register_mem helper for draw indirect.
Kenneth Graunke [Thu, 30 Jan 2014 04:51:28 +0000 (20:51 -0800)]
i965: Use the new brw_load_register_mem helper for draw indirect.

This makes it work on Broadwell, too.

v2: Drop bogus double write to 3DPRIM_BASE_VERTEX register
    (caught by Chris Forbes).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
10 years agoi965: Implement a brw_load_register_mem helper function.
Kenneth Graunke [Thu, 30 Jan 2014 04:43:49 +0000 (20:43 -0800)]
i965: Implement a brw_load_register_mem helper function.

This saves some boilerplate and hides the OUT_RELOC/OUT_RELOC64
distinction.

Placing the function in intel_batchbuffer.c is rather arbitrary; there
wasn't really an obvious place for it.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
10 years agoi965: Fix INTEL_DEBUG=vs for fixed-function/ARB programs.
Kenneth Graunke [Mon, 3 Feb 2014 19:13:48 +0000 (11:13 -0800)]
i965: Fix INTEL_DEBUG=vs for fixed-function/ARB programs.

Since commit 9cee3ff562f3e4b51bfd30338fd1ba7716ac5737, INTEL_DEBUG=vs
has caused a NULL pointer dereference for fixed-function/ARB programs.

In the vec4 generators, "prog" is a gl_program, and "shader_prog" is the
gl_shader_program.  This is different than the FS visitor.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoglsl: Don't lose precision qualifiers when encountering "centroid".
Kenneth Graunke [Thu, 6 Feb 2014 05:42:00 +0000 (21:42 -0800)]
glsl: Don't lose precision qualifiers when encountering "centroid".

Mesa fails to retain the precision qualifier when parsing:

   #version 300 es
   centroid in mediump vec2 v;

Consider how the parser's type_qualifier production is applied.
First, the precision_qualifier rule creates a new ast_type_qualifier:

    <precision: mediump>

Then the storage_qualifier rule creates a second one:

    <flags: in>

and calls merge_qualifier() to fold in any previous qualifications,
returning:

    <flags: in, precision: mediump>

Finally, the auxiliary_storage_qualifier creates one for "centroid":

    <flags: centroid>

it then does $$ = $1 and $$.flags |= $2.flags, resulting in:

    <flags: centroid, in>

Since precision isn't stored in the flags bitfield, it is lost.  We need
to instead call merge_qualifier to combine all the fields.

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reported-by: Kevin Rogovin <kevin.rogovin@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agost/mesa: avoid sw fallback for getting/decompressing textures
Brian Paul [Fri, 7 Feb 2014 16:32:05 +0000 (09:32 -0700)]
st/mesa: avoid sw fallback for getting/decompressing textures

If st_GetTexImage() is to decompress the texture, avoid the fallback
path even if prefer_blit_based_texture_transfer = false.  For drivers
that returned PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER = 0, we
were always taking the fallback path for texture decompression rather
than rendering a quad.  The later is a lot faster.

Cc: "10.0" "10.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
10 years agogallium/tgsi: correct typo propagated from NV_vertex_program1_1
Erik Faye-Lund [Fri, 7 Feb 2014 12:45:11 +0000 (13:45 +0100)]
gallium/tgsi: correct typo propagated from NV_vertex_program1_1

In the specification text of NV_vertex_program1_1, the upper
limit of the RCC instruction is written as 1.884467e+19 in
scientific notation, but as 0x5F800000 in binary. But the binary
version translates to 1.84467e+19 rather than 1.884467e+19 in
scientific notation.

Since the lower-limit equals 2^-64 and the binary version equals
2^+64, let's assume the value in scientific notation is a typo
and implement this using the value from the binary version
instead.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agogallium/tgsi: use CLAMP instead of open-coded clamps
Erik Faye-Lund [Fri, 7 Feb 2014 12:45:10 +0000 (13:45 +0100)]
gallium/tgsi: use CLAMP instead of open-coded clamps

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoegl: Unhide functionality in _eglInitSurface()
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:44:05 +0000 (14:44 +0200)]
egl: Unhide functionality in _eglInitSurface()

_eglInitResource() was used to memset entire _EGLSurface by
writing more than size of pointed target. This does work
as long as Resource is the first element in _EGLSurface,
this patch fixes such dependency.

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoegl: Unhide functionality in _eglInitContext()
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:44:04 +0000 (14:44 +0200)]
egl: Unhide functionality in _eglInitContext()

_eglInitResource() was used to memset entire _EGLContext by
writing more than size of pointed target. This does work
as long as Resource is the first element in _EGLContext,
this patch fixes such dependency.

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoglx: Add missing null check in __glX_send_client_info()
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:44:03 +0000 (14:44 +0200)]
glx: Add missing null check in __glX_send_client_info()

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoi965: Add missing null check in fs_visitor::dead_code_eliminate_local()
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:44:02 +0000 (14:44 +0200)]
i965: Add missing null check in fs_visitor::dead_code_eliminate_local()

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoglx: Add some missing null checks in glx_pbuffer.c
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:44:00 +0000 (14:44 +0200)]
glx: Add some missing null checks in glx_pbuffer.c

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoglsl: Fix null access on file read error
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:43:59 +0000 (14:43 +0200)]
glsl: Fix null access on file read error

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoglx: Add missing null check in __glXCloseDisplay
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:43:58 +0000 (14:43 +0200)]
glx: Add missing null check in __glXCloseDisplay

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoglx: Add missing null checks in glxcmds.c
Juha-Pekka Heikkila [Fri, 7 Feb 2014 12:43:57 +0000 (14:43 +0200)]
glx: Add missing null checks in glxcmds.c

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomain/get: support ARB_gpu_shader5
Jordan Justen [Sat, 25 Jan 2014 18:55:22 +0000 (10:55 -0800)]
main/get: support ARB_gpu_shader5

If a driver enables ARB_gpu_shader5 and sets Const.MaxVertexSteams >= 4,
then piglit's arb_gpu_shader5-minmax test should now pass.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agoglapi: add definitions for ARB_gpu_shader5
Jordan Justen [Sat, 25 Jan 2014 18:55:21 +0000 (10:55 -0800)]
glapi: add definitions for ARB_gpu_shader5

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agonouveau/codegen: allow tex offsets on non-TXF instructions (e.g. TXL)
Ilia Mirkin [Tue, 4 Feb 2014 07:53:54 +0000 (02:53 -0500)]
nouveau/codegen: allow tex offsets on non-TXF instructions (e.g. TXL)

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
10 years agonv50: only over-allocate by a page for code
Ilia Mirkin [Tue, 4 Feb 2014 07:30:18 +0000 (02:30 -0500)]
nv50: only over-allocate by a page for code

The pre-fetching doesn't go too far. Tested with over-allocating by only
a page, and didn't see any errors in dmesg. Saves ~512KB of VRAM.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: 10.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
10 years agonv50: fix layerid to be the fp input number rather than vp output number
Ilia Mirkin [Tue, 4 Feb 2014 04:35:14 +0000 (23:35 -0500)]
nv50: fix layerid to be the fp input number rather than vp output number

In the tests they were the same so it didn't matter, but indications are
that this is the correct behaviour. Also take this opportunity to
(trivially) support using gl_Layer in fp.

Cc: 10.1 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
10 years agonv50: rework primid logic
Ilia Mirkin [Tue, 4 Feb 2014 04:20:32 +0000 (23:20 -0500)]
nv50: rework primid logic

Functionally identical but much simpler. Should also better integrate
with future layer/viewport changes/fixes.

Cc: 10.1 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
10 years agoglx: Pass NULL DRI drawables into the DRI driver for None GLX drawables
Kristian Høgsberg [Wed, 5 Feb 2014 19:43:58 +0000 (11:43 -0800)]
glx: Pass NULL DRI drawables into the DRI driver for None GLX drawables

GLX_ARB_create_context allows making a GLX context current with None
drawable and readables, but this was never implemented correctly in GLX.
We would create a __DRIdrawable for the None GLX drawable and pass that
to the DRI driver and that would somehow work.  Now it's somehow broken.

The way this should have worked is that we pass a NULL DRI drawable
to the DRI driver when the GLX user calls glXMakeContextCurrent()
with None for drawable and readables.

https://bugs.freedesktop.org/show_bug.cgi?id=74143
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
10 years agost/vdpau: add flush on unmap
Christian König [Tue, 28 Jan 2014 14:22:05 +0000 (15:22 +0100)]
st/vdpau: add flush on unmap

Flush the context when we unmap a buffer, otherwise VDPAU might
start rendering the next frame while we still reference that buffer.

Signed-off-by: Christian König <christian.koenig@amd.com>
Tested-by: StrangeNoises (rachel@strangenoises.org)
10 years agovdpau: flush the context before exporting the surface v2
Marek Olšák [Mon, 13 Jan 2014 13:13:01 +0000 (14:13 +0100)]
vdpau: flush the context before exporting the surface v2

Bugzilla (bug needs XBMC changes as well):
https://bugs.freedesktop.org/show_bug.cgi?id=73191

When VL uploads vertex buffers, it uses PIPE_TRANSFER_DONTBLOCK, which always
flushes the context in the winsys if the buffer being mapped is busy. Since
I added handling of DISCARD_RANGE, DONTBLOCK has had no effect when combined
with DISCARD_RANGE and I think the context isn't flushed anywhere else,
so no commands are submitted to the GPU until the IB is full, which takes
a lot of frames.

Using DISCARD_RANGE is not the only way to trigger this bug. The other way
is to reallocate the vertex buffer before every upload.

BTW, I'm not sure if this is the right place for flushing, but it does fix
the bug.

v2 (chk): move the flush to the right place.

Signed-off-by: Christian König <christian.koenig@amd.com>
Tested-by: StrangeNoises (rachel@strangenoises.org)
10 years agoglsl: Initialize ubo_binding_mask flags to zero.
Matt Turner [Mon, 3 Feb 2014 19:51:51 +0000 (11:51 -0800)]
glsl: Initialize ubo_binding_mask flags to zero.

Missed in commit e63bb298. Caused sporadic test failures, like
incorrect-in-layout-qualifier-repeated-prim.geom.

Cc: "10.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
10 years agogallium/radeon: fix warnings
Marek Olšák [Thu, 6 Feb 2014 16:43:29 +0000 (17:43 +0100)]
gallium/radeon: fix warnings

10 years agogallium: remove PIPE_USAGE_STATIC
Marek Olšák [Mon, 3 Feb 2014 02:42:17 +0000 (03:42 +0100)]
gallium: remove PIPE_USAGE_STATIC

Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agogallium: define the behavior of PIPE_USAGE_* flags properly
Marek Olšák [Mon, 3 Feb 2014 02:21:29 +0000 (03:21 +0100)]
gallium: define the behavior of PIPE_USAGE_* flags properly

STATIC will be removed in the following commit.

v2: changed the definition of IMMUTABLE

Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agogallium: remove PIPE_RESOURCE_FLAG_GEN_MIPS
Marek Olšák [Mon, 3 Feb 2014 02:20:13 +0000 (03:20 +0100)]
gallium: remove PIPE_RESOURCE_FLAG_GEN_MIPS

Unused.

Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agor600g,radeonsi: set resource domains in one place (v2)
Marek Olšák [Tue, 4 Feb 2014 17:35:40 +0000 (18:35 +0100)]
r600g,radeonsi: set resource domains in one place (v2)

v2: This doesn't change the behavior. It only moves the tiling check
    to r600_init_resource and removes the usage parameter.

Reviewed-by: Christian König <christian.koenig@amd.com>
10 years agost/mesa: fix crash when a shader uses a TBO and it's not bound
Marek Olšák [Thu, 6 Feb 2014 01:16:50 +0000 (02:16 +0100)]
st/mesa: fix crash when a shader uses a TBO and it's not bound

This binds a NULL sampler view in that case.

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

Cc: "10.1" "10.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agost/omx: add workaround for bug in Bellagio
Christian König [Tue, 28 Jan 2014 13:21:14 +0000 (06:21 -0700)]
st/omx: add workaround for bug in Bellagio

Not blocking for the message thread can lead to accessing freed up memory.

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agost/omx: initial OpenMAX support v3
Christian König [Mon, 5 Aug 2013 17:41:27 +0000 (11:41 -0600)]
st/omx: initial OpenMAX support v3

Featuring a full grown MPEG2 and H264 decoder and a couple of hundred bugs.

v2 (Leo): fix an error for pic_order_cnt_type 1
v3 (Leo): implement support for field decoding

Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Leo Liu <leo.liu@amd.com>
10 years agovl/rbsp: add H.264 RBSP implementation
Christian König [Tue, 17 Sep 2013 14:20:32 +0000 (08:20 -0600)]
vl/rbsp: add H.264 RBSP implementation

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agovl/vlc: add function to limit the vlc size
Christian König [Tue, 17 Sep 2013 13:27:38 +0000 (07:27 -0600)]
vl/vlc: add function to limit the vlc size

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agovl/vlc: add remove bits function
Christian König [Tue, 17 Sep 2013 13:22:34 +0000 (07:22 -0600)]
vl/vlc: add remove bits function

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agoradeon: update legal notes on UVD
Christian König [Mon, 3 Feb 2014 17:12:43 +0000 (10:12 -0700)]
radeon: update legal notes on UVD

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agoradeon: just don't map VRAM buffers at all
Christian König [Mon, 27 Jan 2014 10:40:25 +0000 (03:40 -0700)]
radeon: just don't map VRAM buffers at all

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
10 years agoradeon/video: directly create buffers in the right domain
Christian König [Tue, 21 Jan 2014 18:49:06 +0000 (11:49 -0700)]
radeon/video: directly create buffers in the right domain

Avoid moving things around on start of stream.

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agoradeon/video: seperate common video functions
Christian König [Thu, 17 Oct 2013 12:21:40 +0000 (06:21 -0600)]
radeon/video: seperate common video functions

Signed-off-by: Christian König <christian.koenig@amd.com>
10 years agogallium/dri2: Fix dri2_dup_image
Axel Davy [Thu, 30 Jan 2014 15:10:54 +0000 (16:10 +0100)]
gallium/dri2: Fix dri2_dup_image

dri2_dup_image was not copying the dri_format field.

This was causing some bugs, for example:
. we create an gbm_bo.
. we get an EGLImage from the gbm_bo.
. Bug: impossible to get again the gbm_bo from the EGLImage by
  importing. (gbm dri2 backend)

Signed-off-by: Axel Davy <axel.davy@ens.fr>
10 years agoi965/vs: Fix typo in brw_compute_vue_map
Chris Forbes [Sat, 25 Jan 2014 06:51:50 +0000 (19:51 +1300)]
i965/vs: Fix typo in brw_compute_vue_map

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965: Fix register types in dump_instructions().
Kenneth Graunke [Wed, 5 Feb 2014 21:27:15 +0000 (13:27 -0800)]
i965: Fix register types in dump_instructions().

This regressed when I converted BRW_REGISTER_TYPE_* to be an abstract
type that doesn't match the hardware description.  dump_instruction()
was using reg_encoding[] from brw_disasm.c, which no longer matches
(and was incorrect for Gen8+ anyway).

This patch introduces a new function to convert the abstract enum values
into the letter suffix we expect.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reported-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
10 years agoegl/glx: Remove egl_glx driver
Chad Versace [Tue, 7 Jan 2014 20:08:30 +0000 (12:08 -0800)]
egl/glx: Remove egl_glx driver

Mesa now has a real, feature-rich EGL implementation on X11 via xcb.
Therefore I believe there is no longer a practical need for the egl_glx
driver.

Furthermore, egl_glx appears to be unmaintained.  The most recent
nontrivial commit to egl_glx was 6baa5f1 on 2011-11-25.

Tested by running weston-smoke in windowed Weston on X with i965.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Kristian Høgsberg <krh@bitplanet.net>
10 years agodocs: update 10.1 relnotes to note GL 3.3 on r600 and radeonsi.
Dave Airlie [Thu, 6 Feb 2014 01:03:09 +0000 (01:03 +0000)]
docs: update 10.1 relnotes to note GL 3.3 on r600 and radeonsi.

Signed-off-by: Dave Airlie <airlied@redhat.com>
10 years agotgsi/ureg: increase the number of immediates
Zack Rusin [Wed, 5 Feb 2014 00:33:12 +0000 (19:33 -0500)]
tgsi/ureg: increase the number of immediates

ureg_program is allocated on the heap so we can just bump the
number of immediates that it can handle. It's needed for d3d10.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
10 years agogallivm: make sure analysis works with large number of immediates
Zack Rusin [Wed, 5 Feb 2014 00:32:04 +0000 (19:32 -0500)]
gallivm: make sure analysis works with large number of immediates

We need to handle a lot more immediates and in order to do that
we also switch from allocating this structure on the stack to
allocating it on the heap.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
10 years agogallivm: handle huge number of immediates
Zack Rusin [Wed, 5 Feb 2014 00:28:58 +0000 (19:28 -0500)]
gallivm: handle huge number of immediates

We only supported up to 256 immediates, which isn't enough. We had
code which was allocating immediates as an allocated array, but it
was always used along a statically backed array for performance
reasons. This commit adds code to skip that performance optimization
and always use just the dynamically allocated immediates if the
number of them is too great.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
10 years agogallivm: allow large numbers of temporaries
Zack Rusin [Tue, 4 Feb 2014 02:40:24 +0000 (21:40 -0500)]
gallivm: allow large numbers of temporaries

The number of allowed temporaries increases almost with every
iteration of an api. We used to support 128, then we started
increasing and the newer api's support 4096+. So if we notice
that the number of temporaries is larger than our statically
allocated storage would allow we just treat them as indexable
temporaries and allocate them as an array from the start.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
10 years agoi965/fs: Assume FBO rendering in precompile if MRT.
Chris Forbes [Sat, 25 Jan 2014 22:04:42 +0000 (11:04 +1300)]
i965/fs: Assume FBO rendering in precompile if MRT.

If multiple color outputs are written, this shader is unlikely to be
useful with a winsys framebuffer.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965/fs: Guess nr_color_regions better in precompile
Chris Forbes [Sat, 25 Jan 2014 22:03:33 +0000 (11:03 +1300)]
i965/fs: Guess nr_color_regions better in precompile

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agodocs: Add relnotes for 10.2
Chris Forbes [Wed, 5 Feb 2014 21:17:17 +0000 (10:17 +1300)]
docs: Add relnotes for 10.2

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
10 years agomesa: Bump version to 10.2.0-devel
Chris Forbes [Wed, 5 Feb 2014 21:14:40 +0000 (10:14 +1300)]
mesa: Bump version to 10.2.0-devel

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>