mesa.git
11 years agogallium/postprocess: share pipe_context and cso_context with the state tracker
Marek Olšák [Thu, 29 Nov 2012 01:55:01 +0000 (02:55 +0100)]
gallium/postprocess: share pipe_context and cso_context with the state tracker

Using one context instead of two is more efficient and
we can skip another context flush.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: move some helper functions from fboobject.c to glformats.c
Marek Olšák [Wed, 28 Nov 2012 18:07:18 +0000 (19:07 +0100)]
mesa: move some helper functions from fboobject.c to glformats.c

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoandroid: include api_exec.c in generated files list
Tapani Pälli [Thu, 29 Nov 2012 07:48:00 +0000 (09:48 +0200)]
android: include api_exec.c in generated files list

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
11 years agogallivm: Fix lp_build_float_to_half.
José Fonseca [Thu, 29 Nov 2012 16:52:06 +0000 (16:52 +0000)]
gallivm: Fix lp_build_float_to_half.

The current implementation was close by not fully correct: several
operations that should be done in floating point were being done in
integer.

Fixes piglit fbo-clear-formats GL_ARB_texture_float

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agogallivm: fix a trivial txq issue for 2d shadow and cube shadow samplers
Roland Scheidegger [Thu, 29 Nov 2012 03:00:35 +0000 (04:00 +0100)]
gallivm: fix a trivial txq issue for 2d shadow and cube shadow samplers

untested (couldn't get the piglit test to run even with version overrides)
but seemed blatantly wrong.
In any case it would only affect an error case which when it would happen
probably all hope is lost anyway.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: support array textures
Roland Scheidegger [Thu, 29 Nov 2012 03:08:32 +0000 (04:08 +0100)]
llvmpipe: support array textures

This adds array (1d,2d) texture support to llvmpipe.
Though probably should do something about 1d array textures requiring gobs
of memory (this issue is not strictly limited to arrays but it is probably
worse there).
Initial code by Jakob Bornecrantz <jakob@vmware.com>

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agogallivm: support array textures
Roland Scheidegger [Thu, 29 Nov 2012 03:06:48 +0000 (04:06 +0100)]
gallivm: support array textures

Support 1d and 2d array textures (including shadow samplers),
and (as a side effect mostly) also shadow cube samplers.
Seems to pass the relevant piglit tests both for sampling and rendering
to (though some require version overrides).
Since we don't support render target indices rendering to array textures
is still restricted to a single layer at a time.
Also, the min/max layer in the sampler view (which is unnecessary for GL)
is ignored (always use all layers).

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: Remove lp_build_blend_soa()
José Fonseca [Wed, 28 Nov 2012 21:06:03 +0000 (21:06 +0000)]
llvmpipe: Remove lp_build_blend_soa()

No longer used/necessary, as we always blend in AoS now.

Trivial.

11 years agollvmpipe: Eliminate color buffer swizzling.
José Fonseca [Wed, 28 Nov 2012 20:14:17 +0000 (20:14 +0000)]
llvmpipe: Eliminate color buffer swizzling.

Now dead code.

Also had to remove the show_tiles/show_subtiles because now the color
buffers are always stored in their native format, so there is no longer
an easy way to paint the tile sizes.

Depth-stencil buffers are still swizzled.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agollvmpipe: Only advertise unswizzled formats.
José Fonseca [Wed, 28 Nov 2012 19:25:05 +0000 (19:25 +0000)]
llvmpipe: Only advertise unswizzled formats.

Update llvmpipe_is_format_supported and llvmpipe_is_format_unswizzled
so that only the formats that we can render without swizzling are
advertised.

We can still render all D3D10 required formats except
PIPE_FORMAT_R11G11B10_FLOAT, which needs to be implemented in a future
opportunity.

Removal of rendertarget swizzling will be done in a subsequent change.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agoutil/u_format: Kill util_format_is_array().
José Fonseca [Wed, 28 Nov 2012 19:20:18 +0000 (19:20 +0000)]
util/u_format: Kill util_format_is_array().

It is buggy (it was giving wrong results for some of the formats with
padding), and util_format_description::is_array already does precisely
what's intended.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agoutil/u_format: Tighten the meaning of is_array bit to exclude mixed type formats.
José Fonseca [Wed, 28 Nov 2012 19:18:09 +0000 (19:18 +0000)]
util/u_format: Tighten the meaning of is_array bit to exclude mixed type formats.

This is what we want in practice.

The only change is in PIPE_FORMAT_R8SG8SB8UX8U_NORM, which no longer is
considered an array format.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
11 years agoutil/u_format: Fix format manipulation for big-endian
Adhemerval Zanella [Thu, 22 Nov 2012 19:48:45 +0000 (13:48 -0600)]
util/u_format: Fix format manipulation for big-endian

This patch fixes various format manipulation for big-endian
architectures.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Fix format manipulation for big-endian
Adhemerval Zanella [Thu, 22 Nov 2012 19:48:45 +0000 (13:48 -0600)]
gallivm: Fix format manipulation for big-endian

This patch fixes various format manipulation for big-endian
architectures.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Add byte-swap construct calls
Adhemerval Zanella [Thu, 22 Nov 2012 18:23:23 +0000 (12:23 -0600)]
gallivm: Add byte-swap construct calls

This patch adds two more functions in type conversions header:
* lp_build_bswap: construct a call to llvm.bswap intrinsic for an
  element
* lp_build_bswap_vec: byte swap every element in a vector base on the
  input and output types.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Fix vector constant for shuffle
Adhemerval Zanella [Thu, 22 Nov 2012 19:42:45 +0000 (13:42 -0600)]
gallivm: Fix vector constant for shuffle

This patch fixes the vector constant generation used for vector shuffle
for big-endian machines.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: clear Altivec NJ bit
Adhemerval Zanella [Thu, 22 Nov 2012 17:55:35 +0000 (11:55 -0600)]
gallivm: clear Altivec NJ bit

This patch enforces the clear of NJ bit in VSCR Altivec register so
denormal numbers are handles as expected by IEEE standards.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Altivec floating-point rounding
Adhemerval Zanella [Thu, 22 Nov 2012 17:37:18 +0000 (11:37 -0600)]
gallivm: Altivec floating-point rounding

This patch adds Altivec intrinsics for float vector types. It changes
the SSE specific definitions to a platform neutral and adds the calls
to Altivec intrinsic builder.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Altivec vector add/sub intrisics
Adhemerval Zanella [Thu, 22 Nov 2012 17:20:42 +0000 (11:20 -0600)]
gallivm: Altivec vector add/sub intrisics

This patch add correct vector addition and substraction intrisics when
using Altivec with PPC. Current code uses default path and LLVM backend
ends up issuing carry-out arithmetic instruction while it is expected
saturated ones.

It also includes a fix for PowerPC where char are unsigned by default,
resulting in bogus values for vector shifting.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Altivec vector max/min intrisics
Adhemerval Zanella [Thu, 22 Nov 2012 17:03:11 +0000 (11:03 -0600)]
gallivm: Altivec vector max/min intrisics

This patch adds the PPC Altivec instrics max/min instruction for
supported Altivec vector types (16xi8, 8xi16, 4xi32, 4xf32).

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Altivec pack/unpack intrisics
Adhemerval Zanella [Thu, 22 Nov 2012 16:54:45 +0000 (10:54 -0600)]
gallivm: Altivec pack/unpack intrisics

This patch adds PPC Altivec support for pack/unpack operations using Altivec
supported vector type (8xi8, 16xi16, 4xi32, 4xf32).

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agoradeonsi: Bitcast result of packf16 intrinsic to float for export intrinsic.
Michel Dänzer [Tue, 27 Nov 2012 18:53:58 +0000 (19:53 +0100)]
radeonsi: Bitcast result of packf16 intrinsic to float for export intrinsic.

Fixes 7 piglit tests, and prevents many more from crashing.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-and-Tested-by: Christian König <christian.koenig@amd.com>
11 years agoi965/vs: Move struct brw_compile (p) entirely inside vec4_generator.
Kenneth Graunke [Tue, 27 Nov 2012 08:16:05 +0000 (00:16 -0800)]
i965/vs: Move struct brw_compile (p) entirely inside vec4_generator.

The brw_compile structure contains the brw_instruction store and the
brw_eu_emit.c state tracking fields.  These are only useful for the
final assembly generation pass; the earlier compilation stages doesn't
need them.

This also means that the code generator for future hardware won't have
access to the brw_compile structure, which is extremely desirable
because it prevents accidental generation of Gen4-7 code.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi965/vs: Split final assembly code generation out of vec4_visitor.
Kenneth Graunke [Tue, 27 Nov 2012 06:53:10 +0000 (22:53 -0800)]
i965/vs: Split final assembly code generation out of vec4_visitor.

Compiling shaders requires several main steps:

   1. Generating VS IR from either GLSL IR or Mesa IR
   2. Optimizing the IR
   3. Register allocation
   4. Generating assembly code

This patch splits out step 4 into a separate class named "vec4_generator."

There are several reasons for doing so:

   1. Future hardware has a different instruction encoding.  Splitting
      this out will allow us to replace vec4_generator (which relies
      heavily on the brw_eu_emit.c code and struct brw_instruction) with
      a new code generator that writes the new format.

   2. It reduces the size of the vec4_visitor monolith.  (Arguably, a lot
      more should be split out, but that's left for "future work.")

   3. Separate namespaces allow us to make helper functions for
      generating instructions in both classes: ADD() can exist in
      vec4_visitor and create IR, while ADD() in vec4_generator() can
      create brw_instructions.  (Patches for this upcoming.)

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi965/vs: Abort on unsupported opcodes rather than failing.
Kenneth Graunke [Tue, 27 Nov 2012 05:56:06 +0000 (21:56 -0800)]
i965/vs: Abort on unsupported opcodes rather than failing.

Final code generation should never fail.  This is a bug, and there
should be no user-triggerable cases where this could occur.

Also, we're not going to have a fail() method after the split.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi965/vs: Move uses of brw_compile from do_vs_prog to brw_vs_emit.
Kenneth Graunke [Tue, 27 Nov 2012 07:59:32 +0000 (23:59 -0800)]
i965/vs: Move uses of brw_compile from do_vs_prog to brw_vs_emit.

The brw_compile structure is closely tied to the Gen4-7 hardware
encoding.  However, do_vs_prog is very generic: it just calls out to
get a compiled program and then uploads it.

This isn't ultimately where we want it, but it's a step in the right
direction: it's now closer to the code generator.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi965/vs: Rework memory contexts for shader compilation data.
Kenneth Graunke [Tue, 27 Nov 2012 07:52:20 +0000 (23:52 -0800)]
i965/vs: Rework memory contexts for shader compilation data.

During compilation, we allocate a bunch of things: the IR needs to last
at least until code generation...and then the program store needs to
last until after we upload the program.

For simplicity's sake, just keep it all around until we upload the
program.  After that, it can all be freed.

This will also save a lot of headaches during the upcoming refactoring.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi965/vs: Pass the brw_context pointer into brw_compute_vue_map().
Kenneth Graunke [Tue, 27 Nov 2012 07:07:51 +0000 (23:07 -0800)]
i965/vs: Pass the brw_context pointer into brw_compute_vue_map().

We used to steal it out of the brw_compile struct, but that won't be
initialized in time soon (and is eventually going away).

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi965/vs: Pass the brw_context pointer into vec4_visitor and do_vs_prog.
Kenneth Graunke [Tue, 27 Nov 2012 06:14:27 +0000 (22:14 -0800)]
i965/vs: Pass the brw_context pointer into vec4_visitor and do_vs_prog.

We used to steal it out of the brw_compile struct...but vec4_visitor
isn't going to have one of those in the future.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agoi965/vs: Move some functions from brw_vec4_emit.cpp to brw_vec4.cpp.
Kenneth Graunke [Tue, 27 Nov 2012 05:46:27 +0000 (21:46 -0800)]
i965/vs: Move some functions from brw_vec4_emit.cpp to brw_vec4.cpp.

This leaves only the final code generation stage in brw_vec4_emit.cpp,
moving the payload setup, run(), and brw_vs_emit functions to brw_vec4.cpp.

The fragment shader backend puts these functions in brw_fs.cpp, so this
patch also helps with consistency.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
11 years agometa: Don't try to glOrtho when the draw buffer isn't initialized.
Kenneth Graunke [Tue, 27 Nov 2012 05:11:14 +0000 (21:11 -0800)]
meta: Don't try to glOrtho when the draw buffer isn't initialized.

I ran across this while running a glGenerateMipmap() test.

_meta_GenerateMipmap sets MESA_META_TRANSFORM, which causes
_mesa_meta_begin to try and set a default orthographic projection.

Unfortunately, if the drawbuffer isn't set up, ctx->DrawBuffer->Width
and Height are 0, which just causes an GL_INVALID_VALUE error.

Fixes oglconform's fbo/mipmap.automatic, mipmap.manual, and
mipmap.manualIterateTexTargets.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agodocs: Mark some features in GL3.txt as done for r600
Jason Wood [Thu, 29 Nov 2012 00:05:12 +0000 (01:05 +0100)]
docs: Mark some features in GL3.txt as done for r600

Signed-off-by: Marek Olšák <maraeo@gmail.com>
11 years agost/mesa: allow forward-compatible contexts and set Const.ContextFlags
Marek Olšák [Wed, 28 Nov 2012 19:38:22 +0000 (20:38 +0100)]
st/mesa: allow forward-compatible contexts and set Const.ContextFlags

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agost/mesa: add support for GL core profiles
Marek Olšák [Fri, 23 Nov 2012 19:20:03 +0000 (20:20 +0100)]
st/mesa: add support for GL core profiles

The rest of the plumbing was in place already.

I have tested this by turning on all GL 3.1 features.
The drivers not supporting GL 3.1 will fail to create a core profile
as they should.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agoconfigure.ac: remove -fomit-frame-pointer from LLVM flags
Marek Olšák [Tue, 27 Nov 2012 23:28:18 +0000 (00:28 +0100)]
configure.ac: remove -fomit-frame-pointer from LLVM flags

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoconfigure.ac: look for whole words in LLVM flags, not prefixes
Marek Olšák [Tue, 27 Nov 2012 22:56:04 +0000 (23:56 +0100)]
configure.ac: look for whole words in LLVM flags, not prefixes

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoconfigure.ac: consolidate stripping unwanted LLVM flags
Marek Olšák [Tue, 27 Nov 2012 22:38:01 +0000 (23:38 +0100)]
configure.ac: consolidate stripping unwanted LLVM flags

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoconfigure.ac: print LLVM flags
Marek Olšák [Tue, 27 Nov 2012 21:32:50 +0000 (22:32 +0100)]
configure.ac: print LLVM flags

to see what we're mixing with ours

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
11 years agoutil: add more memory debugging features
Brian Paul [Wed, 28 Nov 2012 20:35:01 +0000 (13:35 -0700)]
util: add more memory debugging features

Add a DEBUG_FREED_MEMORY option to help catch use-after-free errors.
Add debug_memory_check() function which can be periodically called to
check that all known blocks are good.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: Implement logic ops for the AoS path.
José Fonseca [Wed, 28 Nov 2012 20:45:03 +0000 (20:45 +0000)]
llvmpipe: Implement logic ops for the AoS path.

It was forgotten in the previous patch series, but it is trivial to
implement, based on the SoA path.

This fixes glean logicOp failures.

11 years agollvmpipe: Don't use dynamically sized arrays.
José Fonseca [Wed, 28 Nov 2012 19:57:26 +0000 (19:57 +0000)]
llvmpipe: Don't use dynamically sized arrays.

Unfortunately for MSVC arrays with a constant variable size are still
considered dynamically sized.

11 years agoi965/gen4-5: Fix segfaults with stencil-only depth/stencil setups.
Eric Anholt [Mon, 26 Nov 2012 22:46:11 +0000 (14:46 -0800)]
i965/gen4-5: Fix segfaults with stencil-only depth/stencil setups.

Fixes a ton of piglit regressions since the depthstencil fixes for gen6+.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57309
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965/fs: Don't generate saturates over existing variable values.
Eric Anholt [Mon, 26 Nov 2012 22:22:12 +0000 (14:22 -0800)]
i965/fs: Don't generate saturates over existing variable values.

Fixes a crash in http://workshop.chromeexperiments.com/stars/ on i965,
and the new piglit test glsl-fs-clamp-5.
We were trying to emit a saturating move into a uniform, which the code
generator appropriately choked on.  This was broken in the change in
32ae8d3b321185a85b73ff703d8fc26bd5f48fa7.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57166
NOTE: This is a candidate for the 9.0 branch.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965/fs: Add some minimal backend-IR dumping.
Eric Anholt [Tue, 30 Oct 2012 22:35:44 +0000 (15:35 -0700)]
i965/fs: Add some minimal backend-IR dumping.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agollvmpipe: Update llvmpipe_is_format_unswizzled to reflect latest changes.
James Benton [Fri, 14 Sep 2012 12:29:58 +0000 (13:29 +0100)]
llvmpipe: Update llvmpipe_is_format_unswizzled to reflect latest changes.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: Enable vertex color clamping.
James Benton [Thu, 13 Sep 2012 15:05:08 +0000 (16:05 +0100)]
llvmpipe: Enable vertex color clamping.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agollvmpipe: Unswizzled rendering.
James Benton [Thu, 13 Sep 2012 15:04:42 +0000 (16:04 +0100)]
llvmpipe: Unswizzled rendering.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Updated lp_build_const_mask_aos to input number of channels.
James Benton [Wed, 11 Jul 2012 14:39:53 +0000 (15:39 +0100)]
gallivm: Updated lp_build_const_mask_aos to input number of channels.

Also updated lp_build_const_mask_aos_swizzled to reflect this.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agoutil: Updated util_format_is_array to be more accurate.
James Benton [Wed, 11 Jul 2012 14:32:47 +0000 (15:32 +0100)]
util: Updated util_format_is_array to be more accurate.

Will allow formats with padding, e.g. RGBX.
Will now allow swizzled formats as long as the alpha is channel 3.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Added support for float to half-float conversion in lp_build_conv.
James Benton [Fri, 8 Jun 2012 17:49:53 +0000 (18:49 +0100)]
gallivm: Added support for float to half-float conversion in lp_build_conv.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Changed lp_build_pad_vector to correctly handle scalar argument.
James Benton [Wed, 30 May 2012 13:40:33 +0000 (14:40 +0100)]
gallivm: Changed lp_build_pad_vector to correctly handle scalar argument.

Removed the lp_type argument as it was unnecessary.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Add a function to generate lp_type for a format.
James Benton [Wed, 30 May 2012 13:38:52 +0000 (14:38 +0100)]
gallivm: Add a function to generate lp_type for a format.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agogallivm: Add support for unorm16 in lp_build_mul.
James Benton [Wed, 30 May 2012 13:36:22 +0000 (14:36 +0100)]
gallivm: Add support for unorm16 in lp_build_mul.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
11 years agoglcpp: Support #elif(expression) with no intervening space.
Matt Turner [Mon, 26 Nov 2012 19:53:45 +0000 (11:53 -0800)]
glcpp: Support #elif(expression) with no intervening space.

And add test cases to ensure that this works
- 110 verifies that glcpp rejects #elif<digits> which glcpp
  previously accepted.
- 111 verifies that glcpp accepts #if followed immediately by
  (, +, -, !, or ~.
- 112 does the same as 111 but for #elif.

See 17f9beb6 for #if change.
Reviewed-by: Carl Worth <cworth@cworth.org>
11 years agoglcpp: Reject #version and #line not followed by whitespace
Matt Turner [Wed, 21 Nov 2012 01:23:42 +0000 (17:23 -0800)]
glcpp: Reject #version and #line not followed by whitespace

Fixes part of es3conform's preprocess16_frag test.
Reviewed-by: Carl Worth <cworth@cworth.org>
11 years agomesa: fix BlitFramebuffer between linear and sRGB formats
Marek Olšák [Fri, 23 Nov 2012 02:02:44 +0000 (03:02 +0100)]
mesa: fix BlitFramebuffer between linear and sRGB formats

NOTE: This is a candidate for the stable branches.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agogallivm: fix multiple lods with different min/mag filter and wide vectors
Roland Scheidegger [Wed, 28 Nov 2012 17:07:27 +0000 (18:07 +0100)]
gallivm: fix multiple lods with different min/mag filter and wide vectors

broken since 529fe420ba6836479619ba42e53665724755fc1c,
I forgot some code, only added the comment...
Fixes bug 57644.

11 years agoradeonsi: Reinstate assertions against invalid colour/depth formats.
Michel Dänzer [Fri, 23 Nov 2012 15:05:41 +0000 (16:05 +0100)]
radeonsi: Reinstate assertions against invalid colour/depth formats.

radeonsi now supports Z16 and doesn't fail these assertions anymore.

This partially reverts commit 7bba4879bb79719e22a18b52759b1d1d839c783c, but
leaves the error messages in place to allow diagnosing such problems even with
non-debugging builds.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
11 years agoradeonsi: Re-enable Z16 depth buffers.
Michel Dänzer [Fri, 16 Nov 2012 16:18:05 +0000 (17:18 +0100)]
radeonsi: Re-enable Z16 depth buffers.

8 more piglits.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
11 years agoradeonsi: remove redundant parameter in r600_init_surface
Marek Olšák [Thu, 22 Nov 2012 18:22:46 +0000 (19:22 +0100)]
radeonsi: remove redundant parameter in r600_init_surface

[ Cherry-picked from r600g commit f5ac60152b10b04d38e77db6b904dd50d1a54d6c ]

11 years agoradeonsi: Use explicit stencil mipmap level offsets.
Michel Dänzer [Tue, 20 Nov 2012 11:48:30 +0000 (12:48 +0100)]
radeonsi: Use explicit stencil mipmap level offsets.

Extracted from r600g commit 428e37c2da420f7dc14a2ea265f2387270f9bee1.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
11 years agoradeonsi: correct texture memory size for Z32F_S8X24
Marek Olšák [Tue, 13 Nov 2012 17:01:53 +0000 (18:01 +0100)]
radeonsi: correct texture memory size for Z32F_S8X24

[ Cherry-picked from r600g commit ea72351a919c594e7f40e901dca42aebb866f8a6 ]

11 years agoradeonsi: Depth/stencil fixes.
Michel Dänzer [Tue, 13 Nov 2012 16:57:07 +0000 (17:57 +0100)]
radeonsi: Depth/stencil fixes.

Adapted from r600g commit 018e3f75d69490598d61059ece56d379867f3995.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
11 years agoradeonsi: Flesh out support for depth/stencil exports from the pixel shader.
Michel Dänzer [Tue, 13 Nov 2012 16:35:09 +0000 (17:35 +0100)]
radeonsi: Flesh out support for depth/stencil exports from the pixel shader.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
11 years agoradeonsi: Fix sampler views for depth textures.
Michel Dänzer [Tue, 20 Nov 2012 16:33:19 +0000 (17:33 +0100)]
radeonsi: Fix sampler views for depth textures.

Consistently reference the flushed depth texture in the sampler view, not the
original one.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
11 years agoradeonsi: Fix z/stencil texture creation.
Jerome Glisse [Tue, 13 Nov 2012 16:41:59 +0000 (17:41 +0100)]
radeonsi: Fix z/stencil texture creation.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
[ Cherry-picked from r600g commit b4f0ab0b22625ac1bb3cf16342039557c086ebae ]

11 years agoscons: Build ws_xlib on Mac OS X.
Vinson Lee [Tue, 27 Nov 2012 08:05:08 +0000 (00:05 -0800)]
scons: Build ws_xlib on Mac OS X.

Fixes this SCons build error on Mac OS X if X11 is found.

NameError: name 'ws_xlib' is not defined:
  File "SConstruct", line 144:
    duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
  File "scons-2.2.0/SCons/Script/SConscript.py", line 614:
    return method(*args, **kw)
  File "scons-2.2.0/SCons/Script/SConscript.py", line 551:
    return _SConscript(self.fs, *files, **subst_kw)
  File "scons-2.2.0/SCons/Script/SConscript.py", line 260:
    exec _file_ in call_stack[-1].globals
  File "src/SConscript", line 34:
    SConscript('gallium/SConscript')
  File "scons-2.2.0/SCons/Script/SConscript.py", line 614:
    return method(*args, **kw)
  File "scons-2.2.0/SCons/Script/SConscript.py", line 551:
    return _SConscript(self.fs, *files, **subst_kw)
  File "scons-2.2.0/SCons/Script/SConscript.py", line 260:
    exec _file_ in call_stack[-1].globals
  File "src/gallium/SConscript", line 135:
    'targets/libgl-xlib/SConscript',
  File "scons-2.2.0/SCons/Script/SConscript.py", line 614:
    return method(*args, **kw)
  File "scons-2.2.0/SCons/Script/SConscript.py", line 551:
    return _SConscript(self.fs, *files, **subst_kw)
  File "scons-2.2.0/SCons/Script/SConscript.py", line 260:
    exec _file_ in call_stack[-1].globals
  File "src/gallium/targets/graw-xlib/SConscript", line 9:
    ws_xlib,

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agoconfigure.ac: Remove -O., -g and -Wall from LLVM_C{PP,XX}FLAGS.
Johannes Obermayr [Mon, 26 Nov 2012 23:48:40 +0000 (00:48 +0100)]
configure.ac: Remove -O., -g and -Wall from LLVM_C{PP,XX}FLAGS.

Signed-off-by: Marek Olšák <maraeo@gmail.com>
11 years agovbo: move another line of code after declarations
Brian Paul [Tue, 27 Nov 2012 22:34:13 +0000 (15:34 -0700)]
vbo: move another line of code after declarations

Signed-off-by: Brian Paul <brianp@vmware.com>
11 years agovbo: move code after declarations to fix MSVC errors
Brian Paul [Tue, 27 Nov 2012 20:58:33 +0000 (13:58 -0700)]
vbo: move code after declarations to fix MSVC errors

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
11 years agovbo: minor whitespace fix
Brian Paul [Tue, 27 Nov 2012 20:53:38 +0000 (13:53 -0700)]
vbo: minor whitespace fix

11 years agomesa: remove '(void) k' lines
Brian Paul [Tue, 13 Nov 2012 16:51:58 +0000 (09:51 -0700)]
mesa: remove '(void) k' lines

Serves no purpose as the k parameter is used later in the code.

11 years agomesa/vbo: Check for invalid types in various packed vertex functions.
Kenneth Graunke [Tue, 27 Nov 2012 20:06:13 +0000 (12:06 -0800)]
mesa/vbo: Check for invalid types in various packed vertex functions.

According to the ARB_vertex_type_2_10_10_10_rev specification:
"The error INVALID_ENUM is generated by VertexP*, NormalP*,
 TexCoordP*, MultiTexCoordP*, ColorP*, or SecondaryColorP if <type>
 is not UNSIGNED_INT_2_10_10_10_REV or INT_2_10_10_10_REV."

Fixes 7 subcases of oglconform's packed-vertex test.

v2: Add "gl" prefix to error messages (pointed out by Brian).
    Also rebase atop the ctx plumbing.

Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa/vbo: Support the ES 3.0 signed normalized scaling rules.
Kenneth Graunke [Thu, 22 Nov 2012 04:17:15 +0000 (20:17 -0800)]
mesa/vbo: Support the ES 3.0 signed normalized scaling rules.

Traditionally, OpenGL has had two separate equations for converting from
signed normalized fixed-point data to floating point data.  One was used
primarily for vertex data, while the other was primarily for texturing
and framebuffer data.

However, ES 3.0 and GL 4.2 change this, declaring there's only one
equation to be used in all cases.  Unfortunately, it's the other one.

v2: Correctly convert 0b10 to -1.0, as pointed out by Chris Forbes.

Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
11 years agomesa/vbo: Plumb ctx through to the conv_i(10|2)_to_norm_float functions.
Kenneth Graunke [Thu, 22 Nov 2012 04:15:22 +0000 (20:15 -0800)]
mesa/vbo: Plumb ctx through to the conv_i(10|2)_to_norm_float functions.

The rules for converting these values actually depend on the current
context API and version.  The next patch will implement those changes.

v2: Mark ctx as const, as suggested by Brian.

Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
11 years agomesa: Set transform feedback's default buffer mode to INTERLEAVED_ATTRIBS
Matt Turner [Mon, 26 Nov 2012 23:13:25 +0000 (15:13 -0800)]
mesa: Set transform feedback's default buffer mode to INTERLEAVED_ATTRIBS

Fixes part of es3conform's transform_feedback_init_defaults test.
NOTE: This is a candidate for the stable branch.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agomesa: Return 0 for XFB_VARYING_MAX_LENGTH if no varyings
Matt Turner [Fri, 23 Nov 2012 08:03:59 +0000 (00:03 -0800)]
mesa: Return 0 for XFB_VARYING_MAX_LENGTH if no varyings

v2: Perform this count the same way as elsewhere in this file, per
    Brian Paul's review.

Fixes part of es3conform's transform_feedback_init_defaults test.
NOTE: This is a candidate for the stable branches.
Reviewed-by: Brian Paul <brianp@vmware.com>
11 years agogallium/tests/trivial: updates for transfer functions changes
Andreas Boll [Wed, 21 Nov 2012 16:52:07 +0000 (17:52 +0100)]
gallium/tests/trivial: updates for transfer functions changes

Fixes build error with configure option --enable-gallium-tests
introduced in 369e46888904c6d379b8b477d9242cff1608e30e

Compile tested only.

Reviewed-by: Marek Olšák <maraeo@gmail.com>
11 years agogallium/tests/trivial: updates for CSO interface changes
Andreas Boll [Wed, 21 Nov 2012 14:37:58 +0000 (15:37 +0100)]
gallium/tests/trivial: updates for CSO interface changes

Fixes build error with configure option --enable-gallium-tests
introduced in ea6f035ae90895bd4ee3247408eb179dfdf96d22

Cc: Brian Paul <brianp@vmware.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
11 years agogallium/tests/trivial: updates for util_draw_vertex_buffer changes
Andreas Boll [Tue, 20 Nov 2012 20:04:25 +0000 (21:04 +0100)]
gallium/tests/trivial: updates for util_draw_vertex_buffer changes

Fixes build error with configure option --enable-gallium-tests
introduced in e73bf3b805de78299f1a652668ba4e6eab9bac94

Reviewed-by: Marek Olšák <maraeo@gmail.com>
11 years agoutil: Modified u_rect to default to memcpy.
James Benton [Wed, 11 Jul 2012 14:31:21 +0000 (15:31 +0100)]
util: Modified u_rect to default to memcpy.

Previously this function would assert if the format didn't fit an expected 4 channel format size.

Now will work with any format type with any amount of channels.

Signed-off-by: José Fonseca <jfonseca@vmware.com>
11 years agoutil/format: Fix bug in float to non-float conversion in u_format_pack.py.
James Benton [Thu, 13 Sep 2012 15:05:37 +0000 (16:05 +0100)]
util/format: Fix bug in float to non-float conversion in u_format_pack.py.

Signed-off-by: José Fonseca <jfonseca@vmware.com>
11 years agogallivm: Fix bug in lp_build_one which would incorrectly return a vector for length 1.
James Benton [Wed, 30 May 2012 13:36:44 +0000 (14:36 +0100)]
gallivm: Fix bug in lp_build_one which would incorrectly return a vector for length 1.

Signed-off-by: José Fonseca <jfonseca@vmware.com>
11 years agoglsl: Support unsigned integer constants in layout qualifiers.
Kenneth Graunke [Tue, 20 Nov 2012 06:36:28 +0000 (22:36 -0800)]
glsl: Support unsigned integer constants in layout qualifiers.

Fixes es3conform's explicit_attrib_location_integer_constants.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-and-tested-by: Matt Turner <mattst88@gmail.com>
11 years agoi965/fs: Move struct brw_compile (p) entirely inside fs_generator.
Kenneth Graunke [Wed, 21 Nov 2012 03:26:52 +0000 (19:26 -0800)]
i965/fs: Move struct brw_compile (p) entirely inside fs_generator.

The brw_compile structure contains the brw_instruction store and the
brw_eu_emit.c state tracking fields.  These are only useful for the
final assembly generation pass; the earlier compilation stages doesn't
need them.

This also means that the code generator for future hardware won't have
access to the brw_compile structure, which is extremely desirable
because it prevents accidental generation of Gen4-7 code.

v2: rzalloc p, as suggested by Eric.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Split final assembly code generation out of fs_visitor.
Kenneth Graunke [Fri, 9 Nov 2012 09:05:47 +0000 (01:05 -0800)]
i965/fs: Split final assembly code generation out of fs_visitor.

Compiling shaders requires several main steps:

   1. Generating FS IR from either GLSL IR or Mesa IR
   2. Optimizing the IR
   3. Register allocation
   4. Generating assembly code

This patch splits out step 4 into a separate class named "fs_generator."

There are several reasons for doing so:

   1. Future hardware has a different instruction encoding.  Splitting
      this out will allow us to replace fs_generator (which relies
      heavily on the brw_eu_emit.c code and struct brw_instruction) with
      a new code generator that writes the new format.

   2. It reduces the size of the fs_visitor monolith.  (Arguably, a lot
      more should be split out, but that's left for "future work.")

   3. Separate namespaces allow us to make helper functions for
      generating instructions in both classes: ADD() can exist in
      fs_visitor and create IR, while ADD() in fs_generator() can
      create brw_instructions.  (Patches for this upcoming.)

Furthermore, this patch changes the order of operations slightly.
Rather than doing steps 1-4 for SIMD8, then 1-4 for SIMD16, we now:

   - Do steps 1-3 for SIMD8, then repeat 1-3 for SIMD16
   - Generate final assembly code for both modes together

This is because the frontend work can be done independently, but final
assembly generation needs to pack both into a single program store to
feed the GPU.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Abort on unsupported opcodes rather than failing.
Kenneth Graunke [Wed, 21 Nov 2012 01:02:23 +0000 (17:02 -0800)]
i965/fs: Abort on unsupported opcodes rather than failing.

Final code generation should never fail.  This is a bug, and there
should be no user-triggerable cases where this could occur.

Also, we're not going to have a fail() method in a moment.

v2: Just abort() rather than assert, to cover the NDEBUG case
    (suggested by Eric).

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965: Make it possible to create a cfg_t without a backend_visitor.
Kenneth Graunke [Wed, 21 Nov 2012 01:30:46 +0000 (17:30 -0800)]
i965: Make it possible to create a cfg_t without a backend_visitor.

All we really need is a memory context and the instruction list; passing
a backend_visitor is just convenient at times.

This will be necessary two patches from now.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Move uses of brw_compile from do_wm_prog to brw_wm_fs_emit.
Kenneth Graunke [Wed, 21 Nov 2012 00:21:27 +0000 (16:21 -0800)]
i965/fs: Move uses of brw_compile from do_wm_prog to brw_wm_fs_emit.

The brw_compile structure is closely tied to the Gen4-7 hardware
encoding.  However, do_wm_prog is very generic: it just calls out to
get a compiled program and then uploads it.

This isn't ultimately where we want it, but it's a step in the right
direction: it's now closer to the code generator.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Pass the brw_context pointer into fs_visitor explicitly.
Kenneth Graunke [Tue, 20 Nov 2012 22:46:56 +0000 (14:46 -0800)]
i965/fs: Pass the brw_context pointer into fs_visitor explicitly.

We used to steal it out of the brw_compile struct...but fs_visitor
isn't going to have one of those in the future.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Move brw_wm_compile::fp to fs_visitor.
Kenneth Graunke [Tue, 20 Nov 2012 22:41:21 +0000 (14:41 -0800)]
i965/fs: Move brw_wm_compile::fp to fs_visitor.

Also change it from a brw_fragment_program to a gl_fragment_program,
since that seems to be what everything wants anyway.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Remove struct brw_shader * parameter to fs_visitor constructor.
Kenneth Graunke [Tue, 20 Nov 2012 22:26:49 +0000 (14:26 -0800)]
i965/fs: Remove struct brw_shader * parameter to fs_visitor constructor.

We can easily recover it from prog, and this makes it clear that we
aren't passing additional information in.

v2: Use an if-statement rather than the ?: operator (suggested by Eric).

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Move brw_wm_compile::dispatch_width into fs_visitor.
Kenneth Graunke [Tue, 20 Nov 2012 21:50:52 +0000 (13:50 -0800)]
i965/fs: Move brw_wm_compile::dispatch_width into fs_visitor.

Also, rather than having brw_wm_fs_emit poke at it directly, make it a
parameter to the fs_visitor constructor.

All other changes generated by search and replace (with occasional
whitespace fixup).

v2: Make dispatch_width const (as suggested by Paul); fix doxygen
    mistake (pointed out by Eric); update for rebase.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Move brw_wm_lookup_iz() to fs_visitor::setup_payload_gen4().
Kenneth Graunke [Mon, 19 Nov 2012 22:59:14 +0000 (14:59 -0800)]
i965/fs: Move brw_wm_lookup_iz() to fs_visitor::setup_payload_gen4().

This necessitates compiling brw_wm_iz.c as C++.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Move brw_wm_payload_setup() to fs_visitor::setup_payload_gen6()
Kenneth Graunke [Wed, 14 Nov 2012 03:36:18 +0000 (19:36 -0800)]
i965/fs: Move brw_wm_payload_setup() to fs_visitor::setup_payload_gen6()

Now that we only have the one backend, there's no real point in keeping
this separate.  Moving it should allow some future simplifications.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agoi965/fs: Remove brw_wm_compile::computes_depth field.
Kenneth Graunke [Tue, 20 Nov 2012 20:21:40 +0000 (12:21 -0800)]
i965/fs: Remove brw_wm_compile::computes_depth field.

Everybody determines this by checking if fp's OutputsWritten field
contains the FRAG_RESULT_DEPTH bit.  Rather than having payload setup
check this and set the computes_depth flag, we can just do the check in
the only place that actually used it: emit_fb_writes().

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
11 years agogallivm: use the new mip per quad handling in texture fetch path
Roland Scheidegger [Tue, 27 Nov 2012 02:30:55 +0000 (03:30 +0100)]
gallivm: use the new mip per quad handling in texture fetch path

No longer have to split fetching into quads dynamically if mip levels
are not the same for all quads (aos sampling still always splits due
to performance reasons).
Instead handle multiple mip levels further down, minification etc. takes
this into account.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agogallivm,llvmpipe: handle TXF (texelFetch) instruction, including offsets
Roland Scheidegger [Tue, 27 Nov 2012 02:26:49 +0000 (03:26 +0100)]
gallivm,llvmpipe: handle TXF (texelFetch) instruction, including offsets

This also adds some code to handle per-quad lods for more than 4-wide fetches,
because otherwise I'd have to integrate the texelFetch function into
the splitting stuff... (but it is not used yet outside texelFetch).
passes piglit fs-texelFetch-2D, fails fs-texelFetchOffset-2D due to I believe
a test error (results are undefined for out-of-bounds fetches, we return
whatever is at offset 0, whereas the test expects [0,0,0,1]).
Texel offsets are only handled by texelFetch for now, though the interface
can handle it for everything.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
11 years agoi965: Enable ARB_vertex_type_2_10_10_10_rev on Gen4+.
Chris Forbes [Thu, 22 Nov 2012 03:23:25 +0000 (16:23 +1300)]
i965: Enable ARB_vertex_type_2_10_10_10_rev on Gen4+.

v2 (Kayden): Move the enable into an existing intel->gen >= 4 block
(as suggested by Ian).

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
11 years agoi965: emit w/a for packed attribute formats in VS
Chris Forbes [Thu, 22 Nov 2012 03:23:24 +0000 (16:23 +1300)]
i965: emit w/a for packed attribute formats in VS

Implements BGRA swizzle, sign recovery, and normalization
as required by ARB_vertex_type_10_10_10_2_rev.

V2: Ported to the new VS backend, since that's all that's left;
fixed normalization.

V3: Moved fixups out of the GLSL-only path, so it works for FF/VP too.

V4 (Kayden): Rework ES3 normalization, don't heap allocate registers;
tidy comments.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>