mesa.git
10 years agoi965/fs: New peephole optimization to generate SEL.
Matt Turner [Wed, 23 Oct 2013 00:51:28 +0000 (17:51 -0700)]
i965/fs: New peephole optimization to generate SEL.

fs_visitor::try_replace_with_sel optimizes only if statements whose
"then" and "else" bodies contain a single MOV instruction. It also
could not handle constant arguments, since they cause an extra MOV
immediate to be generated (since we haven't run constant propagation,
there are more than the single MOV).

This peephole fixes both of these and operates as a normal optimization
pass.

fs_visitor::try_replace_with_sel is still arguably necessary, since it
runs before pull constant loads are lowered.

total instructions in shared programs: 1559129 -> 1545833 (-0.85%)
instructions in affected programs:     167120 -> 153824 (-7.96%)
GAINED:                                13
LOST:                                  6

Reviewed-by: Paul Berry <stereotype441@gmail.com>
10 years agoi965/fs: Add SEL() convenience function.
Matt Turner [Wed, 23 Oct 2013 02:04:14 +0000 (19:04 -0700)]
i965/fs: Add SEL() convenience function.

Reviewed-by: Paul Berry <stereotype441@gmail.com>
10 years agoglsl: Use fabs() on floating point values.
Matt Turner [Tue, 26 Nov 2013 06:18:28 +0000 (22:18 -0800)]
glsl: Use fabs() on floating point values.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoi965: Print conditional mod in dump_instruction().
Matt Turner [Sun, 20 Oct 2013 22:48:14 +0000 (15:48 -0700)]
i965: Print conditional mod in dump_instruction().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Externalize conditional_modifier for use in dump_instruction().
Matt Turner [Mon, 2 Dec 2013 21:15:45 +0000 (13:15 -0800)]
i965: Externalize conditional_modifier for use in dump_instruction().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Print argument types in dump_instruction().
Matt Turner [Mon, 2 Dec 2013 21:10:29 +0000 (13:10 -0800)]
i965: Print argument types in dump_instruction().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Externalize reg_encoding for use in dump_instruction().
Matt Turner [Mon, 2 Dec 2013 20:58:45 +0000 (12:58 -0800)]
i965: Externalize reg_encoding for use in dump_instruction().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/vec4: Don't print swizzles for immediate values.
Matt Turner [Mon, 2 Dec 2013 20:43:50 +0000 (12:43 -0800)]
i965/vec4: Don't print swizzles for immediate values.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/vec4: Print negate and absolute value for src args.
Matt Turner [Mon, 2 Dec 2013 20:41:16 +0000 (12:41 -0800)]
i965/vec4: Print negate and absolute value for src args.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/vec4: Add support for printing HW_REGs in dump_instruction().
Matt Turner [Tue, 26 Nov 2013 06:17:29 +0000 (22:17 -0800)]
i965/vec4: Add support for printing HW_REGs in dump_instruction().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/fs: Print ARF registers properly in dump_instruction().
Matt Turner [Mon, 25 Nov 2013 23:37:18 +0000 (15:37 -0800)]
i965/fs: Print ARF registers properly in dump_instruction().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Don't print extra (null) arguments in dump_instruction().
Matt Turner [Mon, 25 Nov 2013 23:15:25 +0000 (15:15 -0800)]
i965: Don't print extra (null) arguments in dump_instruction().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoglsl: Remove silly OR(..., 0x0) from ldexp() lowering.
Matt Turner [Wed, 27 Nov 2013 22:23:50 +0000 (14:23 -0800)]
glsl: Remove silly OR(..., 0x0) from ldexp() lowering.

I translated copysign(0.0f, x) a little too literally.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Allow commuting the operands of ADDC for const propagation.
Matt Turner [Thu, 28 Nov 2013 00:14:14 +0000 (16:14 -0800)]
i965: Allow commuting the operands of ADDC for const propagation.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/fs: Rename register_coalesce_2() -> register_coalesce().
Matt Turner [Sat, 30 Nov 2013 06:16:14 +0000 (22:16 -0800)]
i965/fs: Rename register_coalesce_2() -> register_coalesce().

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/fs: Remove now useless register_coalesce() pass.
Matt Turner [Sat, 30 Nov 2013 06:14:14 +0000 (22:14 -0800)]
i965/fs: Remove now useless register_coalesce() pass.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/fs: Let register_coalesce_2() eliminate self-moves.
Matt Turner [Fri, 29 Nov 2013 19:28:54 +0000 (11:28 -0800)]
i965/fs: Let register_coalesce_2() eliminate self-moves.

This is the last thing that register_coalesce() still handled.

total instructions in shared programs: 1561060 -> 1560908 (-0.01%)
instructions in affected programs:     15758 -> 15606 (-0.96%)

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Allow constant propagation into ASR and BFI1.
Matt Turner [Tue, 26 Nov 2013 21:49:31 +0000 (13:49 -0800)]
i965: Allow constant propagation into ASR and BFI1.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Document cur_* variables.
Matt Turner [Mon, 2 Dec 2013 18:29:49 +0000 (10:29 -0800)]
i965/cfg: Document cur_* variables.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Remove ip & cur from brw_cfg.
Matt Turner [Sun, 1 Dec 2013 04:38:48 +0000 (20:38 -0800)]
i965/cfg: Remove ip & cur from brw_cfg.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Clean up cfg_t constructors.
Matt Turner [Fri, 29 Nov 2013 07:24:44 +0000 (23:24 -0800)]
i965/cfg: Clean up cfg_t constructors.

parent_mem_ctx was unused since db47074a, so remove the two wrappers
around create() and make create() the constructor.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Throw out confusing make_list method.
Matt Turner [Tue, 26 Nov 2013 23:25:44 +0000 (15:25 -0800)]
i965/cfg: Throw out confusing make_list method.

make_list is just a one-line wrapper and was confusingly called by
NULL objects. E.g., cur_if == NULL; cur_if->make_list(mem_ctx).

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Include only needed headers.
Matt Turner [Sun, 1 Dec 2013 00:39:43 +0000 (16:39 -0800)]
i965/cfg: Include only needed headers.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Remove unnecessary endif_stack.
Matt Turner [Fri, 29 Nov 2013 07:39:02 +0000 (23:39 -0800)]
i965/cfg: Remove unnecessary endif_stack.

Unnecessary since last commit.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Rework to make IF & ELSE blocks flow into ENDIF.
Matt Turner [Fri, 29 Nov 2013 05:33:05 +0000 (21:33 -0800)]
i965/cfg: Rework to make IF & ELSE blocks flow into ENDIF.

Previously we made the basic block following an ENDIF instruction a
successor of the basic blocks ending with IF and ELSE. The PRM says that
IF and ELSE instructions jump *to* the ENDIF, rather than over it.

This should be immaterial to dataflow analysis, except for if, break,
endif sequences:

   START B1 <-B0 <-B9
0x00000100: cmp.g.f0(8)     null            g15<8,8,1>F     g4<0,1,0>F
0x00000110: (+f0) if(8) 0 0                 null            0x00000000UD
   END B1 ->B2 ->B4
   START B2 <-B1
   break
0x00000120: break(8) 0 0                    null            0D
   END B2 ->B10
   START B3
0x00000130: endif(8) 2                      null            0x00000002UD
   END B3 ->B4

The ENDIF block would have no parents, so dataflow analysis would
generate incorrect results, preventing copy propagation from eliminating
some instructions.

This patch changes the CFG to make ENDIF start rather than end basic
blocks, so that it can be the jump target of the IF and ELSE
instructions.

It helps three programs (including two fs8/fs16 pairs).

total instructions in shared programs: 1561126 -> 1561060 (-0.00%)
instructions in affected programs:     837 -> 771 (-7.89%)

More importantly, it allows copy propagation to handle more cases.
Disabling the register_coalesce() pass before this patch hurts 58
programs, while afterward it only hurts 11 programs.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Keep pointers to IF/ELSE/ENDIF instructions in the cfg.
Matt Turner [Wed, 30 Oct 2013 23:51:32 +0000 (16:51 -0700)]
i965/cfg: Keep pointers to IF/ELSE/ENDIF instructions in the cfg.

Useful for finding the associated control flow instructions, given a
block ending in one.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/cfg: Add code to dump blocks and cfg.
Matt Turner [Thu, 28 Nov 2013 19:03:14 +0000 (11:03 -0800)]
i965/cfg: Add code to dump blocks and cfg.

Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agomesa: Remove GL_MESA_texture_array cruft from gl.h
Ian Romanick [Wed, 20 Nov 2013 21:52:18 +0000 (13:52 -0800)]
mesa: Remove GL_MESA_texture_array cruft from gl.h

glext.h has had all the necessary bits for years.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: Remove support for GL_MESA_texture_array
Ian Romanick [Wed, 20 Nov 2013 21:48:36 +0000 (13:48 -0800)]
mesa: Remove support for GL_MESA_texture_array

This extension enabled the use of texture array with fixed-function and
assembly fragment shaders.  No applications are known to use this
extension.

NOTE: This patch regresses GL_TEXTURE_1D_ARRAY and GL_TEXTURE_2D_ARRAY
cases of the copyteximage piglit test.  The test is incorrectly using
texture arrays with fixed function while only requiring the
GL_EXT_texture_array extension.  A fix for the test has been posted to
the piglit mailing list.

http://lists.freedesktop.org/archives/piglit/2013-November/008639.html

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: Use a single enable for GL_EXT_texture_array and GL_MESA_texture_array
Ian Romanick [Wed, 20 Nov 2013 21:41:23 +0000 (13:41 -0800)]
mesa: Use a single enable for GL_EXT_texture_array and GL_MESA_texture_array

Every driver that enables one also enables the other.  The difference
between the two is MESA adds support for fixed-function and assembly
fragment shaders, but EXT only adds support for GLSL.  The MESA
extension was created back when Mesa did not support GLSL.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: Minor clean-up of target_enum_to_index
Ian Romanick [Wed, 20 Nov 2013 21:05:35 +0000 (13:05 -0800)]
mesa: Minor clean-up of target_enum_to_index

Constify the gl_context parameter, and remove suffixes from enums that
have non-suffix versions.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: Silence GCC warning in count_tex_size
Ian Romanick [Wed, 20 Nov 2013 20:59:22 +0000 (12:59 -0800)]
mesa: Silence GCC warning in count_tex_size

main/texobj.c: In function 'count_tex_size':
main/texobj.c:886:23: warning: unused parameter 'key' [-Wunused-parameter]

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: Silence GCC warning in _mesa_test_texobj_completeness
Ian Romanick [Wed, 20 Nov 2013 20:58:37 +0000 (12:58 -0800)]
mesa: Silence GCC warning in _mesa_test_texobj_completeness

main/texobj.c: In function '_mesa_test_texobj_completeness':
main/texobj.c:553:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
main/texobj.c:553:193: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
main/texobj.c:553:254: warning: signed and unsigned type in conditional expression [-Wsign-compare]
main/texobj.c:553:148: warning: signed and unsigned type in conditional expression [-Wsign-compare]

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: Add missing API check for GL_TEXTURE_3D
Ian Romanick [Sat, 23 Nov 2013 20:13:50 +0000 (12:13 -0800)]
mesa: Add missing API check for GL_TEXTURE_3D

There are no 3D textures in OpenGL ES 1.x.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: Add missing checks for GL_TEXTURE_CUBE_MAP_ARRAY
Ian Romanick [Wed, 20 Nov 2013 21:22:05 +0000 (13:22 -0800)]
mesa: Add missing checks for GL_TEXTURE_CUBE_MAP_ARRAY

That enum requires GL_ARB_texture_cube_map_array, and it is only
available on desktop GL.  It looks like this has been an un-noticed
issue since GL_ARB_texture_cube_map_array support was added in commit
e0e7e295.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agowayland: Add an extension to create wl_buffers from EGLImages
Neil Roberts [Mon, 28 Oct 2013 15:07:03 +0000 (15:07 +0000)]
wayland: Add an extension to create wl_buffers from EGLImages

This adds an extension called EGL_WL_create_wayland_buffer_from_image
which adds the following single function:

struct wl_buffer *
eglCreateWaylandBufferFromImageWL(EGLDisplay dpy, EGLImageKHR image);

The function creates a wl_buffer which shares its contents with the given
EGLImage. The expected use case for this is in a nested Wayland compositor
which is using subsurfaces to present buffers from its clients. Using this
extension it can attach the client buffers directly to the subsurface without
having to blit the contents into an intermediate buffer. The compositing can
then be done in the parent compositor.

The extension is only implemented in the Wayland EGL platform because of
course it wouldn't make sense anywhere else.

10 years agoegl/wayland: Damage INT32_MAX x INT32_MAX region for eglSwapBuffers
Kristian Høgsberg [Thu, 5 Dec 2013 00:13:35 +0000 (16:13 -0800)]
egl/wayland: Damage INT32_MAX x INT32_MAX region for eglSwapBuffers

If we're not using EGL_EXT_swap_buffers_with_damage, we have to
damage the full extent.  EGL operates on buffer coordinates, but
wl_surface.damage takes surface coordinates.  EGL doesn't know the
buffer transformation (rotated or scaled) and can't post accurate
damage in surface coordinates.  The damage event however is clipped to
the surface extents so we can just damage the maximum rectangle.

In case of EGL_EXT_swap_buffers_with_damage, the application knows
the buffer transform and is expected to pass in rectangles in
surface space.

https://bugs.freedesktop.org/show_bug.cgi?id=70250
Cc: "10.0" mesa-stable@lists.freedesktop.org
10 years agoEnable throttling in SwapBuffers
Axel Davy [Tue, 3 Dec 2013 16:04:10 +0000 (17:04 +0100)]
Enable throttling in SwapBuffers

flush_with_flags, when available, allows the driver to throttle.
Using this suppress input lag issues that can be observed in heavy
rendering situations on non-intel cards.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
Cc: "10.0" mesa-stable@lists.freedesktop.org
10 years agoegl/wayland: Send commit after flushing the driver context
Kristian Høgsberg [Wed, 4 Dec 2013 20:08:35 +0000 (12:08 -0800)]
egl/wayland: Send commit after flushing the driver context

This typically won't make a difference, since we only send the requests at
wl_display_flush() time.  There might be a small race
with another thread calling wl_display_flush() after our commit request,
but before we flush the DRI driver.  Moving the commit below the DRI
driver flush call looks more natural and eliminates the small race.

Cc: "10.0" mesa-stable@lists.freedesktop.org
10 years agoegl/wayland: Flush the wl_display at the end of SwapBuffers
Axel Davy [Tue, 3 Dec 2013 16:38:09 +0000 (17:38 +0100)]
egl/wayland: Flush the wl_display at the end of SwapBuffers

We would like the compositor to receive the commited buffer
as soon as possible, so it has the time to treat it, and
release old ones. We shouldn't rely on the client
to flush the queue for us.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
Cc: "10.0" mesa-stable@lists.freedesktop.org
10 years agomesa: reduce memory used for short display lists
Brian Paul [Sun, 24 Nov 2013 14:04:33 +0000 (07:04 -0700)]
mesa: reduce memory used for short display lists

Display lists allocate memory in chunks of 256 tokens (1KB) at a time.
If an app creates many short display lists or uses glXUseXFont() this
can waste quite a bit of memory.

This patch uses realloc() to trim short lists and reduce the memory
used.

Also, null/zero-out some list construction fields in _mesa_EndList().

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agomesa: update/remove display list comments
Brian Paul [Wed, 4 Dec 2013 16:45:38 +0000 (09:45 -0700)]
mesa: update/remove display list comments

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agomesa: remove gl_dlist_node::next pointer to reduce dlist memory use
Brian Paul [Wed, 4 Dec 2013 16:45:38 +0000 (09:45 -0700)]
mesa: remove gl_dlist_node::next pointer to reduce dlist memory use

Now, sizeof(gl_dlist_node)==4 even on 64-bit systems.  This can
halve the memory used by some display lists on 64-bit systems.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agomesa: begin reducing memory used by display lists
Brian Paul [Wed, 4 Dec 2013 16:45:38 +0000 (09:45 -0700)]
mesa: begin reducing memory used by display lists

This is a first step in reducing memory used by display lists on
64-bit systems.  On 64-bit systems, the gl_dlist_node union type
is 8 bytes because of the 'data' and 'next' fields.  This causes
every display list node/token to occupy 8 bytes instead of 4 as
originally designed.  This basically doubles the memory used by
some display lists on 64-bit systems.

The fix is to remove the 64-bit 'data' and 'next' pointer fields
from the union and instead store them as a pair of 32-bit values.
Easily done with a few helper functions.

The next patch will take care of the 'next' field.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agonouveau: Add lots of comments to the buffer transfer logic
Ilia Mirkin [Mon, 2 Dec 2013 02:13:17 +0000 (21:13 -0500)]
nouveau: Add lots of comments to the buffer transfer logic

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
10 years agonv50: wait on the buf's fence before sticking it into pushbuf
Ilia Mirkin [Thu, 28 Nov 2013 21:23:15 +0000 (16:23 -0500)]
nv50: wait on the buf's fence before sticking it into pushbuf

This resolves some rendering issues in source games.
See https://bugs.freedesktop.org/show_bug.cgi?id=64323

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "9.2 10.0" <mesa-stable@lists.freedesktop.org>
10 years agonouveau: avoid leaking fences while waiting
Ilia Mirkin [Fri, 29 Nov 2013 23:49:44 +0000 (18:49 -0500)]
nouveau: avoid leaking fences while waiting

This fixes a memory leak in some situations. Also avoids emitting an
extra fence if the kick handler does the call to nouveau_fence_next
itself.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "9.2 10.0" <mesa-stable@lists.freedesktop.org>
10 years agonv50: fix a small leak on context destroy
Ilia Mirkin [Fri, 29 Nov 2013 09:36:41 +0000 (04:36 -0500)]
nv50: fix a small leak on context destroy

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
10 years agodocs: put MD5 sums in 9.2.4 relnotes file
Brian Paul [Wed, 4 Dec 2013 14:47:05 +0000 (07:47 -0700)]
docs: put MD5 sums in 9.2.4 relnotes file

Signed-off-by: Brian Paul <brianp@vmware.com>
10 years agodocs: use --disable-dri3 for VMware guest driver build
Brian Paul [Wed, 4 Dec 2013 14:39:59 +0000 (07:39 -0700)]
docs: use --disable-dri3 for VMware guest driver build

For the time being at least.  Suggested by Adrian Rangel.

Signed-off-by: Brian Paul <brianp@vmware.com>
10 years agomesa: modified _mesa_align_free() to accept NULL pointer
Siavash Eliasi [Wed, 4 Dec 2013 04:50:00 +0000 (21:50 -0700)]
mesa: modified _mesa_align_free() to accept NULL pointer

So that it acts like ordinary free().  This lets us remove a bunch of
if statements where the function is called.

v2:
- Avoiding compile error on MSVC and possible warnings on other compilers.
- Added comment regards passing NULL pointer being safe.

Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agomesa: don't leak performance monitors on context destroy
Ilia Mirkin [Fri, 29 Nov 2013 10:52:27 +0000 (05:52 -0500)]
mesa: don't leak performance monitors on context destroy

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "10.0" <mesa-stable@lists.freedesktop.org>
10 years agonv50: Fix GPU_READING/WRITING bit removal
Ilia Mirkin [Mon, 2 Dec 2013 04:13:56 +0000 (23:13 -0500)]
nv50: Fix GPU_READING/WRITING bit removal

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
CC: "9.1, 9.2, 10.0" <mesa-stable@lists.freedesktop.org>
10 years agopipe-loader: Fix llvmpipe.la path
Michel Dänzer [Wed, 4 Dec 2013 02:56:10 +0000 (11:56 +0900)]
pipe-loader: Fix llvmpipe.la path

Fixes

 make[3]: *** No rule to make target `.../src/gallium/drivers/softpipe/libllvmpipe.la', needed by `pipe_swrast.la'.  Stop.

10 years agoi965: Fix BRW_BATCH_STRUCT to specify RENDER_RING, not UNKNOWN_RING.
Kenneth Graunke [Wed, 27 Nov 2013 00:32:15 +0000 (16:32 -0800)]
i965: Fix BRW_BATCH_STRUCT to specify RENDER_RING, not UNKNOWN_RING.

I missed this in the boolean -> enum conversion.  C cheerfully casts
false -> 0 -> UNKNOWN_RING.  On Gen4-5, this causes the render ring
prelude hook to get called in the middle of the batch, which is crazy.

BRW_BATCH_STRUCT is not used on Gen6+.

Fixes regressions since 395a32717df494353703f3581edcd3ba380f16d6
("i965: Introduce an UNKNOWN_RING state.").

Fixes "fips -v glxgears" on Ironlake.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoRevert "i965: Move brw_emit_query_begin() to the render ring prelude."
Kenneth Graunke [Wed, 27 Nov 2013 00:32:14 +0000 (16:32 -0800)]
Revert "i965: Move brw_emit_query_begin() to the render ring prelude."

This reverts commit a4bf7f6b6e612626c4e4fc21507ac213a7ba4b00.
It breaks occlusion queries on Gen4-5.  Doing this right will likely
require larger changes, which should be done at a future date.

Some Piglit tests still passed due to other bugs; fixing those revealed
this problem.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Fix OACONTROL assertion failures on Ironlake.
Kenneth Graunke [Wed, 27 Nov 2013 00:32:13 +0000 (16:32 -0800)]
i965: Fix OACONTROL assertion failures on Ironlake.

I guarded half of the callers to start/stop_oa_counters with generation
checks, but missed the other half (which were added later).  OACONTROL
doesn't exist on Ironlake, so we better not write it.  Also, there's no
need---Ironlake's performance counters are always running.

This patch moves the generation checks into start/stop_oa_counters,
rather than requiring the caller to do them.

Fixes assertion failures in Piglit's AMD_performance_monitor/measure.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agogallium/radeon: use PRIu64 macro for printing uint64_t
Emil Velikov [Sat, 30 Nov 2013 19:53:53 +0000 (19:53 +0000)]
gallium/radeon: use PRIu64 macro for printing uint64_t

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agopipe-loader: build llvmpipe on top of softpipe
Emil Velikov [Sun, 17 Nov 2013 20:07:33 +0000 (20:07 +0000)]
pipe-loader: build llvmpipe on top of softpipe

One can select if they want to fallback to softpipe.
Current approach makes this not possible, whereas other
targets (dri-swrast) handle this approapriately.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agomesa: resolve typo DTXn/DXTn
Emil Velikov [Sun, 17 Nov 2013 17:06:23 +0000 (17:06 +0000)]
mesa: resolve typo DTXn/DXTn

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agoautomake: include only one copy VERSION in tarball
Emil Velikov [Mon, 2 Dec 2013 19:42:51 +0000 (19:42 +0000)]
automake: include only one copy VERSION in tarball

The VERSION file is tracked by git (git ls-files), thus
adding it to EXTRA_FILES will result in a duplicate copy
within the final tarball.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72230
Cc: "10.0" <mesa-stable@lists.freedesktop.org>
Reported-by: Patrick Steinhardt <ps@pks.im>
Tested-by: Patrick Steinhardt <ps@pks.im>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
10 years agoglx: Add missing null check in gxl/dri2_glx.c
Juha-Pekka Heikkila [Mon, 2 Dec 2013 14:30:00 +0000 (07:30 -0700)]
glx: Add missing null check in gxl/dri2_glx.c

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoglx: Check malloc return value before accessing memory in glx/clientattrib.c
Juha-Pekka Heikkila [Mon, 2 Dec 2013 09:39:00 +0000 (02:39 -0700)]
glx: Check malloc return value before accessing memory in glx/clientattrib.c

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
10 years agoi965: Add extra-alignment for non-msrt fast color clear for all hw (v2)
Chad Versace [Tue, 3 Dec 2013 18:28:41 +0000 (10:28 -0800)]
i965: Add extra-alignment for non-msrt fast color clear for all hw (v2)

The BSpec states that the aligment for the non-msrt clear rectangle must
be doubled; the BSpec does not restricit the workaround to specific
hardware.

Commit 9a1a67b applied the workaround to Haswell GT3.  Commit 8b659ce
expanded the workaround to all Haswell variants. This commit expands it
to all hardware.

No Piglit regressions on Ivybridge 0x0166. No fixes either.

I know no Ivybridge nor Baytrail bug related to this workaround.
However, the BSpec says the extra alignment is required, so let's do it.

v2: Apply to all hardware, not just gen7.

CC: "9.2, 10.0" <mesa-stable@lists.freedesktop.org>
CC: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
10 years agoconfigure.ac: require libdrm_radeon 2.4.50
Marek Olšák [Tue, 3 Dec 2013 19:06:58 +0000 (20:06 +0100)]
configure.ac: require libdrm_radeon 2.4.50

10 years agost/mesa: implement layered framebuffer clear for the clear_with_quad fallback
Marek Olšák [Thu, 21 Nov 2013 14:50:31 +0000 (15:50 +0100)]
st/mesa: implement layered framebuffer clear for the clear_with_quad fallback

Same approach as in u_blitter.

10 years agogallium/util: implement layered framebuffer clear in u_blitter
Marek Olšák [Thu, 21 Nov 2013 14:41:36 +0000 (15:41 +0100)]
gallium/util: implement layered framebuffer clear in u_blitter

All bound layers (from first_layer to last_layer) should be cleared.

This uses a vertex shader which outputs gl_Layer = gl_InstanceID, so each
instance goes to a different layer. By rendering a quad and setting
the instance count to the number of layers, it will trivially clear all
layers.

This requires AMD_vertex_shader_layer (or PIPE_CAP_TGSI_VS_LAYER), which only
radeonsi supports at the moment. r600 could do this too. Standard DX11
hardware will have to use a geometry shader though, which has higher overhead.

10 years agogallium: add support for AMD_vertex_shader_layer
Marek Olšák [Thu, 21 Nov 2013 14:25:55 +0000 (15:25 +0100)]
gallium: add support for AMD_vertex_shader_layer

10 years agoradeonsi: add driver support for layered rendering and AMD_vertex_shader_layer
Marek Olšák [Thu, 21 Nov 2013 14:21:38 +0000 (15:21 +0100)]
radeonsi: add driver support for layered rendering and AMD_vertex_shader_layer

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
10 years agoradeonsi: implement OpenGL edge flags
Marek Olšák [Tue, 19 Nov 2013 21:07:30 +0000 (22:07 +0100)]
radeonsi: implement OpenGL edge flags

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
10 years agost/mesa: add support for layered framebuffers and consolidate code
Marek Olšák [Thu, 21 Nov 2013 14:31:32 +0000 (15:31 +0100)]
st/mesa: add support for layered framebuffers and consolidate code

This is a subset of geometry shaders. It's all about setting first_layer and
last_layer correctly.

Also some code between st_render_texture and update_framebuffer_state is
consolidated. It doesn't use rtt_level and derives the level from dimensions
instead as the code in st_atom_framebuffer.c did.

10 years agomesa: expose AMD_vertex_shader_layer in the core profile only
Marek Olšák [Thu, 21 Nov 2013 14:26:25 +0000 (15:26 +0100)]
mesa: expose AMD_vertex_shader_layer in the core profile only

It needs glFramebufferTexture, which isn't available in the compatibility
profile.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoegl: add HAVE_LIBDRM define, fix EGL X11 platform
Tapani Pälli [Sun, 1 Dec 2013 09:53:55 +0000 (11:53 +0200)]
egl: add HAVE_LIBDRM define, fix EGL X11 platform

Commit a594cec broke EGL X11 backend by adding dependency between
X11 and DRM backends requiring HAVE_EGL_PLATFORM_DRM defined for X11.

This patch fixes the issue by adding additional define for libdrm
detection independent of which backend is being compiled. Tested by
compiling Mesa with '--with-egl-platforms=x11' and running es2gears_x11
+ glbenchmark2.7 successfully.

v2: return true for dri2_auth if running without libdrm (Samuel)
v3: check libdrm when building EGL drm platform + AM_CFLAGS fix (Emil)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72062
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: mesa-stable@lists.freedesktop.org
10 years agofreedreno: Add a few texture formats
Andreas Heider [Mon, 4 Nov 2013 10:51:21 +0000 (11:51 +0100)]
freedreno: Add a few texture formats

10 years agoi965: Skip the register write check on Broadwell.
Kenneth Graunke [Mon, 4 Nov 2013 22:09:07 +0000 (14:09 -0800)]
i965: Skip the register write check on Broadwell.

MI_STORE_REGISTER_MEM has to take a 48-bit address, so the existing code
doesn't work.  But supposedly Broadwell has a register whitelist and
just works out of the box anyway, so there's no need to check.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Fix texture border color on Broadwell.
Kenneth Graunke [Tue, 22 Jan 2013 20:20:31 +0000 (12:20 -0800)]
i965: Fix texture border color on Broadwell.

The Gen7 sampler state code still works.  Increasing the alignment to
64 bytes makes bit 5 zero, which is good because it's now reserved.

Since we don't use the new filter bits, we can leave those as zero too,
which means we don't need to update the code to update the pointer.
(We probably should anyway, for clarity, but alas, another day.)

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Don't use MACH for integer multiplies on Gen8+.
Kenneth Graunke [Sun, 20 Jan 2013 16:58:14 +0000 (08:58 -0800)]
i965: Don't use MACH for integer multiplies on Gen8+.

The documentation is really hard to follow, but apparently a 32-bit x
32-bit multiply just works without the MACH macro.  The macro apparently
is only necessary to get the full 64-bit value.

Fixes Piglit tests [vf]s-op-mult-int-int.shader_test.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Fix texture swizzling on Broadwell.
Kenneth Graunke [Tue, 15 Jan 2013 05:43:28 +0000 (21:43 -0800)]
i965: Fix texture swizzling on Broadwell.

Like Haswell, we do this in SURFACE_STATE rather than shader
workarounds.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965: Set vertical alignment unit to 4 on Broadwell.
Kenneth Graunke [Sat, 15 Dec 2012 09:14:03 +0000 (01:14 -0800)]
i965: Set vertical alignment unit to 4 on Broadwell.

Broadwell doesn't support a surface vertical alignment of 2.  It only
supports VALIGN_4, VALIGN_8, or VALIGN_16.  I chose 4 since it's the
least wasteful.

v2: Replace my comment with a better one from Eric.  Move Broadwell
    checks earlier so it's more obvious that "return 2" won't be hit.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoi965/vs: Always store pull constant offsets in GRFs on Gen8.
Kenneth Graunke [Sun, 16 Dec 2012 08:02:43 +0000 (00:02 -0800)]
i965/vs: Always store pull constant offsets in GRFs on Gen8.

We need to SEND from a GRF, and we can only obtain those prior to
register allocation.

This allows us to do pull constant loads without the MRF hack.

v2: Reword comments (suggested by Paul).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
10 years agoi965/vs: Don't copy propagate into SEND-from-GRF messages.
Kenneth Graunke [Sun, 16 Dec 2012 08:40:30 +0000 (00:40 -0800)]
i965/vs: Don't copy propagate into SEND-from-GRF messages.

SEND can't deal with swizzles, source modifiers, and so on.  This should
avoid problems with VS pull constant loads on Broadwell.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
10 years agoclover: Fix missing minus sign in 'iterator_adaptor::operator-='.
Francisco Jerez [Wed, 27 Nov 2013 06:27:52 +0000 (22:27 -0800)]
clover: Fix missing minus sign in 'iterator_adaptor::operator-='.

The method is currently unused, this probably doesn't fix anything at
this point.

10 years agoi965/hsw: Apply non-msrt fast color clear w/a to all HSW GTs
Chad Versace [Wed, 27 Nov 2013 01:04:24 +0000 (17:04 -0800)]
i965/hsw: Apply non-msrt fast color clear w/a to all HSW GTs

Pre-patch, the workaround was applied to only HSW GT3. However, the
workaround also fixes render corruption on the HSW GT1 Chromebook,
codenamed Falco.

Also, update the BSpec quote that discusses the workaround to reflect
the latest BSpec.

The BSpec states that the workaround is required for Ivybridge and
Baytrail as well as Haswell. But, we apply the workaround to only
Haswell because (a) we suspect that is the only hardware where it is
actually required and (b) we haven't yet validated the workaround for
the other hardware.

CC: "9.2, 10.0" <mesa-stable@lists.freedesktop.org>
CC: Anuj Phogat <anuj.phogat@gmail.com>
OTC-Tracker: CHRMOS-812
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
10 years agoglsl: Simplify the built-in function linking code.
Kenneth Graunke [Sat, 23 Nov 2013 20:11:34 +0000 (12:11 -0800)]
glsl: Simplify the built-in function linking code.

Previously, we stored an array of up to 16 additional shaders to link,
as well as a count of how many each shader actually needed.

Since the built-in functions rewrite, all the built-ins are stored in a
single shader.  So all we need is a boolean indicating whether a shader
needs to link against built-ins or not.

During linking, we can avoid creating the temporary array if none of the
shaders being linked need built-ins.  Otherwise, it's simply a copy of
the array that has one additional element.  This is much simpler.

This patch saves approximately 128 bytes of memory per gl_shader object.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoglsl: Create an accessor for the built-in function shader.
Kenneth Graunke [Sat, 23 Nov 2013 18:58:51 +0000 (10:58 -0800)]
glsl: Create an accessor for the built-in function shader.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoglsl: Drop crazy looping from no_matching_function_error().
Kenneth Graunke [Sat, 23 Nov 2013 20:06:24 +0000 (12:06 -0800)]
glsl: Drop crazy looping from no_matching_function_error().

Since the built-in functions rewrite, num_builtins_to_link is always either
0 or 1, so we don't need tho crazy loop starting at -1 with a special
case.

All we need to do is print the prototypes from the current shader, and
the single built-in function shader (if present).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoglsl: Merge "candidates are: " message to the previous line.
Kenneth Graunke [Sat, 23 Nov 2013 19:55:03 +0000 (11:55 -0800)]
glsl: Merge "candidates are: " message to the previous line.

Previously, when we hit a "no matching function" error, it looked like:

0:0(0): error: no matching function for call to `cos()'
0:0(0): error: candidates are: float cos(float)
0:0(0): error:                vec2 cos(vec2)
0:0(0): error:                vec3 cos(vec3)
0:0(0): error:                vec4 cos(vec4)

Now it looks like:

0:0(0): error: no matching function for call to `cos()'; candidates are:
0:0(0): error:    float cos(float)
0:0(0): error:    vec2 cos(vec2)
0:0(0): error:    vec3 cos(vec3)
0:0(0): error:    vec4 cos(vec4)

This is not really any worse and removes the need for the prefix variable.
It will also help with the next commit's refactoring.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoglsl: Drop unused call_ir parameter from generate_call().
Kenneth Graunke [Sat, 23 Nov 2013 18:39:34 +0000 (10:39 -0800)]
glsl: Drop unused call_ir parameter from generate_call().

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoglsl: Remove useless iteration through function parameters.
Kenneth Graunke [Fri, 22 Nov 2013 11:38:26 +0000 (03:38 -0800)]
glsl: Remove useless iteration through function parameters.

There's no need to loop through the "parameters" list and remove every
element; move_nodes_to(&parameters) already throws away all elements of
the destination list.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoFix 'make check' in src/mapi/glapi/tests when builddir != srcdir
Jon TURNEY [Fri, 8 Nov 2013 13:22:54 +0000 (13:22 +0000)]
Fix 'make check' in src/mapi/glapi/tests when builddir != srcdir

make[5]: Entering directory `/jhbuild/build/mesa/mesa/src/mapi/glapi/tests'
  CXX      check_table.o
/jhbuild/checkout/mesa/mesa/src/mapi/glapi/tests/check_table.cpp:29:30: fatal error: glapi/glapitable.h: No such file or directory

We should look for the generated file glapi/glapitable.h in builddir, not srcdir

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
10 years agodocs: Import 10.0 release notes, add news item
Ian Romanick [Sun, 1 Dec 2013 07:41:14 +0000 (23:41 -0800)]
docs: Import 10.0 release notes, add news item

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agoi965/gen6: Fix multisample resolve blits for luminance/intensity 32F formats.
Paul Berry [Wed, 27 Nov 2013 15:43:03 +0000 (07:43 -0800)]
i965/gen6: Fix multisample resolve blits for luminance/intensity 32F formats.

On gen6, multisamble resolve blits use the SAMPLE message to blend
together the 4 samples for each texel.  For some reason, SAMPLE
doesn't blend together the proper samples when the source format is
L32_FLOAT or I32_FLOAT, resulting in blocky artifacts.

To work around this problem, sample from the source surface using
R32_FLOAT.  This shouldn't affect rendering correctness, because when
doing these resolve blits, the destination format is R32_FLOAT, so the
channel replication done by L32_FLOAT and I32_FLOAT is unnecessary.

Fixes piglit tests on Sandy Bridge:
- spec/ARB_texture_float/multisample-formats 2 GL_ARB_texture_float
- spec/ARB_texture_float/multisample-formats 4 GL_ARB_texture_float

No piglit regressions on Sandy Bridge.

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

Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoglsl: Remove unused field loop_variable_state::loop.
Paul Berry [Wed, 27 Nov 2013 18:53:33 +0000 (10:53 -0800)]
glsl: Remove unused field loop_variable_state::loop.

This field was neither initialized nor used.  It was just dead memory.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoglsl: Improve documentation of ir_loop counter/control fields.
Paul Berry [Wed, 27 Nov 2013 19:39:51 +0000 (11:39 -0800)]
glsl: Improve documentation of ir_loop counter/control fields.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoglsl: In ir_validate, check that ir_loop::counter always refers to a new var.
Paul Berry [Wed, 27 Nov 2013 18:12:53 +0000 (10:12 -0800)]
glsl: In ir_validate, check that ir_loop::counter always refers to a new var.

The compiler back-ends (i965's fs_visitor and brw_visitor,
ir_to_mesa_visitor, and glsl_to_tgsi_visitor) have been assuming this
for some time.  Thanks to the preceding patch, the compiler front-end
no longer breaks this assumption.

This patch adds code to validate the assumption so that if we have
future bugs, we'll be able to catch them earlier.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoglsl: Fix inconsistent assumptions about ir_loop::counter.
Paul Berry [Tue, 26 Nov 2013 22:19:49 +0000 (14:19 -0800)]
glsl: Fix inconsistent assumptions about ir_loop::counter.

The compiler back-ends (i965's fs_visitor and brw_visitor,
ir_to_mesa_visitor, and glsl_to_tgsi_visitor) assume that when
ir_loop::counter is non-null, it points to a fresh ir_variable that
should be used as the loop counter (as opposed to an ir_variable that
exists elsewhere in the instruction stream).

However, previous to this patch:

(1) loop_control_visitor did not create a new variable for
    ir_loop::counter; instead it re-used the existing ir_variable.
    This caused the loop counter to be double-incremented (once
    explicitly by the body of the loop, and once implicitly by
    ir_loop::increment).

(2) ir_clone did not clone ir_loop::counter properly, resulting in the
    cloned ir_loop pointing to the source ir_loop's counter.

(3) ir_hierarchical_visitor did not visit ir_loop::counter, resulting
    in the ir_variable being missed by reparenting.

Additionally, most optimization passes (e.g. loop unrolling) assume
that the variable mentioned by ir_loop::counter is not accessed in the
body of the loop (an assumption which (1) violates).

The combination of these factors caused a perfect storm in which the
code worked properly nearly all of the time: for loops that got
unrolled, (1) would introduce a double-increment, but loop unrolling
would fail to notice it (since it assumes that ir_loop::counter is not
accessed in the body of the loop), so it would unroll the loop the
correct number of times.  For loops that didn't get unrolled, (1)
would introduce a double-increment, but then later when the IR was
cloned for linking, (2) would prevent the loop counter from being
cloned properly, so it would look to further analysis stages like an
independent variable (and hence the double-increment would stop
occurring).  At the end of linking, (3) would prevent the loop counter
from being reparented, so it would still belong to the shader object
rather than the linked program object.  Provided that the client
program didn't delete the shader object, the memory would never get
reclaimed, and so the shader would function properly.

However, for loops that didn't get unrolled, if the client program did
delete the shader object, and the memory belonging to the loop counter
got re-used, this could cause a use-after-free bug, leading to a
crash.

This patch fixes loop_control_visitor, ir_clone, and
ir_hierarchical_visitor to treat ir_loop::counter the same way the
back-ends treat it: as a freshly allocated ir_variable that needs to
be visited and cloned independently of other ir_variables.

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

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agoglsl: Teach ir_variable_refcount about ir_loop::counter variables.
Paul Berry [Tue, 26 Nov 2013 22:37:57 +0000 (14:37 -0800)]
glsl: Teach ir_variable_refcount about ir_loop::counter variables.

If an ir_loop has a non-null "counter" field, the variable referred to
by this field is implicitly read and written by the loop.  We need to
account for this in ir_variable_refcount, otherwise there is a danger
we will try to dead-code-eliminate the loop counter variable.

Note: at the moment the dead code elimination bug doesn't occur due to
a bug in ir_hierarchical_visitor: it doesn't visit the "counter"
field, so dead code elimination doesn't treat it as a candidate for
elimination.  But the patch to follow will fix that bug, so we need to
fix ir_variable_refcount first in order to avoid breaking dead code
elimination.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
10 years agomesa: fix mem leak of glPixelMap data in display list
Brian Paul [Fri, 29 Nov 2013 13:40:35 +0000 (06:40 -0700)]
mesa: fix mem leak of glPixelMap data in display list

And simplify save_PixelMapfv() by using the memdup() function.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agomesa: added memory-related comment in save_error()
Brian Paul [Fri, 29 Nov 2013 13:40:35 +0000 (06:40 -0700)]
mesa: added memory-related comment in save_error()

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
10 years agomesa: fix flags assignment in save_WaitSync()
Brian Paul [Fri, 29 Nov 2013 13:40:35 +0000 (06:40 -0700)]
mesa: fix flags assignment in save_WaitSync()

The flags value is a bitfield so use the union's 'bf' field, not 'e'
(enum) field.  There's no actual change in behavior here since both
fields of the union are the same size.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>