mesa.git
11 years agoconfigure.ac: Build dricommon for DRI gallium drivers
Matt Turner [Tue, 5 Mar 2013 18:25:55 +0000 (10:25 -0800)]
configure.ac: Build dricommon for DRI gallium drivers

Commit 67ef7559 added an || test "x$enable_dri" check in an attempt to
get the DRI common bits built in some necessary cases. That change was
inappropriate as it made these common DRI pieces be built
unconditionally, so some builds were broken.

Subsequently, commit 998d975e3 change the "|| test" to a "-a"
conjunction within the existing test invocation. This made the '-a
"x$enable_dri" = xyes' clause have no effect, (as it was inside an
enclosing test for the same condition). So the new breakage from
commit 67ef7559 was addressed, but the original problems were
regressed.

The immediately preceding commit removed the redundant condition.

Now, finally this commit fixes the original problem as described in
the commit message of 67ef7559: this code should be compiled when
using the DRI state tracker. In order to do so, the HAVE_*_DRI
conditionals must be moved after the last assignment of HAVE_COMMON_DRI.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61821
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
11 years agoconfigure.ac: Remove redundant checks of enable_dri.
Matt Turner [Tue, 5 Mar 2013 18:27:22 +0000 (10:27 -0800)]
configure.ac: Remove redundant checks of enable_dri.

The whole block is enclosed inside if test "x$enable_dri" = xyes.

11 years agomesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.
Matt Turner [Mon, 4 Mar 2013 19:32:32 +0000 (11:32 -0800)]
mesa: Allow ETC2/EAC formats with ARB_ES3_compatibility.

Fixes piglit's oes_compressed_etc2_texture-miptree tests on Desktop GL.
Reported-by: Marek Olšák <maraeo@gmail.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi915g: Use PIPE_FLUSH_END_OF_FRAME to trigger throttling
Stéphane Marchesin [Fri, 8 Mar 2013 21:32:55 +0000 (13:32 -0800)]
i915g: Use PIPE_FLUSH_END_OF_FRAME to trigger throttling

This helps with jittering, instead of throttling at every command
buffer we only throttle once a frame.

11 years agoi915g: Update TODO
Stéphane Marchesin [Sat, 9 Mar 2013 00:16:33 +0000 (16:16 -0800)]
i915g: Update TODO

11 years agodocs: document another Viewperf bug
Brian Paul [Fri, 8 Mar 2013 17:32:39 +0000 (10:32 -0700)]
docs: document another Viewperf bug

11 years agodri/nouveau: fix crash in nouveau_flush
Jan de Groot [Thu, 7 Mar 2013 18:48:13 +0000 (19:48 +0100)]
dri/nouveau: fix crash in nouveau_flush

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

Note: this is a candidate for the stable branches

11 years agodraw: add const qualifier to silence compiler warning
Brian Paul [Thu, 7 Mar 2013 15:10:56 +0000 (08:10 -0700)]
draw: add const qualifier to silence compiler warning

11 years agollvmpipe: remove the power of two sizeof(struct cmd_block) assertion
Brian Paul [Wed, 6 Mar 2013 23:57:20 +0000 (16:57 -0700)]
llvmpipe: remove the power of two sizeof(struct cmd_block) assertion

It fails on 32-bit systems (I only tested on 64-bit).  Power of two
size isn't required, so just remove the assertion.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agovbo: fix crash found with shared display lists
Brian Paul [Wed, 6 Mar 2013 19:08:17 +0000 (12:08 -0700)]
vbo: fix crash found with shared display lists

This fixes a crash when a display list is created in one context
but executed from a second one.  The vbo_save_context::vertex_store
memeber will be NULL if we never created a display list with the
context.  Just check for that before dereferencing the pointer.

Fixes http://bugzilla.redhat.com/show_bug.cgi?id=918661

Note: This is a candidate for the stable branches.

11 years agomesa: fix glGetInteger*(GL_SAMPLER_BINDING).
Alan Hourihane [Wed, 6 Mar 2013 18:14:01 +0000 (18:14 +0000)]
mesa: fix glGetInteger*(GL_SAMPLER_BINDING).

If the sampler object has been deleted on another context, an
alternative context may reference the old sampler. So ensure the sampler
object still exists.

Note: this is a candidate for the stable branch.

Signed-off-by: Alan Hourihane <alanh@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoradeon/llvm: document LLVM commit
Christian König [Thu, 7 Mar 2013 09:06:24 +0000 (10:06 +0100)]
radeon/llvm: document LLVM commit

We need at least that revision to work correctly now.

Signed-off-by: Christian König <christian.koenig@amd.com>
11 years agoradeon/llvm: enable LICM and DCE pass v2
Christian König [Wed, 27 Feb 2013 21:40:24 +0000 (22:40 +0100)]
radeon/llvm: enable LICM and DCE pass v2

LICM stands for Loop Invariant Code Motion. Instructions that
does not depend of loop index are moved outside of loop body.

DCE is DeadCodeElimination.

v2: updated commit msg, thx to Vincent.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Vincent Lejeune <vljn at ovi.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoradeonsi: add LLVMNoUnwindAttribute to intrinsic
Christian König [Wed, 27 Feb 2013 21:39:26 +0000 (22:39 +0100)]
radeonsi: add LLVMNoUnwindAttribute to intrinsic

So LLVM can better eliminate dead code.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoradeonsi: rework input interpolation
Christian König [Tue, 5 Mar 2013 14:07:39 +0000 (15:07 +0100)]
radeonsi: rework input interpolation

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoradeonsi: remove SI.vs.load.buffer.index
Christian König [Tue, 5 Mar 2013 11:14:02 +0000 (12:14 +0100)]
radeonsi: remove SI.vs.load.buffer.index

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoradeon/llvm: make SGPRs proper function arguments v2
Christian König [Mon, 4 Mar 2013 15:30:06 +0000 (16:30 +0100)]
radeon/llvm: make SGPRs proper function arguments v2

v2: remove unrelated changes

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoradeon/llvm: replace shader type intrinsic with function attribute
Christian König [Mon, 4 Mar 2013 14:35:30 +0000 (15:35 +0100)]
radeon/llvm: replace shader type intrinsic with function attribute

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoradeonsi: switch to v*i8 for resources and samplers v2
Christian König [Fri, 1 Mar 2013 10:34:16 +0000 (11:34 +0100)]
radeonsi: switch to v*i8 for resources and samplers v2

v2: remove unrelated changes

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agor600g/llvm: Update CONSTANT_BUFFER address space definition
Christian König [Thu, 7 Mar 2013 09:02:24 +0000 (10:02 +0100)]
r600g/llvm: Update CONSTANT_BUFFER address space definition

To match recent LLVM changes.

Signed-off-by: Christian König <christian.koenig@amd.com>
11 years agodraw/llvm: fix inputs to the geometry shader
Zack Rusin [Wed, 27 Feb 2013 09:28:18 +0000 (01:28 -0800)]
draw/llvm: fix inputs to the geometry shader

We can't clip and viewport transform the vertices before we let
the geometry shader process them. Lets make sure the generated
vertex shader has both disabled if geometry shader is present.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agodraw: use geometry shader info in clip_init_state if appropriate
Bryan Cain [Fri, 15 Feb 2013 16:09:12 +0000 (10:09 -0600)]
draw: use geometry shader info in clip_init_state if appropriate

Reviewed-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agodraw: account for separate shader objects in geometry shader code
Bryan Cain [Fri, 15 Feb 2013 16:05:36 +0000 (10:05 -0600)]
draw: account for separate shader objects in geometry shader code

The geometry shader code seems to have been originally written with the
assumptions that there are the same number of VS outputs as GS outputs and
that VS outputs are in the same order as their corresponding GS inputs. Since
TGSI uses separate shader objects, these are both wrong assumptions. This
was causing several valid vertex/geometry shader combinations to either render
incorrectly or trigger an assertion.

Conflicts:
src/gallium/auxiliary/draw/draw_gs.c

Reviewed-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agoUnreference sampler object when it's currently bound to texture unit.
Alan Hourihane [Wed, 6 Mar 2013 16:08:58 +0000 (16:08 +0000)]
Unreference sampler object when it's currently bound to texture unit.

This change specifically unbinds a sampler object from the texture unit
if it's bound to a unit. The spec calls for default object when deleting
sampler objects which are currently bound.

Note: this is a candidate for the stable branches

Signed-off-by: Alan Hourihane <alanh@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agollvmpipe: fix incorrect 'j' array index in dummy texture code
Brian Paul [Wed, 6 Mar 2013 01:08:50 +0000 (18:08 -0700)]
llvmpipe: fix incorrect 'j' array index in dummy texture code

Use 0 instead.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agollvmpipe: remove unused cmd_block_list struct
Brian Paul [Mon, 4 Mar 2013 21:44:47 +0000 (14:44 -0700)]
llvmpipe: remove unused cmd_block_list struct

11 years agollvmpipe: add some scene limit sanity check assertions
Brian Paul [Mon, 4 Mar 2013 21:38:20 +0000 (14:38 -0700)]
llvmpipe: add some scene limit sanity check assertions

Note: This is a candidate for the stable branches.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: tweak CMD_BLOCK_MAX and LP_SCENE_MAX_SIZE
Brian Paul [Mon, 4 Mar 2013 21:33:04 +0000 (14:33 -0700)]
llvmpipe: tweak CMD_BLOCK_MAX and LP_SCENE_MAX_SIZE

We advertise a max texture/surfaces size of 8K x 8K but the old values
for these limits didn't actually allow us to handle that surface size.

For 8K x 8K we'll have 16384 bins.  Each bin needs at least one cmd_block
object which was 2192 bytes in size.  Since 16384 * 2192 exceeded
LP_SCENE_MAX_SIZE we'd silently fail in lp_scene_new_data_block() and not
draw the complete scene.

By reducing CMD_BLOCK_MAX to 29 we get nice 512-byte cmd_blocks.  And
by increasing LP_SCENE_MAX_SIZE to 9 MB we can allocate enough command
blocks for 8K x 8K, plus a few regular data blocks.

Fixes the (improved) piglit fbo-maxsize test.

Note: This is a candidate for the stable branches.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agoi965: Don't fill buffer with zeroes.
Kenneth Graunke [Mon, 4 Mar 2013 19:38:28 +0000 (11:38 -0800)]
i965: Don't fill buffer with zeroes.

This was only necessary because our bounds checking was off by one, and
thus we read an extra pair of values.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965: Fix off-by-one in query object result gathering.
Kenneth Graunke [Mon, 4 Mar 2013 19:37:35 +0000 (11:37 -0800)]
i965: Fix off-by-one in query object result gathering.

If we've written N pairs of values to the buffer, then last_index = N,
but the values are 0 .. N-1.  Thus, we need to use <, not <=.

This worked anyway because we fill the buffer with zeroes, so we just
added an extra (0 - 0) to our results.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoradeon/llvm: fix trivial warnings
Christian König [Wed, 6 Mar 2013 11:08:54 +0000 (12:08 +0100)]
radeon/llvm: fix trivial warnings

Signed-off-by: Christian König <christian.koenig@amd.com>
11 years agoradeonsi: fix trivial warning
Christian König [Wed, 6 Mar 2013 10:49:53 +0000 (11:49 +0100)]
radeonsi: fix trivial warning

Signed-off-by: Christian König <christian.koenig@amd.com>
11 years agointel: Improve the matching (more formats!) for TexImage from PBOs.
Eric Anholt [Tue, 29 Jan 2013 00:59:29 +0000 (11:59 +1100)]
intel: Improve the matching (more formats!) for TexImage from PBOs.

Mesa core is the place for encoding what format/type matches a mesa
format, so rely on that.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agointel: Improve the test for readpixels blit path format checking.
Eric Anholt [Mon, 28 Jan 2013 06:44:17 +0000 (17:44 +1100)]
intel: Improve the test for readpixels blit path format checking.

We were allowing things like copying RG1616 to a user's ARGB8888
format, while we were denying anything that wasn't ARGB8888 or
RGB565.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agointel: Fold intel_region_copy() into its one caller.
Eric Anholt [Mon, 28 Jan 2013 00:32:49 +0000 (11:32 +1100)]
intel: Fold intel_region_copy() into its one caller.

This is similar code to intel_miptree_copy_slice, but the knobs
are all set differently.

v2: fix whitespace

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agointel: Transition intel_region_map() to being a miptree operation.
Eric Anholt [Sun, 27 Jan 2013 22:14:42 +0000 (09:14 +1100)]
intel: Transition intel_region_map() to being a miptree operation.

I'm trying to move us away from the region structure, and all the
callers are currently dereferencing a miptree to get the region.

In this change, the map_refcount is dropped.  However, the bo->virtual is
itself map refcounted, so that's already dealt with.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agointel: Remove num_mapped_regions tracking.
Eric Anholt [Sun, 27 Jan 2013 21:57:15 +0000 (08:57 +1100)]
intel: Remove num_mapped_regions tracking.

The point of tracking the value was removed in February 2012
(65b096aeddd9b45ca038f44cc9adfff86c8c48b2), and this should have
been removed at the same time.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agointel: Remove the struct intel_region reuse hash table.
Eric Anholt [Sun, 27 Jan 2013 19:37:43 +0000 (05:37 +1000)]
intel: Remove the struct intel_region reuse hash table.

I don't see any reason for it -- it was introduced with the DRI2
invalidate work by krh in 2010 with no explanation.  I suspect it was
something about wanting the same drm_intel_bo struct underneath multiple
openings of the BO within one process, but that's covered by libdrm at
this point.  As far as the struct region goes, it is not threadsafe, so
multiple contexts sharing a region could have mixed up the map_count and
assertion failed or worse.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agoscons: Provide shorthand aliases for software winsyses.
José Fonseca [Tue, 5 Mar 2013 22:46:38 +0000 (22:46 +0000)]
scons: Provide shorthand aliases for software winsyses.

11 years agoscons: Fix llvm-config not found error message.
José Fonseca [Tue, 5 Mar 2013 22:46:01 +0000 (22:46 +0000)]
scons: Fix llvm-config not found error message.

"% llvm_version" is bogus copy'n'past cruft.

11 years agomesa: Modify candidate search string
Ian Romanick [Tue, 5 Mar 2013 22:51:26 +0000 (14:51 -0800)]
mesa: Modify candidate search string

Several commits on master for the 9.1 branch had "NOTE" messages in a
slightly different format.

NOTE: This is a candidate for stable branches

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agomesa: Remove the special enum for _mesa_error debug output.
Eric Anholt [Sat, 23 Feb 2013 00:09:19 +0000 (16:09 -0800)]
mesa: Remove the special enum for _mesa_error debug output.

Now all the per-message enums from mtypes are gone.  Now we can extend
unique message IDs into all generators of debug output without having to
update mtypes.h for each one.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Remove the enum for the oom-within-debug-output case.
Eric Anholt [Sat, 23 Feb 2013 00:07:47 +0000 (16:07 -0800)]
mesa: Remove the enum for the oom-within-debug-output case.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Remove now-unused gl_winsys_error and gl_shader_error enums.
Eric Anholt [Fri, 22 Feb 2013 23:59:48 +0000 (15:59 -0800)]
mesa: Remove now-unused gl_winsys_error and gl_shader_error enums.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Report ARB_debug_output for both shader errors and warnings.
Eric Anholt [Fri, 22 Feb 2013 23:57:25 +0000 (15:57 -0800)]
mesa: Report ARB_debug_output for both shader errors and warnings.

This ends up reusing the dynamic ID support, so a silly enum gets to go
away.  We don't assign good IDs to different messages yet, but at least
that's tractable now.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agointel: Add missing perf debug for a stall on mapping a BO.
Eric Anholt [Fri, 22 Feb 2013 22:39:15 +0000 (14:39 -0800)]
intel: Add missing perf debug for a stall on mapping a BO.

I was testing the ARB_debug_output code and wrote an obvious sample that
should have hit this, and got confused that my ARB_debug_output was
broken.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agoi965: Make perf_debug() output to GL_ARB_debug_output in a debug context.
Eric Anholt [Fri, 22 Feb 2013 21:15:20 +0000 (13:15 -0800)]
i965: Make perf_debug() output to GL_ARB_debug_output in a debug context.

I tried to ensure that performance in the non-debug case doesn't change
(we still just check one condition up front), and I think the impact is
small enough in the debug context case to warrant including all of it.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agointel: Finish renaming fallback_debug() to perf_debug().
Eric Anholt [Fri, 22 Feb 2013 20:56:13 +0000 (12:56 -0800)]
intel: Finish renaming fallback_debug() to perf_debug().

They're about to change to handle GL_ARB_debug_output, so just make one
function.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agointel: Hook up the WARN_ONCE macro to GL_ARB_debug_output.
Eric Anholt [Fri, 22 Feb 2013 21:03:51 +0000 (13:03 -0800)]
intel: Hook up the WARN_ONCE macro to GL_ARB_debug_output.

This doesn't provide detailed error type information, but it's important
to get these relatively severe but rare error messages out to the
developer through whatever mechanism they are using.

v2: Rebase on new WARN_ONCE additions.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> (v1)
11 years agomesa: Add support for GL_ARB_debug_output with dynamic ID allocation.
Eric Anholt [Fri, 22 Feb 2013 18:43:40 +0000 (10:43 -0800)]
mesa: Add support for GL_ARB_debug_output with dynamic ID allocation.

We can emit messages now without always having to use the same ID for
each, or having a giant table of all possible errors in mtypes.h.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Merge handling of application-provided and built-in error sources.
Eric Anholt [Thu, 12 Jul 2012 17:22:15 +0000 (10:22 -0700)]
mesa: Merge handling of application-provided and built-in error sources.

I want to have dynamic IDs so that we don't need to add to mtypes.h for
every error we might want to add.  To do so, I need to get rid of the
static arrays and actually support all the crazy filtering of dynamic IDs
that we already support for application-provided error sources.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Fix _mesa_problem() on context destroy after application debug output
Eric Anholt [Sat, 23 Feb 2013 01:08:28 +0000 (17:08 -0800)]
mesa: Fix _mesa_problem() on context destroy after application debug output

This was apparently not noticed because we don't have any testing of
application-generated debug output.  However, as I'm changing the
GL-generated debug output to use the same path as
application/middleware-generated debug output, this obviously became an
issue.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Move debug type/severity enums to mesa core.
Eric Anholt [Fri, 22 Feb 2013 23:06:19 +0000 (15:06 -0800)]
mesa: Move debug type/severity enums to mesa core.

These will get reused by new ARB_debug_output messages in drivers/core,
instead of having the caller pass GL enums and have us immediately
switch-statement those into enums.

Add source enums will be handled in the next commit, because the way
different sources are handled at the moment is pretty strange.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Replace open-coded _mesa_lookup_enum_by_nr().
Eric Anholt [Fri, 22 Feb 2013 22:47:15 +0000 (14:47 -0800)]
mesa: Replace open-coded _mesa_lookup_enum_by_nr().

The new one doesn't have the same behavior for GL_NO_ERROR, but we don't
produce errors with GL_NO_ERROR as the error type.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agomesa: Remove extra #define MAXSTRING duplicating MAX_DEBUG_MESSAGE_LENGTH.
Eric Anholt [Thu, 12 Jul 2012 17:21:13 +0000 (10:21 -0700)]
mesa: Remove extra #define MAXSTRING duplicating MAX_DEBUG_MESSAGE_LENGTH.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
11 years agodri/nouveau: NV17_3D class is not available for NV1a chipset
Marcin Slusarz [Sat, 16 Feb 2013 22:25:08 +0000 (23:25 +0100)]
dri/nouveau: NV17_3D class is not available for NV1a chipset

Should fix https://bugs.freedesktop.org/show_bug.cgi?id=60510

Note: this is a candidate for the stable branches

Acked-by: Francisco Jerez <currojerez@riseup.net>
11 years agotgsi: handle projection modifier for array textures.
Roland Scheidegger [Tue, 5 Mar 2013 16:24:32 +0000 (17:24 +0100)]
tgsi: handle projection modifier for array textures.

This partly reverts 6ace2e41da7dded630d932d03bacb7e14a93d47a.
Apparently with GL_MESA_texture_array fixed-function texturing
with texture arrays is possible, and hence we have to handle TXP.
(Though noone seems to know the semantics, softpipe now does what
it did before, which is to NOT project the array coord, llvmpipe
for instance however indeed does project the array coord. Unlike
before it will project the comparison coord for shadow1d array, as
that clearly was an error.)
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=61828.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agost/mesa: translate ir offset parameters for non-TXF opcodes.
Roland Scheidegger [Tue, 5 Mar 2013 01:02:13 +0000 (02:02 +0100)]
st/mesa: translate ir offset parameters for non-TXF opcodes.

Otherwise the state tracker will crash if the texture instructions
have offsets.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoconfigure.ac: Remove stale comment about --x-* arguments.
Matt Turner [Mon, 4 Mar 2013 18:29:57 +0000 (10:29 -0800)]
configure.ac: Remove stale comment about --x-* arguments.

Should have been removed with e273ed37.

Note: This is a candidate for the 9.1 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoconfigure.ac: Don't check for X11 unconditionally.
Matt Turner [Mon, 4 Mar 2013 18:23:54 +0000 (10:23 -0800)]
configure.ac: Don't check for X11 unconditionally.

X11 is already checked conditionally below.

Fixes OSMesa-only configurations to not require X11.

Note: This is a candidate for the 9.1 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoAdd missing GL_TEXTURE_CUBE_MAP entry in _mesa_legal_texture_dimensions
Alan Hourihane [Tue, 5 Mar 2013 12:05:26 +0000 (12:05 +0000)]
Add missing GL_TEXTURE_CUBE_MAP entry in _mesa_legal_texture_dimensions

This was hit on the glTexStorage2D() path.

Note: this is a candidate for the stable branches

Signed-off-by: Alan Hourihane <alanh@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoFix out-of-tree build of 'make check' in src/mesa/main/tests
Jon TURNEY [Fri, 1 Mar 2013 15:21:07 +0000 (15:21 +0000)]
Fix out-of-tree build of 'make check' in src/mesa/main/tests

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
11 years agou_blitter: don't create illegal shaders for 1D/3D/RECT/CUBE MSAA
Dave Airlie [Mon, 4 Mar 2013 07:18:24 +0000 (07:18 +0000)]
u_blitter: don't create illegal shaders for 1D/3D/RECT/CUBE MSAA

Reviewed-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
11 years agoFix build of swrast only without libdrm
Daniel Martin [Thu, 28 Feb 2013 18:39:06 +0000 (19:39 +0100)]
Fix build of swrast only without libdrm

Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
11 years agomesa: flush current state when querying GL_EDGE_FLAG
Brian Paul [Mon, 4 Mar 2013 15:41:45 +0000 (08:41 -0700)]
mesa: flush current state when querying GL_EDGE_FLAG

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=61395

Note: This is a candidate for the stable branches.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agovdpau-softpipe: Build correct source file - vl_winsys_xsp.c
Jakub Bogusz [Mon, 4 Mar 2013 06:51:01 +0000 (22:51 -0800)]
vdpau-softpipe: Build correct source file - vl_winsys_xsp.c

Copy-and-paste problem introduced by commit 7f24483e.

Reviewed-by: Matt Turner <mattst88@gmail.com>
11 years agoi965: Fix Crystal Well PCI IDs.
Kenneth Graunke [Fri, 1 Mar 2013 23:23:53 +0000 (15:23 -0800)]
i965: Fix Crystal Well PCI IDs.

The second digit was off by one, which meant we accidentally treated
GTn as GT(n-1).  This also meant no support for GT1 at all.

NOTE: This is a candidate for stable branches.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agor600g: Check comp_mask before merging export instructions
Vincent Lejeune [Sun, 3 Mar 2013 20:35:38 +0000 (21:35 +0100)]
r600g: Check comp_mask before merging export instructions

Fixes a llvm uncovered (rare) bug where consecutive exports were
merged even if they have incompatible mask.

11 years agor600g: fix check_and_set_bank_swizzle for cayman
Vadim Girlin [Tue, 26 Feb 2013 16:50:25 +0000 (20:50 +0400)]
r600g: fix check_and_set_bank_swizzle for cayman

Tested-by: Vincent Lejeune <vljn at ovi.com>
Reviewed-by: Vincent Lejeune <vljn at ovi.com>
11 years agost/mesa: add switch case for ir_txf_ms to silence warning
Brian Paul [Sat, 2 Mar 2013 00:36:34 +0000 (17:36 -0700)]
st/mesa: add switch case for ir_txf_ms to silence warning

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agomesa: add switch case for ir_txf_ms to silence warning
Brian Paul [Sat, 2 Mar 2013 00:36:24 +0000 (17:36 -0700)]
mesa: add switch case for ir_txf_ms to silence warning

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoi965: Pull query BO reallocation out into a helper function.
Kenneth Graunke [Wed, 27 Feb 2013 21:35:05 +0000 (13:35 -0800)]
i965: Pull query BO reallocation out into a helper function.

We'll want to reuse this for non-occlusion queries in the future.

Plus, it's a single logical task, so having it as a helper function
clarifies the code somewhat.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Replace the global brw->query.bo variable with query->bo.
Kenneth Graunke [Tue, 26 Feb 2013 07:33:24 +0000 (23:33 -0800)]
i965: Replace the global brw->query.bo variable with query->bo.

Again, eliminating a global variable in favor of a per-query object
variable will help in a future where we have more queries in hardware.

Personally, I find this clearer: there's just the query object's BO,
rather than two variables that usually shadow each other.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Turn if (query->bo) into an assertion.
Kenneth Graunke [Tue, 26 Feb 2013 07:31:10 +0000 (23:31 -0800)]
i965: Turn if (query->bo) into an assertion.

The code a few lines above calls brw_emit_query_begin() if !query->bo,
and that creates query->bo.  So it should always be non-NULL.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Unify query object BO reallocation code.
Kenneth Graunke [Tue, 26 Feb 2013 07:17:57 +0000 (23:17 -0800)]
i965: Unify query object BO reallocation code.

If we haven't allocated a BO yet, we need to do that.  Or, if there
isn't enough room to write another pair of values, we need to gather up
the existing results and start a new one.  This is simple enough.

However, the old code was awkwardly split into two blocks, with a
write_depth_count() placed in the middle.  The new depth count isn't
relevant to gathering the old BO's data, so that can go after the
reallocation is done.  With the two blocks adjacent, we can merge them.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Use query->last_index instead of the global brw->query.index.
Kenneth Graunke [Tue, 26 Feb 2013 06:30:21 +0000 (22:30 -0800)]
i965: Use query->last_index instead of the global brw->query.index.

Since we already have an index in the brw_query_object, there's no need
to also keep a global variable that shadows it.

Plus, if we ever add support for more types of queries that still need
the per-batch before/after treatment we do for occlusion queries, we
won't be able to use a single global variable.  In contrast, per-query
object variables will work fine.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Remove brw_query_object::first_index field as it's always 0.
Kenneth Graunke [Tue, 26 Feb 2013 02:05:55 +0000 (18:05 -0800)]
i965: Remove brw_query_object::first_index field as it's always 0.

brw->query.index is initialized to 0 just a few lines before it's
copied to first_index.

Presumably the idea here was to reuse the query BO for subsequent
queries of the same type, but since that doesn't happen, there's no need
to have the extra code complexity.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Add a pile of comments to brw_queryobj.c.
Kenneth Graunke [Mon, 25 Feb 2013 23:22:02 +0000 (15:22 -0800)]
i965: Add a pile of comments to brw_queryobj.c.

This code was really difficult to follow, for a number of reasons:

- Queries were handled in four different ways (TIMESTAMP writes a single
  value, TIME_ELAPSED writes a single pair of values, occlusion queries
  write pairs of values for the start and end of each batch, and other
  queries are done entirely in software.  It turns out that there are
  very good reasons each query is handled the way it is, but
  insufficient comments explaining the rationale.

- It wasn't immediately obvious which functions were driver hooks
  and which were helper functions.  For example, brw_query_begin() is
  a driver hook that implements glBeginQuery() for all query types, but
  the similarly named brw_emit_query_begin() is a helper function that's
  only relevant for occlusion queries.

Extra explanatory comments should save me and others from constantly
having to ask how this code works and why various query types are
handled differently.

v2: Incorporate Eric's feedback: change "as soon as possible" to "the
    results will be present when mapped."

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Write TIMESTAMP query values into the first buffer element.
Kenneth Graunke [Mon, 25 Feb 2013 21:56:01 +0000 (13:56 -0800)]
i965: Write TIMESTAMP query values into the first buffer element.

For timestamp queries, we just write a single value to a BO.  The
natural place to write that is element 0, so we should do that.

Previously, we wrote it into element 1 (the second slot) leaving
element 0 filled with garbage.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Implement the new QueryCounter() hook.
Kenneth Graunke [Mon, 25 Feb 2013 20:22:29 +0000 (12:22 -0800)]
i965: Implement the new QueryCounter() hook.

This moves the GL_TIMESTAMP handling out of EndQuery.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Add a new QueryCounter() hook for TIMESTAMP queries.
Kenneth Graunke [Mon, 25 Feb 2013 19:21:17 +0000 (11:21 -0800)]
mesa: Add a new QueryCounter() hook for TIMESTAMP queries.

In OpenGL, most queries record statistics about operations performed
between a defined beginning and ending point.  However, TIMESTAMP
queries are different: they immediately return a single value, and there
is no start/stop mechanism.

Previously, Mesa implemented TIMESTAMP queries by calling EndQuery
without first calling BeginQuery.  Apparently this is DirectX
convention, and Gallium followed suit.  I personally find the asymmetry
jarring, however---having BeginQuery and EndQuery handle a different set
of enum values looks like a bug.  It's also a bit confusing to mix the
one-shot query with the start/stop model.

So, add a new QueryCounter driver hook for implementing TIMESTAMP.  For
now, fall back to EndQuery to support drivers that don't do the new
mechanism.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agotgsi: add texel offsets and derivatives to sampler interface
Roland Scheidegger [Fri, 1 Mar 2013 22:27:41 +0000 (23:27 +0100)]
tgsi: add texel offsets and derivatives to sampler interface

Something I never got around to implement, but this is the tgsi execution
side for implementing texel offsets (for ordinary texturing) and explicit
derivatives for sampling (though I guess the ordering of the components
for the derivs parameters is debatable).
There is certainly a runtime cost associated with this.
Unless there are different interfaces used depending on the "complexity"
of the texture instructions, this is impossible to avoid.
Offsets are always active (I think checking if they are active or not is
probably not worth it since it should mostly be an add), whereas the
sampler_control is extended for explicit derivatives.
For now softpipe (the only user of this) just drops all those new values
on the floor (which is the part I never implemented...).

Additionally this also fixes (discovered by accident) inconsistent
projective divide for the comparison coord - the code did do the
projection for shadow2d targets, but not shadow1d ones. This also
drops checking for projection modifier on array targets, since they
aren't possible in any extension I know of (hence we don't actually
know if the array layer should also be divided or not).

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agodraw: additional fix for the no-position case with llvm
Roland Scheidegger [Sat, 2 Mar 2013 01:29:22 +0000 (02:29 +0100)]
draw: additional fix for the no-position case with llvm

Similar fix to what is done for the non-llvm case, we could otherwise still
hit the stages (near certainly with gs) which crash. It is probably a much
better idea to skip trying to draw at that point anyway.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agodraw: fix no position output in non-llvm pipeline.
Roland Scheidegger [Sat, 2 Mar 2013 01:49:28 +0000 (02:49 +0100)]
draw: fix no position output in non-llvm pipeline.

It seems easiest (and best) if we simply skip all the later stages
(after stream output).
(This is different to the llvm case at least for now where we will
simply try to render garbage, though both behaviors should be correct.)
Fixes piglit glsl-1.40-tf-no-position with softpipe.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agodraw/llvm: skip clipping and viewport transform if there's no position output
Roland Scheidegger [Fri, 1 Mar 2013 13:50:40 +0000 (14:50 +0100)]
draw/llvm: skip clipping and viewport transform if there's no position output

With glsl 1.40 writing position is not required (useful for transform
feedback, though in fact it's still possible to rasterize such geometry
even if the results aren't too well defined).
Prevents crashes in that case. Fixes piglit glsl-1.40-tf-no-position.
Not quite sure this is 100% correct as it also skips clipdistance
clipping which could still work (but not sure if the result would
really be needed?)

Reviewed-by: Jose Fonseca <jfonseca@vmware.com
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agollvmpipe: don't assert on illegal surface creation.
Roland Scheidegger [Fri, 1 Mar 2013 14:32:03 +0000 (15:32 +0100)]
llvmpipe: don't assert on illegal surface creation.

Since c8eb2d0e829d0d2aea6a982620da0d3cfb5982e2 llvmpipe checks if it's
actually legal to create a surface. The opengl state tracker doesn't quite
obey this so for now just warn instead of assert.
Also warn instead of disabled assert when creating sampler views
(same reasoning).

Addresses https://bugs.freedesktop.org/show_bug.cgi?id=61647.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: bump glsl version to 140
Roland Scheidegger [Fri, 1 Mar 2013 13:50:32 +0000 (14:50 +0100)]
llvmpipe: bump glsl version to 140

texel offsets should have been the last missing feature for 130, and in
fact 140 as well (last there were texture buffers). In any case we still
don't do OpenGL 3.0 (missing MSAA which will be difficult,
plus EXT_packed_float, ARB_depth_buffer_float and EXT_framebuffer_sRGB).

v2: bump to 140 instead - we have everything except we crash when not writing
to gl_Position (but softpipe crashes as well) so let's just say this is a bug
instead. Also (by Dave Airlie's suggestion) update llvm-todo.txt.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: add support for texel offsets for ordinary texturing.
Roland Scheidegger [Fri, 1 Mar 2013 01:25:13 +0000 (02:25 +0100)]
gallivm: add support for texel offsets for ordinary texturing.

This was previously only handled for texelFetch (much easier).
Depending on the wrap mode this works slightly differently (for somewhat
efficient implementation), hence have to do that separately in all roughly
137 places - it is easy if we use fixed point coords for wrapping, however
some wrapping modes are near impossible with fixed point (the repeat stuff)
hence we have to normalize the offsets if we can't do the wrapping in
unnormalized space (which is a division which is slow but should still be
much better than the alternative, which would be integer modulo for wrapping
which is just unusable). This should still give accurate results in all
cases that really matter, though it might be not quite conformant behavior
for some apis (but we have much worse problems there anyway even without
using offsets).
(Untested, no piglit test.)

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agosvga: always link with C++
Brian Paul [Fri, 1 Mar 2013 23:53:22 +0000 (16:53 -0700)]
svga: always link with C++

Even when we don't have LLVM since there's other C++ code
in the resulting DRI driver object.

Note: This is a candidate for the stable branches.

Reviewed-by: Matt Turner <mattst88@gmail.com>
11 years agost/mesa: convert ir_triop_lrp to TGSI_OPCODE_LRP
Brian Paul [Fri, 1 Mar 2013 22:16:15 +0000 (15:16 -0700)]
st/mesa: convert ir_triop_lrp to TGSI_OPCODE_LRP

AFAICT, all gallium drivers implement TGSI_OPCODE_LRP.
Tested with softpipe, llvmpipe, svga drivers.

Reviewed-by: Matt Turner <mattst88@gmail.com>
11 years agodocs: Mark some things done in GL3.txt
Chris Forbes [Fri, 1 Mar 2013 23:01:24 +0000 (12:01 +1300)]
docs: Mark some things done in GL3.txt

11 years agowinsys/radeon: Only add bo to hash table when creating flink
Martin Andersson [Fri, 1 Mar 2013 21:34:28 +0000 (22:34 +0100)]
winsys/radeon: Only add bo to hash table when creating flink

The problem is that we mix bo handles and flinked names in the hash
table. Because kms type handles are not flinked they should not be
added to the hash table. If we do that we will sooner or later
get a situation where we will overwrite a correct entry because
the bo handle was the same as a flinked name.

Note: this is a candidate for the stable branches.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
11 years agoi965: enable ARB_texture_multisample on Gen6+
Chris Forbes [Sat, 29 Dec 2012 08:28:57 +0000 (21:28 +1300)]
i965: enable ARB_texture_multisample on Gen6+

V2: Works on Ivy Bridge now too, so this can be 6+.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965/fs: add support for ir_txf_ms on Gen6+
Chris Forbes [Sat, 29 Dec 2012 07:12:26 +0000 (20:12 +1300)]
i965/fs: add support for ir_txf_ms on Gen6+

On Gen6, lower this to `ld` with lod=0 and an extra sample_index
parameter.

On Gen7, use `ld2dms`. We don't support CMS yet for multisample
textures, so we just hardcode MCS=0. This is ignored for IMS and UMS
surfaces.

Note: If we do end up emitting specialized shaders based on the MSAA
layout, we can emit a slightly shorter message here in the UMS case.

Note: According to the PRM, `ld2dms` takes one more parameter, lod.
However, it's always zero, and including it would make the message too
long for SIMD16, so we just omit it.

V2: Reworked completely, added support for Gen7.
V3: - Introduce sample_index parameter rather than reusing lod
    - Removed spurious whitespace change
    - Clarify commit message
V4: - Fix comment style
    - Emit SHADER_OPCODE_TXF_MS on Gen6. This was benignly wrong since
      it lowers to `ld` anyway on this gen, but still wrong.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965/vs: add support for ir_txf_ms on Gen6+
Chris Forbes [Sat, 29 Dec 2012 07:12:26 +0000 (20:12 +1300)]
i965/vs: add support for ir_txf_ms on Gen6+

On Gen6, lower this to `ld` with lod=0 and an extra sample_index
parameter.

On Gen7, use `ld2dms`. This takes an additional MCS parameter to support
compressed multisample surfaces, but we're not enabling them for
multisample textures for now, so it's always ignored and can be safely
omitted.

V2: Reworked completely, added support for Gen7.
V3: - Use new sample_index, sample_index_type rather than reusing lod
    - Clarify commit message.
V4: - Fix comment style

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965: add a new virtual opcode: SHADER_OPCODE_TXF_MS
Chris Forbes [Thu, 24 Jan 2013 08:35:15 +0000 (21:35 +1300)]
i965: add a new virtual opcode: SHADER_OPCODE_TXF_MS

This is very similar to the TXF opcode, but lowers to `ld2dms` rather
than `ld` on Gen7.

V4: - add SHADER_OPCODE_TXF_MS to is_tex() functions, so regalloc thinks
      it actually writes the correct number of registers. Otherwise in
      nontrivial shaders some of the registers tend to get clobbered,
      producing bad results.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: take the target into account for Gen7 MSAA modes
Chris Forbes [Thu, 24 Jan 2013 07:05:09 +0000 (20:05 +1300)]
i965: take the target into account for Gen7 MSAA modes

Gen7 has an erratum affecting the ld_mcs message, making it unsafe to
use when the surface doesn't have an associated MCS.

From the Ivy Bridge PRM, Vol4 Part1 p77 ("MCS Enable"):

   "If this field is disabled and the sampling engine <ld_mcs>
   message is issued on this surface, the MCS surface may be
   accessed. Software must ensure that the surface is defined
   to avoid GTT errors."

To allow the shader to treat all surfaces uniformly, force UMS if the
surface is to be used as a multisample texture, even if CMS would have
been possible.

V3: - Quoted erratum text

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965: Support multisampling in surface_state for textures
Chris Forbes [Sat, 22 Dec 2012 10:27:24 +0000 (23:27 +1300)]
i965: Support multisampling in surface_state for textures

The surface_state setup for renderbuffers already worked; only the
texturing side needed work. BLORP does something similar, but does its
own surface_state setup.

On Gen6, we just need to set the correct sample count.

On Gen7: - set the correct sample count
         - set the correct layout mode
         - set GEN7_SURFACE_ARYSPC_LOD0 if it's set in the miptree.

V2: - Clarify commit message
    - Rebased onto Paul's physical/logical dims cleanup
    - Added Gen7 support

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: add support for multisample textures
Chris Forbes [Sun, 16 Dec 2012 06:50:26 +0000 (19:50 +1300)]
i965: add support for multisample textures

V2: - Fix for state moving from texobj to image
    - Rebased onto Paul's logical/physical cleanup
    - Fixed missing quantization of sample count
    - Fold in IMS renderbuffer wrapper fixes from later in the series
    - Use correct physical slice offset for UMS/CMS surfaces on Gen7

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agomesa: implement TexImage*Multisample
Chris Forbes [Sat, 24 Nov 2012 08:47:46 +0000 (21:47 +1300)]
mesa: implement TexImage*Multisample

V2: - fix formatting issues
    - generate GL_OUT_OF_MEMORY if teximage cannot be allocated
    - fix for state moving from texobj to image

V3: - remove ridiculous stencil hack
    - alter format check to not allow a base format of STENCIL_INDEX
    - allow width/height/depth to be zero, to deallocate the texture
    - dont forget to call _mesa_update_fbo_texture

V4: - fix indentation
    - don't throw errors on proxy texture targets

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