OSDN Git Service

android-x86/external-mesa.git
11 years agoi965: Remove software geometry query code.
Kenneth Graunke [Fri, 17 May 2013 18:46:16 +0000 (11:46 -0700)]
i965: Remove software geometry query code.

EXT_transform_feedback isn't yet supported on Gen4-5, so none of this
query code is actually used.  This also means we can remove some of the
surrounding support code.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Delete unused brw->sol.offset_0_batch_start field.
Kenneth Graunke [Fri, 17 May 2013 18:00:01 +0000 (11:00 -0700)]
i965: Delete unused brw->sol.offset_0_batch_start field.

This was only used for the the non-hardware context code.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Stop using the kernel SOL reset feature.
Kenneth Graunke [Fri, 17 May 2013 17:55:35 +0000 (10:55 -0700)]
i965: Stop using the kernel SOL reset feature.

We can just do it ourselves with MI_LOAD_REGISTER_IMM.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Remove dead code for Gen7 SOL without hardware contexts.
Kenneth Graunke [Fri, 17 May 2013 17:51:34 +0000 (10:51 -0700)]
i965: Remove dead code for Gen7 SOL without hardware contexts.

Failing to get a hardware context now means failing to load the driver,
so this code will never get hit.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Add a macro for accessing the SO_WRITE_OFFSET[0-3] registers.
Kenneth Graunke [Sun, 21 Apr 2013 05:35:46 +0000 (22:35 -0700)]
i965: Add a macro for accessing the SO_WRITE_OFFSET[0-3] registers.

Using a function-like macro makes it easy to loop over all four streams.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agodocs: Import 9.1.3 release notes, add news item.
Ian Romanick [Tue, 21 May 2013 20:16:35 +0000 (13:16 -0700)]
docs: Import 9.1.3 release notes, add news item.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoradeonsi: Fix user clip planes
Michel Dänzer [Thu, 2 May 2013 13:39:15 +0000 (15:39 +0200)]
radeonsi: Fix user clip planes

4 more little piglits.

NOTE: This is a candidate for the 9.1 branch.

11 years agoradeonsi: Handle TGSI_SEMANTIC_CLIPVERTEX
Michel Dänzer [Wed, 15 May 2013 16:09:50 +0000 (18:09 +0200)]
radeonsi: Handle TGSI_SEMANTIC_CLIPVERTEX

17 more little piglits.

NOTE: This is a candidate for the 9.1 branch.

11 years agoradeonsi: Initial support for multiple constant buffers
Michel Dänzer [Thu, 16 May 2013 09:50:00 +0000 (11:50 +0200)]
radeonsi: Initial support for multiple constant buffers

Just enough to support an additional internal constant buffer for the user
clip planes.

NOTE: This is a candidate for the 9.1 branch.

11 years agoradeonsi: Fix handling of TGSI_SEMANTIC_PSIZE
Michel Dänzer [Fri, 3 May 2013 15:59:34 +0000 (17:59 +0200)]
radeonsi: Fix handling of TGSI_SEMANTIC_PSIZE

Two more little piglits.

NOTE: This is a candidate for the 9.1 branch.

11 years agoradeonsi: increase array size for shader inputs and outputs
Marek Olšák [Tue, 14 May 2013 17:37:17 +0000 (19:37 +0200)]
radeonsi: increase array size for shader inputs and outputs

and add assertions to prevent buffer overflow. This fixes corruption
of the si_shader struct.

NOTE: This is a candidate for the 9.1 branch.

[ Cherry-pick of r600g commit da33f9b919039442e9ab51f9b1d1c83a73607133 ]

Reviewed-by: Marek Olšák <maraeo@gmail.com>
11 years agoxlib: check for null ctx pointer in glXIsDirect()
Brian Paul [Mon, 20 May 2013 22:15:24 +0000 (16:15 -0600)]
xlib: check for null ctx pointer in glXIsDirect()

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64745
Note: This is a candidate for the stable branches.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agost/glx/xlib: check for null ctx pointer in glXIsDirect()
Brian Paul [Mon, 20 May 2013 22:13:53 +0000 (16:13 -0600)]
st/glx/xlib: check for null ctx pointer in glXIsDirect()

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64745
Note: This is a candidate for the stable branches.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agoscons: Don't force stabs debug format for Mingw.
José Fonseca [Fri, 17 May 2013 12:23:04 +0000 (13:23 +0100)]
scons: Don't force stabs debug format for Mingw.

- recent gdb handles DWARF fine (tested both with version
  7.1.90.20100730 from mingw-w64 project, and 7.5-1 from mingw project)

- http://people.freedesktop.org/~jrfonseca/bfdhelp/ was updated to
  handle DWARF

- stabs requires ugly hacks to prevent compilation failures

- mixing stabs/dwarf prevents proper backtraces (which is inevitable,
  given that the MinGW C runtime is pre-built with DWARF)

For example, without this change I get:

  (gdb) bt
  #0  _wassert (_Message=0xf925060 L"Num < NumOperands && \"Invalid child # of SDNode!\"",
      _File=0xf60b488 L"llvm/include/llvm/CodeGen/SelectionDAGNodes.h", _Line=534)
      at ../../../../mingw-w64-crt/misc/wassert.c:51
  #1  0x0368996b in _assert (_Message=0x39d7ee4 "Num < NumOperands && \"Invalid child # of SDNode!\"",
      _File=0x39d7e94 "llvm/include/llvm/CodeGen/SelectionDAGNodes.h", _Line=534)
      at ../../../../mingw-w64-crt/misc/wassert.c:44
  #2  0x00000004 in ?? ()
  #3  0x00000004 in ?? ()
  #4  0x0f60b488 in ?? ()
  #5  0x00000000 in ?? ()

While with this change I get:

  (gdb) bt
  #0  _wassert (_Message=0xfb982e8 L"Num < NumOperands && \"Invalid child # of SDNode!\"",
      _File=0xefbcb40 L"llvm/include/llvm/CodeGen/SelectionDAGNodes.h", _Line=534)
      at ../../../../mingw-w64-crt/misc/wassert.c:51
  #1  0x039c996b in _assert (_Message=0x3d17f24 "Num < NumOperands && \"Invalid child # of SDNode!\"",
      _File=0x3d17ed4 "llvm/include/llvm/CodeGen/SelectionDAGNodes.h", _Line=534)
      at ../../../../mingw-w64-crt/misc/wassert.c:44
  #2  0x033111cc in getOperand (Num=4, this=<optimized out>)
      at llvm/include/llvm/CodeGen/SelectionDAGNodes.h:534
  #3  getOperand (i=4, this=<optimized out>)
      at llvm/include/llvm/CodeGen/SelectionDAGNodes.h:779
  #4  llvm::SelectionDAG::getNode (this=0xf00cb08, Opcode=79, DL=..., VT=..., N1=..., N2=...)
      at llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:2859
  #5  0x03377b20 in llvm::SelectionDAGBuilder::visitExtractElement (this=0xfb45028, I=...)
      at llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp:2803
  [...]

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoilo: use BLT engine to copy between textures
Chia-I Wu [Fri, 17 May 2013 08:20:52 +0000 (16:20 +0800)]
ilo: use BLT engine to copy between textures

Emit XY_SRC_COPY_BLT to do the job.  Since ETC1 textures cannot be mapped for
reading, as is required by util_copy_resource_region, this fixes copying of
ETC1 textures.

11 years agoilo: use BLT engine to copy between buffers
Chia-I Wu [Fri, 17 May 2013 07:54:45 +0000 (15:54 +0800)]
ilo: use BLT engine to copy between buffers

Emit (possibly multiple) SRC_COPY_BLT to copy between buffers of arbitrary
sizes.

11 years agoilo: refactor blitter_xy_color_blt()
Chia-I Wu [Fri, 17 May 2013 07:06:19 +0000 (15:06 +0800)]
ilo: refactor blitter_xy_color_blt()

Add gen6_XY_COLOR_BLT() and let blitter_xy_color_blt() call the function.  Not
sure if this path is still being hit by any application.

11 years agoilo: replace cp hooks by cp owner and flush callback
Chia-I Wu [Mon, 20 May 2013 04:13:34 +0000 (12:13 +0800)]
ilo: replace cp hooks by cp owner and flush callback

The problem with cp hooks is that when we switch from 3D ring to 2D ring, and
when there are active queries, we will emit 3D commands to 2D ring because
the new-batch hook is called.

This commit introduces the idea of cp owner.  When the cp is flushed, or when
another owner takes place, the current owner is notified, giving it a chance
to emit whatever commands there need to be.  With this mechanism, we can
resume queries when the 3D pipeline owns the cp, and pause queries when it
loses the cp.  Ring switch will just work.

As we still need to know when the cp bo is reallocated, a flush callback is
added.

11 years agoilo: harware contexts are only for the render ring
Chia-I Wu [Fri, 17 May 2013 08:10:11 +0000 (16:10 +0800)]
ilo: harware contexts are only for the render ring

The hardware context should not be passed for bo execution when the ring is
not the render ring.  Rename hw_ctx to render_ctx for clarity.

11 years agoilo: update format mappings
Chia-I Wu [Mon, 20 May 2013 09:32:35 +0000 (17:32 +0800)]
ilo: update format mappings

Add more PIPE_FORMAT -> BRW_SURFACEFORMAT mappings, and update
surface_format_info from i965.

11 years agoilo: update headers from i965
Chia-I Wu [Mon, 20 May 2013 09:18:12 +0000 (17:18 +0800)]
ilo: update headers from i965

Mainly for MI_LOAD_REGISTER_IMM and BCS_SWCTRL.

11 years agoi965: Fix build failure
Anuj Phogat [Mon, 20 May 2013 23:15:49 +0000 (16:15 -0700)]
i965: Fix build failure

meta.h should be included in brw_state_upload.c to get access to
function _mesa_meta_in_progress().

11 years agoi965: Implement transform feedback query support in hardware on Gen6+.
Kenneth Graunke [Thu, 16 May 2013 15:54:47 +0000 (08:54 -0700)]
i965: Implement transform feedback query support in hardware on Gen6+.

Now that we have hardware contexts and can use MI_STORE_REGISTER_MEM,
we can use the GPU's pipeline statistics counters rather than going out
of our way to count primitives in software.

Aside from being simpler, this also paves the way for Geometry Shaders,
which can output an arbitrary number of primitives on the GPU.  It will
also allow us to use hardware primitive restart when these queries are
in use.

The GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN query is easy: it
corresponds to the SO_NUM_PRIMS_WRITTEN/SO_NUM_PRIMS_WRITTEN0_IVB
counters.

The GL_PRIMITIVES_GENERATED query is trickier.  Gen provides several
statistics registers which /almost/ match the semantics required:
- IA_PRIMITIVES_COUNT
  The number of primitives fetched by the VF or IA (input assembler).
  This undercounts when GS is enabled, as it can output many primitives.
- GS_PRIMITIVES_COUNT
  The number of primitives output by the GS.  Unfortunately, this
  doesn't increment unless the GS unit is actually enabled, and it
  usually isn't.
- SO_PRIM_STORAGE_NEEDED*_IVB
  The amount of space needed to write primitives output by transform
  feedback.  These naturally only work when transform feedback is on.
  We'd also have to add the counters for all four streams.
- CL_INVOCATION_COUNT
  The number of primitives processed by the clipper.  This doesn't work
  if the GS or SOL throw away primitives for rasterizer discard.
  However, it does increment even if the clipper is in REJECT_ALL mode.

Dynamically switching between counters would be painfully complicated,
especially since GS, rasterizer discard, and transform feedback can all
be switched on and off repeatedly during a single query.

The most usable counter is CL_INVOCATION_COUNT.  The previous two
patches reworked rasterizer discard support so that all primitives hit
the clipper, making this work.

v2: Occlusion query bug fixes removed and squashed in earlier patches.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Handle rasterizer discard in the clipper rather than GS on Gen6.
Kenneth Graunke [Fri, 17 May 2013 15:49:52 +0000 (08:49 -0700)]
i965: Handle rasterizer discard in the clipper rather than GS on Gen6.

This has more of a negative impact than the previous patch, as on Gen6
passing primitives through to the clipper means we actually have to make
the GS thread write them to the URB.

I don't see another good solution though, and rasterizer discard is not
the most common of cases, so hopefully it won't be too terrible.

v2: Add a perf_debug; resolve rebase conflicts on the brw dirty flags;
    remove the rasterizer_discard field from brw_gs_prog_key.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net> [v1]
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Handle rasterizer discard in the clipper rather than SOL on Gen7.
Kenneth Graunke [Fri, 17 May 2013 02:25:14 +0000 (19:25 -0700)]
i965: Handle rasterizer discard in the clipper rather than SOL on Gen7.

In order to implement the GL_PRIMITIVES_GENERATED query in a sane
fashion on our hardware, we can't discard primitives until the clipper.
The patch after next explains the rationale.

By setting the clipper to REJECT_ALL mode, all primitives get thrown away,
so rendering is still appropriately disabled.

This may negatively impact performance in the rasterizer discard case,
but it's unclear how much and this hasn't been observed to be a
bottleneck in any application we've looked at.  The clipper is the very
next stage in the pipeline, so I don't think it will be terrible.

v2: Add a perf_debug; resolve rebase conflicts on the brw dirty flags.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Disable clipper statistics when meta operations are in progress.
Kenneth Graunke [Thu, 16 May 2013 17:27:53 +0000 (10:27 -0700)]
i965: Disable clipper statistics when meta operations are in progress.

We don't currently use the clipper statistics, but we'll soon use
CL_INVOCATIONS_COUNT to implement the GL_PRIMITIVES_GENERATED query.
The number of primitives generated is not supposed to be altered during
operations such as glGenerateMipmap.

Prevents spec/EXT_transform_feedback/generatemipmap prims_generated
from breaking when we start using pipeline statistics registers to
implement the GL_PRIMITIVES_GENERATED query in a few commits.

v2: Use the BRW_NEW_META_IN_PROGRESS flag for correct state handling.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net> [v1]
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Create a BRW_NEW_META_IN_PROGRESS state flag.
Kenneth Graunke [Sat, 18 May 2013 04:17:56 +0000 (21:17 -0700)]
i965: Create a BRW_NEW_META_IN_PROGRESS state flag.

This will allow us to disable statistics during meta operations.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agoi965: Add #defines for the pipeline statistics counter registers.
Kenneth Graunke [Thu, 28 Feb 2013 02:33:25 +0000 (18:33 -0800)]
i965: Add #defines for the pipeline statistics counter registers.

These come from the Ivybridge PRM, Volume 1, Part 3.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Rely on hardware contexts for query objects on Gen6+.
Kenneth Graunke [Thu, 16 May 2013 04:33:01 +0000 (21:33 -0700)]
i965: Rely on hardware contexts for query objects on Gen6+.

Hardware contexts greatly simplify the query object code.  The pipeline
statistics counters get saved and restored with the context, which means
that we don't need to worry about other workloads polluting them.

This means that we can simply write a single pair of values (one at
BeginQuery and one at EndQuery) rather than a series of pairs.  This
also means we don't need to worry about the BO getting full.  We also
don't need to delay BO allocation and starting snapshot until the first
draw.

The generation split here is a little off: technically, Ironlake can also
support hardware contexts.  However, the kernel currently doesn't, and
even if it were to do so someday, we'd need to wait a while before
bumping the kernel requirement to take advantage of it.

v2: Incorporate Paul's feedback.
- Clarify which functions are Gen4/5-only via assertions and comments.
- Change how driver hook initialization happens.
- Update comments.
- Squash a bug fix from a later commit here where it belongs.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net> [v1]
Acked-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Disable pixel statistics in BLORP.
Kenneth Graunke [Thu, 16 May 2013 17:39:39 +0000 (10:39 -0700)]
i965: Disable pixel statistics in BLORP.

BLORP is used for operations like glClear, glCopyTexImage, and
glBlitFramebuffer which aren't supposed to contribute fragments toward
occlusion queries.

This prevents Piglit tests from breaking in the next commit.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Require hardware contexts (and thus Kernel 3.6) on Gen6+.
Kenneth Graunke [Thu, 16 May 2013 04:18:28 +0000 (21:18 -0700)]
i965: Require hardware contexts (and thus Kernel 3.6) on Gen6+.

Hardware contexts are necessary to reasonably support OpenGL 3.2.
In particular, we currently maintain software counters for transform
feedback buffer offsets and counters, which relies on knowing the number
of primitives generated.  Geometry shaders violate that assumption.

At the time of writing, Debian has moved to Kernel 3.8, which means most
people probably have a newer kernel by now.  It's also worth noting that
this patch won't land until Mesa 10 which is currently targeted for
September.  By that point, even more people will have a newer kernel.

Also, don't bother trying to allocate contexts on pre-Gen6, as it
currently will always fail, and if this changes in the future, we'll
need to reevaluate our hw_ctx/gen checks.

This patch leaves the code for flagging BRW_NEW_CONTEXT on new
batchbuffers if hw_ctx == NULL since that still occurs pre-Gen6.

Also remove the Gen7+ check for kernel 3.3, since it's now redundant.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Bump kernel requirement to 3.3 on Ivybridge.
Kenneth Graunke [Sat, 6 Apr 2013 17:27:28 +0000 (10:27 -0700)]
i965: Bump kernel requirement to 3.3 on Ivybridge.

Kernel 3.3 introduced the SOL reset execbuf parameter, needed for GL 3.0
on Ivybridge.  Bumping the requirement will give an obvious error
message rather than simply reporting GL 2.1.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agor600g/llvm: fix cubemap lod/bias
Vincent Lejeune [Sat, 18 May 2013 21:42:37 +0000 (23:42 +0200)]
r600g/llvm: fix cubemap lod/bias

11 years agor600g/llvm: Fix texelFetchOffset-2D
Vincent Lejeune [Sat, 18 May 2013 20:22:41 +0000 (22:22 +0200)]
r600g/llvm: Fix texelFetchOffset-2D

11 years agor600g/llvm: Fix cubearray textureSize
Vincent Lejeune [Sat, 18 May 2013 20:17:51 +0000 (22:17 +0200)]
r600g/llvm: Fix cubearray textureSize

11 years agor600g/llvm: Factorize code loading from const buffer.
Vincent Lejeune [Sun, 19 May 2013 13:40:19 +0000 (15:40 +0200)]
r600g/llvm: Factorize code loading from const buffer.

11 years agoi965: Add cases for ir_triop_vector_insert that assert.
Kenneth Graunke [Fri, 17 May 2013 17:41:27 +0000 (10:41 -0700)]
i965: Add cases for ir_triop_vector_insert that assert.

brw_link_shader() unconditionally calls lower_vector_insert() with true
as the second parameter.  This means that both constant and variable
indexed expressions will get lowered, so we should never see this in the
backend.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
11 years agoi965: Add cases for ir_binop_vector_extract that assert.
Kenneth Graunke [Fri, 17 May 2013 17:33:40 +0000 (10:33 -0700)]
i965: Add cases for ir_binop_vector_extract that assert.

do_vec_index_to_swizzle() should remove any vector extract operations
with a constant index.  It's unconditionally called from
do_common_optimization().

do_vec_index_to_cond_assign() should remove the rest, and it is
unconditionally called from brw_link_shader().  This means that we
should never see ir_binop_vector_extract in the backend.

Silences compiler warnings.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
11 years agollvmpipe: enable z32s8x24 format
Roland Scheidegger [Thu, 16 May 2013 16:33:21 +0000 (18:33 +0200)]
llvmpipe: enable z32s8x24 format

Now that we can handle it both for sampling and as depth/stencil enable it.
Passes nearly all additional piglit tests which are now performed, with two
exceptions (one being a framebuffer blit which fails for all other formats
including stencil too as we don't support stencil blits, the other reporting
a unexpected GL error so doesn't look to be llvmpipe's fault).

11 years agollvmpipe: handle z32s8x24 depth/stencil format
Roland Scheidegger [Fri, 17 May 2013 22:16:03 +0000 (00:16 +0200)]
llvmpipe: handle z32s8x24 depth/stencil format

We need to split up the depth and stencil values in this case, and there's
some new logic required to handle float depth and stencil simultaneously.
Also make sure we get the 64bit zs clear values and masks propagated
correctly.

11 years agollvmpipe: get rid of unused tiled/linear logic
Roland Scheidegger [Thu, 16 May 2013 20:58:33 +0000 (22:58 +0200)]
llvmpipe: get rid of unused tiled/linear logic

We do rendering to linear color buffers for quite some time, and since
switching to linear depth buffers all the tiled/linear logic was unused.
So get rid of (most) of it - there's still some LAYOUT_NONE things and
late allocation of resources which probably could be simplified.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: fix bogus handling of first_layer when setting up texture sampling
Roland Scheidegger [Fri, 17 May 2013 21:19:05 +0000 (23:19 +0200)]
llvmpipe: fix bogus handling of first_layer when setting up texture sampling

The code avoided first_layer parameter in the sampler interface (and needing
to do another calculation at runtime) by fixing up the base texture pointer
instead. Unfortunately, this didn't actually work as we have mip-first
texture layout so fixing up the base ptr by a fixed amount is very wrong if
there are mipmaps present. The wrong offsets caused misrendering and crashes.
Fix this by just adjusting the individual mip level offsets instead.
Spotted by Jose.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: handle z32s8x24 format for sampling
Roland Scheidegger [Fri, 17 May 2013 21:13:51 +0000 (23:13 +0200)]
gallivm: handle z32s8x24 format for sampling

Since we can only sample either depth or stencil but not both only load
the required bits which makes things a bit easier (it requires special
handling since the format doesn't fit into 32bit).
The logic for deciding if depth or stencil should be sampled is a bit odd,
but seems to be what other drivers and statetrackers do: if it's a format with
both depth and stencil (or just with depth) then sample depth, for sampling
stencil a sampler view format with only stencil is required.
Also while here fix up stencil sampling for other formats as well, though
this isn't supported by mesa (ARB_stencil_texturing), and while blits would
use it they don't work neither since they'd also need stencil export.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agost/mesa: fix weird UCMP opcode use for bool ubo load
Roland Scheidegger [Wed, 8 May 2013 22:55:22 +0000 (00:55 +0200)]
st/mesa: fix weird UCMP opcode use for bool ubo load

I don't know what this code was trying to do but whatever it was it couldn't
have worked since negation of integer boolean inputs while not specified as
outright illegal (not yet at least) won't do anything since it doesn't affect
the result of comparison with zero at all. In fact it looks like the whole
instruction can just be omitted.

Reviewed-by: Marek Olšák <maraeo@gmail.com>
11 years agomesa: Make FinishRenderTexture just take the renderbuffer being finished.
Eric Anholt [Fri, 10 May 2013 19:17:52 +0000 (12:17 -0700)]
mesa: Make FinishRenderTexture just take the renderbuffer being finished.

Now that the rb has a reference to the teximage, we didn't need anything
else out of the attachment.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Track the TexImage being rendered to in the gl_renderbuffer.
Eric Anholt [Fri, 10 May 2013 18:51:01 +0000 (11:51 -0700)]
mesa: Track the TexImage being rendered to in the gl_renderbuffer.

We keep having to pass the attachments around with our gl_renderbuffers
because that's the only way to find what the gl_renderbuffer actually
refers to.  This is a step toward removing that (though drivers still need
the Zoffset as well).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoradeon: Remove dead radeon_wrap_texture().
Eric Anholt [Fri, 10 May 2013 20:36:04 +0000 (13:36 -0700)]
radeon: Remove dead radeon_wrap_texture().

I should have killed this in my previous cleanup.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agomesa: Make gl_renderbuffers backed by EGL images use FinishRenderTexture.
Eric Anholt [Fri, 10 May 2013 19:36:43 +0000 (12:36 -0700)]
mesa: Make gl_renderbuffers backed by EGL images use FinishRenderTexture.

This is the opportunity that radeon and intel drivers rely on for flushing
render targets that may get reused as textures.  Before EGL, that only
happened for GL_TEXTURE attachments.

Fixes piglits:
KHR_gl_renderbuffer_image/renderbuffer-texture
OES_EGL_image/renderbuffer-texture

NOTE: This is a candidate for the 9.1 branch.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agogallivm: Eliminate 8.8 fixed point intermediates from AoS sampling path.
José Fonseca [Sun, 21 Apr 2013 21:23:31 +0000 (22:23 +0100)]
gallivm: Eliminate 8.8 fixed point intermediates from AoS sampling path.

This change was meant as a stepping stone to use PMADDUBSW SSSE3
instruction, but actually this refactoring by itself yields a 10%
speedup on texture intensive shaders (e.g, Google Earth's ocean water
w/o S3TC on a Ivy Bridge machine), while giving yielding exactly the
same results, whereas PMADDUBSW only gave an extra 5%, at the expense of
2bits of precision in the interpolation.

I belive that the speedup of this change comes from the reduced register
pressure (as 8.8 fixed point intermediates take twice the space of 8bit
unorm).

Also, not dealing with 8.8 simplifies lp_bld_sample_aos.c code
substantially -- it's no longer necessary to have code duplicated for
low and high register halfs.

Note about lp_build_sample_mipmap(): the path for num_quads > 1 is never
executed (as it is faster on AVX to split the 256bit wide texture
computation into two 128bit chunks, in order to leverage integer
opcodes).  This path might be useful in the future, so in order to
verify this change did not break that path I had to apply this change:

  @@ -1662,11 +1662,11 @@ lp_build_sample_soa(struct gallivm_state *gallivm,
         /*
          * we only try 8-wide sampling with soa as it appears to
          * be a loss with aos with AVX (but it should work).
          * (It should be faster if we'd support avx2)
          */
  -      if (num_quads == 1 || !use_aos) {
  +      if (/* num_quads == 1 || ! */ use_aos) {

            if (num_quads > 1) {
               if (mip_filter == PIPE_TEX_MIPFILTER_NONE) {
                  LLVMValueRef index0 = lp_build_const_int32(gallivm, 0);
                  /*

and then run texfilt mesademo:

  LP_NATIVE_VECTOR_WIDTH=256 ./texfilt

Ran whole piglit without regressions.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agogallivm: Add and use lp_build_lerp_3d.
José Fonseca [Wed, 17 Apr 2013 17:03:11 +0000 (18:03 +0100)]
gallivm: Add and use lp_build_lerp_3d.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agoradeon/llvm: Run standard optimization passes on conpute shader modules
Tom Stellard [Tue, 14 May 2013 15:56:25 +0000 (08:56 -0700)]
radeon/llvm: Run standard optimization passes on conpute shader modules

The SROA and function inliner passes are espically important, because
they optimize away unsupported features: functions and indirect
private memory access.

11 years agointel: Don't spam "intelReadPixels: fallback to swrast" in non-PBO case.
Kenneth Graunke [Thu, 16 May 2013 03:40:33 +0000 (20:40 -0700)]
intel: Don't spam "intelReadPixels: fallback to swrast" in non-PBO case.

When an application is using PBOs, we attempt to use the BLT engine to
perform ReadPixels.  If that fails due to some restrictions, it's useful
to raise a performance warning.

In the non-PBO case, we always use a CPU mapping since getting the data
into client memory requires a CPU-side copy.  This is a very common case,
so raising a performance warning is annoying.  In particular, apitrace's
image dumping code hits this path, causing it to print hundreds of
thousands of performance warnings via ARB_debug_output.  This tends to
obscure actual errors or other important messages.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
11 years agointel: Do a depth resolve before copying images between miptrees.
Paul Berry [Thu, 16 May 2013 21:12:15 +0000 (14:12 -0700)]
intel: Do a depth resolve before copying images between miptrees.

When intel_finalize_mipmap_tree() calls intel_miptree_copy_teximage()
to reassemble a depth miptree that has been broken apart into pieces
(to deal with misalignment of levels/layers within the miptree), it
just copies the depth data, not the HiZ data.  This is reasonable,
since the alignment restrictions of HiZ are a large part of the reason
why the miptree had to be broken apart in the first place.  However,
in order for the depth copy to be sufficient, we need to do a depth
resolve first, to make sure any deferred depth writes that are in the
HiZ buffer get performed.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=64662 and
https://bugs.freedesktop.org/show_bug.cgi?id=64659.

NOTE: This is a candidate for stable release branches.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agor600g: fixup for MSAA texture support checking
Niels Ole Salscheider [Wed, 15 May 2013 22:09:23 +0000 (00:09 +0200)]
r600g: fixup for MSAA texture support checking

Signed-off-by: Niels Ole Salscheider <niels_ole@salscheider-online.de>
11 years agollvmpipe: Temporary workaround to prevent segfault on array textures.
José Fonseca [Thu, 16 May 2013 14:13:51 +0000 (15:13 +0100)]
llvmpipe: Temporary workaround to prevent segfault on array textures.

11 years agogallivm: Support pointers in lp_build_print_value().
José Fonseca [Thu, 16 May 2013 12:12:11 +0000 (13:12 +0100)]
gallivm: Support pointers in lp_build_print_value().

Trivial.

11 years agoilo: emit 3DSTATE_STENCIL_BUFFER on GEN7+
Chia-I Wu [Fri, 10 May 2013 07:21:27 +0000 (15:21 +0800)]
ilo: emit 3DSTATE_STENCIL_BUFFER on GEN7+

Whether HiZ is enalbed or not, separate stencil is supported and enforced on
GEN7+.  Now that we support separate stencil resources, we know how to emit
3DSTATE_STENCIL_BUFFER.

11 years agoilo: add support for stencil resources on GEN7+
Chia-I Wu [Wed, 15 May 2013 04:18:13 +0000 (12:18 +0800)]
ilo: add support for stencil resources on GEN7+

For allocations, we need to support stencil-only and separate stencil
resources.  For mapping, we need to support software tiling and
packing/unpacking for separate stencil resources.

11 years agowinsys/intel: test for and expose address swizzling
Chia-I Wu [Fri, 10 May 2013 06:23:33 +0000 (14:23 +0800)]
winsys/intel: test for and expose address swizzling

Without knowing whether addresses are swizzled or not, we cannot manipulate a
tiled surface in CPU.

11 years agost/mesa: handle texture_from_pixmap and other surface-based textures correctly
Marek Olšák [Fri, 10 May 2013 00:03:15 +0000 (02:03 +0200)]
st/mesa: handle texture_from_pixmap and other surface-based textures correctly

There were 2 issues with it:
1) The texture format which should be used for texturing was only set
   in gl_texture_image::TexFormat, which wasn't used for sampler views.
2) Textures are sometimes reallocated under some circumstances
   in st_finalize_texture, which is unacceptable if the texture comes
   from a window system.

The issues are resolved as follows:
1) If surface_based is true (texture_from_pixmap, etc.), store the format
   in a new variable st_texture_object::surface_format.
2) Don't reallocate a surface-based texture in st_finalize_texture.

Also don't use st_ChooseTextureFormat is st_context_teximage, because
the format is dictated by the caller.

This fixes the glx-tfp piglit test.

Reviewed-by: Adam Jackson <ajax@redhat.com>
11 years agor600g: cleanup MSAA texture support checking
Marek Olšák [Thu, 11 Apr 2013 13:29:41 +0000 (15:29 +0200)]
r600g: cleanup MSAA texture support checking

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
11 years agor600g: rewrite FMASK allocation, fix FMASK texturing with 2 and 4 samples
Marek Olšák [Thu, 11 Apr 2013 12:54:40 +0000 (14:54 +0200)]
r600g: rewrite FMASK allocation, fix FMASK texturing with 2 and 4 samples

This fixes and enables texturing with compressed MSAA colorbuffers
on Evergreen and Cayman. For the first time, multisample textures work
on Cayman.

This requires the libdrm flag RADEON_SURF_FMASK.

v2: require libdrm_radeon 2.4.45

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
11 years agoi965: Fill in brw_format_for_mesa_format for some non-rendering formats.
Eric Anholt [Wed, 17 Apr 2013 00:21:23 +0000 (17:21 -0700)]
i965: Fill in brw_format_for_mesa_format for some non-rendering formats.

This should have no change on driver operation, but it means that when you
wonder why some format isn't supported natively, you can just look at the
table above, instead of wondering if maybe there's an appropriate entry in
the surface formats table that is already supported.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Use native RGB_FLOAT16 support when available.
Eric Anholt [Wed, 17 Apr 2013 00:21:22 +0000 (17:21 -0700)]
i965: Use native RGB_FLOAT16 support when available.

Previously we would expand it to RGBA_FLOAT16.  This format now comes out
as framebuffer incomplete, but it seems worth the memory savings if that's
what people are asking for (and GL3 does list it under "texture-only"
color formats)

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agointel: Add support for blitting 6 byte-per-pixel formats.
Eric Anholt [Wed, 17 Apr 2013 00:21:21 +0000 (17:21 -0700)]
intel: Add support for blitting 6 byte-per-pixel formats.

The next commit introduces what is apparently our first one, which tripped
over this in glReadPixels.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Use the Mesa surface formats for float RGB surfaces.
Eric Anholt [Wed, 17 Apr 2013 00:21:20 +0000 (17:21 -0700)]
i965: Use the Mesa surface formats for float RGB surfaces.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: Use the new XRGB UNORM formats.
Eric Anholt [Wed, 17 Apr 2013 00:21:19 +0000 (17:21 -0700)]
i965: Use the new XRGB UNORM formats.

This is a step on the way to removing some of our code for forcing alpha
to 1, but I want easy bisecting so I'll add groups of formats separately.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agodraw: More defensive coding in DRAW_GET_IDX.
José Fonseca [Wed, 15 May 2013 15:59:28 +0000 (16:59 +0100)]
draw: More defensive coding in DRAW_GET_IDX.

Doesn't make a difference ATM, but just in case.

11 years agodraw: Fix vsplit regression when the ib can be used directly.
José Fonseca [Wed, 15 May 2013 15:57:11 +0000 (16:57 +0100)]
draw: Fix vsplit regression when the ib can be used directly.

`ib` no longer is offseted by `istart`.

Trivial.

11 years agomesa: Stop clamping stencil reference value at specification time
Chris Forbes [Mon, 13 May 2013 09:54:36 +0000 (21:54 +1200)]
mesa: Stop clamping stencil reference value at specification time

All drivers now clamp this to the appropriate range for the bound
stencil buffer when emitting stencil state.

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoswrast: Use accessor for stencil reference values
Chris Forbes [Mon, 13 May 2013 09:49:30 +0000 (21:49 +1200)]
swrast: Use accessor for stencil reference values

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agost: Use accessor for stencil reference values
Chris Forbes [Mon, 13 May 2013 09:49:11 +0000 (21:49 +1200)]
st: Use accessor for stencil reference values

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoradeon: Use accessor for stencil reference values
Chris Forbes [Mon, 13 May 2013 09:48:34 +0000 (21:48 +1200)]
radeon: Use accessor for stencil reference values

V2: Drop spurious mask with 0xff.

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agonouveau: Use accessor for stencil reference values
Chris Forbes [Mon, 13 May 2013 09:47:37 +0000 (21:47 +1200)]
nouveau: Use accessor for stencil reference values

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agointel: Use accessor for stencil reference values
Chris Forbes [Mon, 13 May 2013 09:46:50 +0000 (21:46 +1200)]
intel: Use accessor for stencil reference values

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agomesa: Use accessor for stencil reference values in glGet
Chris Forbes [Mon, 13 May 2013 09:46:07 +0000 (21:46 +1200)]
mesa: Use accessor for stencil reference values in glGet

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agomesa: add accessor for effective stencil ref
Chris Forbes [Mon, 13 May 2013 09:17:29 +0000 (21:17 +1200)]
mesa: add accessor for effective stencil ref

Clamps the stencil reference value to the range representable in the
currently-bound draw framebuffer's stencil attachment.

V2: Add spec quote.

NOTE: This is a candidate for stable branches.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoilo: clean up transfer format conversion
Chia-I Wu [Wed, 15 May 2013 05:52:14 +0000 (13:52 +0800)]
ilo: clean up transfer format conversion

Map the bo directly, instead of calling transfer_map().

11 years agoilo: rework transfer mapping method choosing
Chia-I Wu [Wed, 15 May 2013 03:24:02 +0000 (11:24 +0800)]
ilo: rework transfer mapping method choosing

Always check if a bo is busy in choose_transfer_method() since we always need
to map it in either map() or unmap().  Also determine how a bo is mapped in
choose_transfer_method().

11 years agoilo: refactor transfer mapping
Chia-I Wu [Wed, 15 May 2013 00:51:16 +0000 (08:51 +0800)]
ilo: refactor transfer mapping

Add tex_get_box_offset() to compute transfer offet from the pipe_box.  Add
tex_get_slice_stride() to compute slice stride for a transfer.

11 years agoilo: no writeback without PIPE_TRANSFER_WRITE
Chia-I Wu [Wed, 15 May 2013 00:50:34 +0000 (08:50 +0800)]
ilo: no writeback without PIPE_TRANSFER_WRITE

We should not write staging data back when PIPE_TRANSFER_WRITE is not set.

11 years agoilo: minor cleanups for transfers
Chia-I Wu [Wed, 15 May 2013 00:49:22 +0000 (08:49 +0800)]
ilo: minor cleanups for transfers

Rename some functions and reorder some code.

11 years agoilo: simplify ilo_texture_get_slice_offset()
Chia-I Wu [Tue, 14 May 2013 10:47:03 +0000 (18:47 +0800)]
ilo: simplify ilo_texture_get_slice_offset()

Always return a tile-aligned offset.  Also fix for W tiling.

11 years agodraw/gs: fix extracting of the clip
Zack Rusin [Tue, 14 May 2013 07:47:36 +0000 (03:47 -0400)]
draw/gs: fix extracting of the clip

The indices are not consecutive when using the geometry shader,
which means we were extracting non existing values. Create
an array of linear indices and always use it instead of the passed
indices. Found by Jose.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agodocs: Mark a few things as in progress.
Kenneth Graunke [Tue, 14 May 2013 19:22:09 +0000 (12:22 -0700)]
docs: Mark a few things as in progress.

11 years agodraw: try to prevent overflows on index buffers
Zack Rusin [Tue, 14 May 2013 03:07:14 +0000 (23:07 -0400)]
draw: try to prevent overflows on index buffers

Pass in the size of the index buffer, when available, and use it
to handle out of bounds conditions. The behavior in the case of
an overflow needs to be the same as with other overflows in the
vertex processing pipeline meaning that a vertex should still
be generated but all attributes in it set to zero.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agodraw: use the total number of vertices for statistics
Zack Rusin [Tue, 14 May 2013 02:41:25 +0000 (22:41 -0400)]
draw: use the total number of vertices for statistics

the number of vertices to fetch doesn't necessarily equal the
total number of input vertices, e.g. we might want to fetch
a single vertex but then draw it twice. Lets use the correct
number of input vertices in the statistics.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agodraw: don't crash on vertex buffer overflow
Zack Rusin [Thu, 9 May 2013 03:48:20 +0000 (23:48 -0400)]
draw: don't crash on vertex buffer overflow

We would crash when stride was bigger than the size of the buffer.
The correct behavior is to just fetch zero's in this case.
Unfortunatly with user_buffer's there's no way to validate the size
because currently we're just not getting it. Adjust the draw interface
to pass the size along the mapped buffer, which works perfectly
for buffer backed vertex_buffers and, in future, it will allow
us to plumb user_buffer sizes through the same interface.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agogallivm/soa: implement indirect addressing in immediates
Zack Rusin [Tue, 7 May 2013 19:59:56 +0000 (15:59 -0400)]
gallivm/soa: implement indirect addressing in immediates

The support is analogous to the way we handle indirect addressing
in temporaries, except that we don't have to worry about storing
(after declarations) and thus we'll able to keep using the old
code when indirect addressing isn't used. In other words we're
still using constants directly, unless the instruction has
immediate register with indirect addressing.

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agodraw/gs: don't bind the tgsi state if we're using llvm paths
Zack Rusin [Fri, 3 May 2013 16:22:08 +0000 (12:22 -0400)]
draw/gs: don't bind the tgsi state if we're using llvm paths

Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agogallivm: Fix build with LLVM >= 3.4 r181680.
Vinson Lee [Mon, 13 May 2013 03:37:17 +0000 (20:37 -0700)]
gallivm: Fix build with LLVM >= 3.4 r181680.

Tested-by: Laurent Carlier <lordheavym@gmail.com>
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
11 years agomesa/st: Temporary workaround for fdo bug 64568.
José Fonseca [Tue, 14 May 2013 15:55:56 +0000 (16:55 +0100)]
mesa/st: Temporary workaround for fdo bug 64568.

Effectively reverting the problematic hunk of
commit 614ee25077b7ffafeb87b22563d01856824fb4bc

11 years agoradeonsi: add Hainan pci ids
Alex Deucher [Mon, 13 May 2013 20:25:51 +0000 (16:25 -0400)]
radeonsi: add Hainan pci ids

Note: this is a candidate for the 9.1 branch

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
11 years agoradeonsi: update r600_get_llvm_processor_name for hainan
Alex Deucher [Mon, 13 May 2013 20:44:40 +0000 (16:44 -0400)]
radeonsi: update r600_get_llvm_processor_name for hainan

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
11 years agoradeonsi: add support for hainan chips
Alex Deucher [Mon, 13 May 2013 20:24:02 +0000 (16:24 -0400)]
radeonsi: add support for hainan chips

Note: this is a candidate for the 9.1 branch

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
11 years agodraw: Fix io_ptr/num_prims name in IR.
José Fonseca [Tue, 14 May 2013 13:18:42 +0000 (14:18 +0100)]
draw: Fix io_ptr/num_prims name in IR.

Trivial.

11 years agograw/tgsi_dump: Fix gdb macro.
José Fonseca [Mon, 13 May 2013 14:15:59 +0000 (15:15 +0100)]
graw/tgsi_dump: Fix gdb macro.

The macro was relying on "tokens" local variable to exist.

11 years agor600g/sb: add missing cases for ARUBA chips
Vadim Girlin [Tue, 14 May 2013 13:11:38 +0000 (17:11 +0400)]
r600g/sb: add missing cases for ARUBA chips

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
11 years agor600g/sb: get rid of standard c++ streams
Vadim Girlin [Tue, 14 May 2013 13:08:38 +0000 (17:08 +0400)]
r600g/sb: get rid of standard c++ streams

Static initialization of internal libstdc++ data related to iostream
causes segfaults with some apps.

This patch replaces all uses of std::ostream and std::ostringstream in sb
with custom lightweight classes.

Prevents segfaults with ut2004demo and probably some other old apps.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
11 years agor600g/sb: separate bytecode decoding and parsing
Vadim Girlin [Sat, 11 May 2013 14:30:30 +0000 (18:30 +0400)]
r600g/sb: separate bytecode decoding and parsing

Parsing and ir construction is required for optimization only,
it's unnecessary if we only need to print shader dump.
This should make new disassembler more tolerant to any new
features in the bytecode.

Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>