mesa.git
8 years agovc4: Take precedence over ilo when in simulator mode.
Eric Anholt [Sat, 21 Nov 2015 20:52:48 +0000 (12:52 -0800)]
vc4: Take precedence over ilo when in simulator mode.

They're exclusive at build time, but the ilo entry is always present, so
we'd try to use it and fail out.

v2: Add comment in the code, from Emil.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
8 years agovc4: Just put USE_VC4_SIMULATOR in DEFINES.
Eric Anholt [Sat, 21 Nov 2015 21:07:42 +0000 (13:07 -0800)]
vc4: Just put USE_VC4_SIMULATOR in DEFINES.

In the pipe-loader reworks, it was missed in one of the new directories it
was used.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
8 years agomesa/teximage: Fix S3TC regression due to ASTC interaction
Nanley Chery [Wed, 28 Oct 2015 21:50:58 +0000 (14:50 -0700)]
mesa/teximage: Fix S3TC regression due to ASTC interaction

A prior, literal reading of the ASTC spec led to the prohibition
of some compressed formats being used against the targets:
TEXTURE_CUBE_MAP_ARRAY and TEXTURE_3D. Since the spec does not specify
interactions with other extensions for specific compressed textures,
remove such interactions.

Fixes the following Piglit tests on Gen9:
piglit.spec.arb_direct_state_access.getcompressedtextureimage
piglit.spec.arb_get_texture_sub_image.arb_get_texture_sub_image-getcompressed
piglit.spec.arb_texture_cube_map_array.fbo-generatemipmap-cubemap array s3tc_dxt1
piglit.spec.ext_texture_compression_s3tc.getteximage-targets cube_array s3tc

v2. Don't interact with other specific compressed formats (Ian).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91927
Suggested-by: Neil Roberts <neil@linux.intel.com>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agomesa/extensions: Enable overriding permanently enabled extensions
Nanley Chery [Sat, 21 Nov 2015 00:15:04 +0000 (16:15 -0800)]
mesa/extensions: Enable overriding permanently enabled extensions

Provide the ability to prevent any permanently enabled extension
from appearing in the string returned by glGetString[i]().

Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Brian Paul <brianp@vmware.com>
8 years agovirgl: pipe_virgl_create_screen is not static
Igor Gnatenko [Sun, 22 Nov 2015 09:12:09 +0000 (10:12 +0100)]
virgl: pipe_virgl_create_screen is not static

Cc: mesa-stable@lists.freedesktop.org
Fixes: 17d3a5f8579 "target-helpers: add a non-inline drm_helper.h"
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93063
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
8 years agoi965: Fix num_uniforms count for scalar GS.
Kenneth Graunke [Fri, 13 Nov 2015 21:29:16 +0000 (13:29 -0800)]
i965: Fix num_uniforms count for scalar GS.

I noticed that brw_vs.c does this.

I believe the point is that nir->num_uniforms is either counted in
scalar components (in scalar mode), or vec4 slots (in vector mode).
But we want param_count to be in scalar components regardless, so
we have to scale up in vector mode.

We don't have to scale up in scalar mode, though.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
8 years agovc4: Use nir_channel() to simplify all of our nir_swizzle() cases.
Eric Anholt [Sat, 21 Nov 2015 04:42:12 +0000 (20:42 -0800)]
vc4: Use nir_channel() to simplify all of our nir_swizzle() cases.

8 years agovc4: Fix point size lookup.
Eric Anholt [Sat, 21 Nov 2015 02:52:58 +0000 (18:52 -0800)]
vc4: Fix point size lookup.

I think I may have regressed this in the NIR conversion.  TGSI-to-NIR is
putting the PSIZ in the .x channel, not .w, so we were grabbing some
garbage for point size, which ended up meaning just not drawing points.

Fixes glean pointAtten and pointsprite.

8 years agopipe-loader: Fix PATH_MAX define on MSVC.
Jose Fonseca [Sat, 21 Nov 2015 23:03:20 +0000 (23:03 +0000)]
pipe-loader: Fix PATH_MAX define on MSVC.

8 years agoscons: Conditionally use DRM module on pipe-loader.
Jose Fonseca [Sat, 21 Nov 2015 21:19:57 +0000 (21:19 +0000)]
scons: Conditionally use DRM module on pipe-loader.

Fixes non Linux builds.

Trivial.

8 years agofreedreno/a4xx: disable blending and alphatest for integer rt0
Ilia Mirkin [Sat, 21 Nov 2015 06:27:01 +0000 (01:27 -0500)]
freedreno/a4xx: disable blending and alphatest for integer rt0

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
8 years agofreedreno/a4xx: fix independent blend
Ilia Mirkin [Sat, 21 Nov 2015 05:02:36 +0000 (00:02 -0500)]
freedreno/a4xx: fix independent blend

This fixes the ext_draw_buffers2 and arb_draw_buffers_blend tests.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
8 years agofreedreno/a4xx: enable ARB_base_instance support
Ilia Mirkin [Sat, 21 Nov 2015 03:55:28 +0000 (22:55 -0500)]
freedreno/a4xx: enable ARB_base_instance support

We already pass in start_instance in fd4_draw. Expose the extension.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: set fetchsize in mem2gmem texture restore
Ilia Mirkin [Sat, 21 Nov 2015 02:01:28 +0000 (21:01 -0500)]
freedreno/a4xx: set fetchsize in mem2gmem texture restore

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: add 11_11_10_float vertex type support
Ilia Mirkin [Sat, 21 Nov 2015 02:49:28 +0000 (21:49 -0500)]
freedreno/a4xx: add 11_11_10_float vertex type support

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: fix 3d texture setup
Ilia Mirkin [Sat, 21 Nov 2015 02:34:20 +0000 (21:34 -0500)]
freedreno/a4xx: fix 3d texture setup

Same fix as on a3xx - set the second (tiny) layer size bitfield to the
smallest level's size so that the hw knows not to minify beyond that.

This fixes texelFetch sampler3D piglits.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
8 years agofreedreno/a4xx: only align slices in non-layer_first textures
Ilia Mirkin [Sat, 21 Nov 2015 02:20:00 +0000 (21:20 -0500)]
freedreno/a4xx: only align slices in non-layer_first textures

When layer is the container, slices are tightly packed inside of each
layer. We don't need any additional alignment. On a3xx, each slice
contains all the layers, so having alignment makes sense.

This fixes a whole slew of array-related piglits, including texelFetch
and tex-miplevel-selection varieties.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
8 years agodocs: add 11.2.0-devel release notes template, bump version
Emil Velikov [Sat, 21 Nov 2015 14:10:08 +0000 (14:10 +0000)]
docs: add 11.2.0-devel release notes template, bump version

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoutil: use RTLD_LOCAL with util_dl_open()
Emil Velikov [Fri, 16 Oct 2015 19:34:52 +0000 (20:34 +0100)]
util: use RTLD_LOCAL with util_dl_open()

Otherwise we risk things blowing up due to conflicting symbols.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotargets/nine: remove unused static functions
Emil Velikov [Thu, 15 Oct 2015 18:29:00 +0000 (19:29 +0100)]
targets/nine: remove unused static functions

Dead code since commit 8f50614910c40366d94964fe2c5da5772aff2f96

Cc: Axel Davy <axel.davy@ens.fr>
Cc: Tiziano Bacocco <tizbac2@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotargets/nine: add note about messy header inclusion order
Emil Velikov [Wed, 14 Oct 2015 15:52:07 +0000 (16:52 +0100)]
targets/nine: add note about messy header inclusion order

Cc: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotargets/nine: add note about fd owndership
Emil Velikov [Wed, 14 Oct 2015 15:49:59 +0000 (16:49 +0100)]
targets/nine: add note about fd owndership

v2:
 - move autotools hunk into correct patch
 - correct the note based on Axel's feedback

Cc: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agoauxiliary/vl: Don't close the drm fd on failure
Emil Velikov [Wed, 14 Oct 2015 14:37:03 +0000 (15:37 +0100)]
auxiliary/vl: Don't close the drm fd on failure

Ported from an identically named commit in st/xa

commit 35cf3831d71770211f29da6608313dc1f6213d7b
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Thu Jul 3 02:07:36 2014 -0700

    st/xa: Don't close the drm fd on failure v2

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agost/dri: NULL check the pscreen earlier
Emil Velikov [Wed, 14 Oct 2015 23:46:26 +0000 (00:46 +0100)]
st/dri: NULL check the pscreen earlier

We delay the null check only to jump through hoops to work around that.
Check early to make our lives easier.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agost/dri: Don't close the drm fd on failure
Emil Velikov [Wed, 14 Oct 2015 23:45:13 +0000 (00:45 +0100)]
st/dri: Don't close the drm fd on failure

Ported from an identically named commit in st/xa

commit 35cf3831d71770211f29da6608313dc1f6213d7b
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Thu Jul 3 02:07:36 2014 -0700

    st/xa: Don't close the drm fd on failure v2

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotarget-helpers: remove inline_drm_helper.h
Emil Velikov [Thu, 19 Nov 2015 19:47:02 +0000 (19:47 +0000)]
target-helpers: remove inline_drm_helper.h

As of earlier all the targets use the non inline version. Don't forget
to remove the function prototypes/declarations.

v2: rebase on top of virgl support.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years ago{st,targets}/nine: use static/dynamic pipe-loader
Emil Velikov [Wed, 14 Oct 2015 15:47:04 +0000 (16:47 +0100)]
{st,targets}/nine: use static/dynamic pipe-loader

Analogous to previous commits.

v2: add the missing winsys libs linkage

Cc: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years ago{st,targets}/xa: use static/dynamic pipe-loader
Emil Velikov [Wed, 14 Oct 2015 23:43:52 +0000 (00:43 +0100)]
{st,targets}/xa: use static/dynamic pipe-loader

Analogous to previous commits.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years ago{auxiliary,targets}/vl: use static/dynamic pipe-loader
Emil Velikov [Fri, 20 Nov 2015 18:02:12 +0000 (18:02 +0000)]
{auxiliary,targets}/vl: use static/dynamic pipe-loader

Analogous to previous commit.

v2: rebase on top of vl_winsys_drm.c addition

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years ago{st,targets}/dri: use static/dynamic pipe-loader
Emil Velikov [Wed, 14 Oct 2015 22:48:15 +0000 (23:48 +0100)]
{st,targets}/dri: use static/dynamic pipe-loader

Covert DRI to use only the pipe-loader interface.

With drisw_create_screen and kms_swrast_create_screen replaced by their
pipe-loader equivalent, we can now drop them.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: add preliminary Android support
Emil Velikov [Wed, 14 Oct 2015 22:44:17 +0000 (23:44 +0100)]
pipe-loader: add preliminary Android support

Add a 'static' pipe-loader build, which will be used with follow-up
commits.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: add preliminary scons support
Emil Velikov [Wed, 14 Oct 2015 22:32:58 +0000 (23:32 +0100)]
pipe-loader: add preliminary scons support

Add a 'static' pipe-loader build, which will be used with follow-up
commits.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: don't mix code and variable declarations
Emil Velikov [Wed, 14 Oct 2015 17:11:11 +0000 (18:11 +0100)]
pipe-loader: don't mix code and variable declarations

We cannot use this C99 feature here quite yet, as the code needs to be
build with MSVC prior to 2013.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotarget-helpers: add a non-inline drm_helper.h
Emil Velikov [Sun, 11 Oct 2015 12:50:56 +0000 (13:50 +0100)]
target-helpers: add a non-inline drm_helper.h

Unlike the inline ones, here we'd want to have an extern definition of
the functions. This is required as with follow-up commits, we'll
gradually start using the static pipe-loader, with the latter needing
the symbols.

These are direct copy from the inline version.

v2:
 - rebase on top of virgl support
 - add "driver missing" printfs (Nicolai)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotarget-helpers: move the DRI specifics to the target
Emil Velikov [Wed, 7 Oct 2015 16:37:37 +0000 (17:37 +0100)]
target-helpers: move the DRI specifics to the target

Rather than having all targets include the file, with only some defining
the relevant guard macro, just move things where they are used.

v2: rebase on top of virgl support.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agoautomake: remove no longer needed HAVE_LOADER_GALLIUM conditional
Emil Velikov [Sat, 17 Oct 2015 20:14:09 +0000 (21:14 +0100)]
automake: remove no longer needed HAVE_LOADER_GALLIUM conditional

As of last few commits we have a static and dynamic pipe-loader. Either
of which will be used with (almost) all targets..

We can look into allowing the user to select which way the targets are
built, be that 'static for all' or 'per target' in follow up commits.
After which we can look into building only the static or dynamic
version, although building both shouldn't cause any issues.

Hack/workaround alert:
Control the standalone pipe-drivers via HAVE_CLOVER. Will need to be
fixed as the targets are converted/configure knobs are in.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: wire up the 'static' sw pipe-loader
Emil Velikov [Fri, 20 Nov 2015 17:19:54 +0000 (17:19 +0000)]
pipe-loader: wire up the 'static' sw pipe-loader

Analogous to previous commit with a small catch.

As the sw inline helpers are mere wrappers, and the screen <> winsys
split is more prominent (with the latter not being part of the final
pipe-driver), things will just work.

v2: rebase on top of earlier 'consolitate teardown' changes

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: wire up the 'static' drm pipe-loader
Emil Velikov [Wed, 14 Oct 2015 13:56:21 +0000 (14:56 +0100)]
pipe-loader: wire up the 'static' drm pipe-loader

Add a list of driver descriptors and select one from the list, during
probe time.

As we'll need to have all the driver pipe_foo_screen_create() functions
provided externally (i.e. from another static lib) we need a separate
(non-inline) drm_helper, which contains the function declarations.

v2: rebase on top of virgl support.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: add a dummy 'static' pipe-loader
Emil Velikov [Tue, 13 Oct 2015 17:07:11 +0000 (18:07 +0100)]
pipe-loader: add a dummy 'static' pipe-loader

It is to be used in contrast of the dynamic one. The state-tracker does
not need to know if the pipe-driver is built into the final blob or
a separate object. This will allow us to move the logic to the final
step (in target) where the appropriate pipe-loader will be chosen.

Cc: Tom Stellard <thomas.stellard@amd.com>
Cc: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agogallium: rename libpipe_loader to libpipe_loader_dynamic
Emil Velikov [Sat, 17 Oct 2015 21:06:17 +0000 (22:06 +0100)]
gallium: rename libpipe_loader to libpipe_loader_dynamic

With the next commits we'll introduce a 'static' version, which will
essentially load the statically linked-in pipe-drivers, rather than the
standalone pipe-$foo.so ones.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: dlopen/dlsym the pipe-driver at probe time
Emil Velikov [Sat, 17 Oct 2015 20:51:45 +0000 (21:51 +0100)]
pipe-loader: dlopen/dlsym the pipe-driver at probe time

Rather than giving false hopes that things might work, just check at
probe time. This allows us to remove the duplication and consolidate
the code wrt the upcomming static pipe-loader.

Cc: Tom Stellard <thomas.stellard@amd.com>
Cc: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: annotate the ops as const data
Emil Velikov [Wed, 14 Oct 2015 20:35:50 +0000 (21:35 +0100)]
pipe-loader: annotate the ops as const data

Already defined as such in struct pipe_loader_device::ops.

Cc: Tom Stellard <thomas.stellard@amd.com>
Cc: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: teardown the winsys, if create_screen fails
Emil Velikov [Sat, 17 Oct 2015 19:53:16 +0000 (20:53 +0100)]
pipe-loader: teardown the winsys, if create_screen fails

i.e. plug some (hard to hit) memory leaks.

v2: fix rebase fallout - really teardown the winsys (Brian)
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: rework the sw backend
Emil Velikov [Sat, 17 Oct 2015 20:51:24 +0000 (21:51 +0100)]
pipe-loader: rework the sw backend

Move the winsys into the pipe-target, similar to the hardware
pipe-driver.

v2:
 - move int declaration outside of loop (Brian)
 - fold the teardown into a goto + separate function.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agogallium: keep the libdrm link alongside libkmsdri.la
Emil Velikov [Sat, 17 Oct 2015 22:23:49 +0000 (23:23 +0100)]
gallium: keep the libdrm link alongside libkmsdri.la

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: directly use pipe_loader_sw_probe_null() at probe time
Emil Velikov [Wed, 14 Oct 2015 20:31:24 +0000 (21:31 +0100)]
pipe-loader: directly use pipe_loader_sw_probe_null() at probe time

Due to the nature of the other sw winsys' we cannot use them during the
generic probe stage. As such there is little point in keeping the
abstraction layer.

Cc: Tom Stellard <thomas.stellard@amd.com>
Cc: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: add pipe_loader_sw_probe_init_common() helper
Emil Velikov [Wed, 14 Oct 2015 18:35:51 +0000 (19:35 +0100)]
pipe-loader: add pipe_loader_sw_probe_init_common() helper

Allows us to fold the duplication in pipe_loader_sw_probe_*().

Cc: Tom Stellard <thomas.stellard@amd.com>
Cc: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agogallium/tests: remove unneeded include paths
Emil Velikov [Wed, 14 Oct 2015 15:16:52 +0000 (16:16 +0100)]
gallium/tests: remove unneeded include paths

The tests don't (and shouldn't) need to have anything driver and/or
winsys specific.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agogallium: remove library_path argument from pipe_loader_create_screen()
Emil Velikov [Wed, 14 Oct 2015 15:37:37 +0000 (16:37 +0100)]
gallium: remove library_path argument from pipe_loader_create_screen()

Currently the location is determined at configure/build time and
consistently copied across gallium. Just remove the extra argument, and
use PIPE_SEARCH_DIR where appropriate.

This will allow us to remove the duplication in the *configuration and
*screen_create APIs by moving util_dl_get_proc_address() and friends to
probe time.

v2: rebase on top of vl_winsys_drm.c addition

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotargets/nine: remove the custom pipe-driver path management
Emil Velikov [Wed, 14 Oct 2015 13:52:37 +0000 (14:52 +0100)]
targets/nine: remove the custom pipe-driver path management

Since the up-streaming of nine, the static target was used by default.
The dynamic pipe-drivers being available only via manual tweak of
configure.ac.

As we'll be removing the library_path argument from the pipe-loader with
follow-up commits, we can remove D3D9_DRIVERS_PATH/D3D9_DRIVERS_DIR.
Everyone doing local hacking on nine, or wishing to have a env override
can bring them back within the pipe-loader.

Cc: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: remove HAVE_DRM_LOADER_GALLIUM and HAVE_PIPE_LOADER_DRM
Emil Velikov [Wed, 14 Oct 2015 15:26:53 +0000 (16:26 +0100)]
pipe-loader: remove HAVE_DRM_LOADER_GALLIUM and HAVE_PIPE_LOADER_DRM

... in favour of HAVE_LIBDRM. After all we solely want to build the code
when the latter is available.

In the not too distant future we will remove the libudev/sysfs
dependency and simplify configure.ac even further.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: add pipe_loader_sw_probe_kms() implementation
Emil Velikov [Wed, 14 Oct 2015 15:24:55 +0000 (16:24 +0100)]
pipe-loader: add pipe_loader_sw_probe_kms() implementation

Will be used as a counterpart for target-helpers'
kms_swrast_create_screen().

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agoconfigure: use HAVE_DRISW_KMS when handling kms swrast
Emil Velikov [Sun, 11 Oct 2015 10:53:45 +0000 (11:53 +0100)]
configure: use HAVE_DRISW_KMS when handling kms swrast

Using HAVE_DRI2 to manage it seems counter-intuitive.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agotargets/nine: use the existing sw_screen_wrap() over our custom version
Emil Velikov [Tue, 6 Oct 2015 22:04:22 +0000 (23:04 +0100)]
targets/nine: use the existing sw_screen_wrap() over our custom version

Cc: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agoautomake: use GALLIUM_PIPE_LOADER_DEFINES only where applicable
Emil Velikov [Wed, 14 Oct 2015 15:23:50 +0000 (16:23 +0100)]
automake: use GALLIUM_PIPE_LOADER_DEFINES only where applicable

As of last commit we no longer need the defines in order to have the
function prototypes.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agopipe-loader: remove HAVE_PIPE_LOADER_foo function prototype guards
Emil Velikov [Wed, 14 Oct 2015 15:20:32 +0000 (16:20 +0100)]
pipe-loader: remove HAVE_PIPE_LOADER_foo function prototype guards

They serve little to no purpose, as we don't need any additional
dependencies (headers and/or symbols). On the other hand dropping them
will allow us to use GALLIUM_PIPE_LOADER_DEFINES in only one single
place - the pipe-loader.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agogallium/trace: remove useless NULL check from trace_screen_create()
Emil Velikov [Tue, 6 Oct 2015 21:25:47 +0000 (22:25 +0100)]
gallium/trace: remove useless NULL check from trace_screen_create()

Currently every target makes sure that the screen is non-null prior to
using the debug (trace including) wrappers. If that no longer holds true
we want to know and fix this ASAP rather than silently bailing out.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agoconfigure: remove obsolete _CLIENT comment
Emil Velikov [Wed, 7 Oct 2015 17:05:04 +0000 (18:05 +0100)]
configure: remove obsolete _CLIENT comment

The referenced variable(s) have been removed with commit abc20120e4a
(automake: pipe-loader: remove the 'client' pipe-loader)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
8 years agodocs: add news item and link release notes for 11.0.6
Emil Velikov [Sat, 21 Nov 2015 12:42:48 +0000 (12:42 +0000)]
docs: add news item and link release notes for 11.0.6

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
8 years agodocs: add sha256 checksums for 11.0.6
Emil Velikov [Sat, 21 Nov 2015 12:40:06 +0000 (12:40 +0000)]
docs: add sha256 checksums for 11.0.6

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 2555e000fc1771dd231207247b5d9dfec4600fe8)

8 years agodocs: add release notes for 11.0.6
Emil Velikov [Sat, 21 Nov 2015 11:38:20 +0000 (11:38 +0000)]
docs: add release notes for 11.0.6

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 04fd3a6f629b5098cc2a4da1f2392678349ecf56)

8 years agofreedreno/a4xx: add missing formats to enable ARB_vertex_type_2_10_10_10_rev
Ilia Mirkin [Sat, 21 Nov 2015 01:40:45 +0000 (20:40 -0500)]
freedreno/a4xx: add missing formats to enable ARB_vertex_type_2_10_10_10_rev

Same as commit 84d087aea but for a4xx. The RE'd enums had the same issue
too.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agoi965: Test that nonrepresentable floats cannot be converted to VF.
Matt Turner [Wed, 4 Nov 2015 22:38:27 +0000 (14:38 -0800)]
i965: Test that nonrepresentable floats cannot be converted to VF.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
8 years agoi965: Use ldexpf() in VF float test set up.
Matt Turner [Wed, 4 Nov 2015 22:31:59 +0000 (14:31 -0800)]
i965: Use ldexpf() in VF float test set up.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
8 years agoi965/vec4: Initialize nir_inputs with src_reg().
Matt Turner [Fri, 20 Nov 2015 05:48:47 +0000 (21:48 -0800)]
i965/vec4: Initialize nir_inputs with src_reg().

nir_locals, nir_ssa_values, and nir_system_values are all dst_reg (not
that that makes a whole lot of sense to me), and only nir_inputs is a
src_reg.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
8 years agoi965/fs: Add support for gl_HelperInvocation system value.
Matt Turner [Sat, 14 Nov 2015 01:51:12 +0000 (17:51 -0800)]
i965/fs: Add support for gl_HelperInvocation system value.

In most cases (when the negate is copy propagated and the MOV removed),
this is two instructions on Gen >= 8 and only two instructions on
earlier platforms -- and it doesn't use the flag register.

Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
8 years agoi965: Add brw_imm_uv().
Matt Turner [Mon, 16 Nov 2015 17:29:01 +0000 (09:29 -0800)]
i965: Add brw_imm_uv().

8 years agoi965: Don't bother setting regioning on immediates.
Matt Turner [Mon, 16 Nov 2015 17:28:02 +0000 (09:28 -0800)]
i965: Don't bother setting regioning on immediates.

The region fields are unioned with the immediate storage.

8 years agonir: Add support for gl_HelperInvocation system value.
Matt Turner [Sat, 14 Nov 2015 01:50:27 +0000 (17:50 -0800)]
nir: Add support for gl_HelperInvocation system value.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
8 years agofreedreno/a4xx: use hardware RGTC texture samplers
Ilia Mirkin [Fri, 20 Nov 2015 23:34:03 +0000 (18:34 -0500)]
freedreno/a4xx: use hardware RGTC texture samplers

a4xx hardware has real support for RGTC so there's no need to fake it
like we do on a3xx. Undo the hacks, and keep track of an "internal
format" of a resource, which on a3xx will be different, triggering the
transfer-time conversions to take place.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: hook up RGB565 format
Ilia Mirkin [Fri, 20 Nov 2015 22:43:11 +0000 (17:43 -0500)]
freedreno/a4xx: hook up RGB565 format

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: logic op handling
Ilia Mirkin [Fri, 20 Nov 2015 18:27:49 +0000 (13:27 -0500)]
freedreno/a4xx: logic op handling

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: add 16-bit unorm/snorm format texturing/rendering
Ilia Mirkin [Fri, 20 Nov 2015 15:40:59 +0000 (10:40 -0500)]
freedreno/a4xx: add 16-bit unorm/snorm format texturing/rendering

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: point regid to "red" even for alpha-only rb formats
Ilia Mirkin [Fri, 20 Nov 2015 23:11:26 +0000 (18:11 -0500)]
freedreno/a4xx: point regid to "red" even for alpha-only rb formats

Looks like a4xx hw does this in a more standard way and we don't need to
hack around it like we do on a3xx. Fixes GL_ALPHA formats in
fbo-blending-formats, fbo-colormask-formats, and fbo-alphatest-formats.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
8 years agottn: add TEX2 support
Ilia Mirkin [Fri, 20 Nov 2015 21:51:07 +0000 (16:51 -0500)]
ttn: add TEX2 support

This fixes CubeArrayShadow tests (where the shadow comes in via a second
arg to the TEX2 instruction).

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Cc: mesa-stable@lists.freedesktop.org
8 years agofreedreno: always set all border colors
Ilia Mirkin [Fri, 20 Nov 2015 22:04:05 +0000 (17:04 -0500)]
freedreno: always set all border colors

Instead of playing the guessing game as to which texture format reads
from which border color encoding type, just write both of them always.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agofreedreno/a4xx: fix dst_alpha blend for RGBX render targets
Ilia Mirkin [Fri, 20 Nov 2015 18:45:18 +0000 (13:45 -0500)]
freedreno/a4xx: fix dst_alpha blend for RGBX render targets

There are not native RGBX render formats, so we must manually force
dst_alpha to be one, same as for a3xx.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agoradeon: re-prepare query buffers on begin_query for predicate queries
Nicolai Hähnle [Fri, 20 Nov 2015 11:58:55 +0000 (12:58 +0100)]
radeon: re-prepare query buffers on begin_query for predicate queries

The point of prepare_buffer is to ensure that the query buffer contains valid
initial data for conditional rendering: as long as the buffer is initialized
correctly, the GPU is able to tell whether query results have been written
already (and wait or fall back to unconditional rendering if desired).

This means prepare_buffer needs to be called again when a buffer is reused.

Conversely, for queries that cannot be used for conditional rendering
(notably pipeline statistics), we can re-use buffers immediately, and they
do not need to be initialized.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Andy Furniss <adf.lists@gmail.com>
8 years agoradeon: reset query buffers for PIPE_QUERY_TIMESTAMP
Nicolai Hähnle [Fri, 20 Nov 2015 10:46:26 +0000 (11:46 +0100)]
radeon: reset query buffers for PIPE_QUERY_TIMESTAMP

Since begin_query is not called for this query type, we need to reset the
query buffer state in end_query instead.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93015
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Andy Furniss <adf.lists@gmail.com>
Tested-by: Mathias Tillman <master.homer@gmail.com>
8 years agomesa: update some old-style (K&R?) function pointer calls
Brian Paul [Fri, 20 Nov 2015 17:19:16 +0000 (10:19 -0700)]
mesa: update some old-style (K&R?) function pointer calls

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
8 years agodocs: mention GL 3.3 support for VMware driver in Mesa 11.1 relnotes
Brian Paul [Fri, 20 Nov 2015 21:05:55 +0000 (14:05 -0700)]
docs: mention GL 3.3 support for VMware driver in Mesa 11.1 relnotes

Signed-off-by: Brian Paul <brianp@vmware.com>
8 years agosvga: add num-bytes-uploaded HUD query
Brian Paul [Thu, 19 Nov 2015 17:39:49 +0000 (10:39 -0700)]
svga: add num-bytes-uploaded HUD query

To graph the number of bytes uploaded to GPU per frame (vertex buffer data,
constant buffer data, texture data, etc).

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
8 years agosvga: add some sanity check assertions in svga_buffer_transfer_map()
Brian Paul [Thu, 19 Nov 2015 17:39:09 +0000 (10:39 -0700)]
svga: add some sanity check assertions in svga_buffer_transfer_map()

Make sure y and z values of buffers are as expected.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
8 years agodocs: mark compile-time constant expressions as done
Timothy Arceri [Thu, 5 Nov 2015 11:17:36 +0000 (22:17 +1100)]
docs: mark compile-time constant expressions as done

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: add subroutine index qualifier support
Timothy Arceri [Sun, 8 Nov 2015 22:34:40 +0000 (09:34 +1100)]
glsl: add subroutine index qualifier support

ARB_explicit_uniform_location allows the index for subroutine functions
to be explicitly set in the shader.

This patch reduces the restriction on the index qualifier in
validate_layout_qualifiers() to allow it to be applied to subroutines
and adds the new subroutine qualifier validation to ast_function::hir().

ast_fully_specified_type::has_qualifiers() is updated to allow the
index qualifier on subroutine functions when explicit uniform locations
is available.

A new check is added to ast_type_qualifier::merge_qualifier() to stop
multiple function qualifiers from being defied, before this patch this
would cause a segfault.

Finally a new variable is added to ir_function_signature to store the
index. This value is validated and the non explicit values assigned in
link_assign_subroutine_types().

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
8 years agoglsl: add support for complie-time constant expressions
Timothy Arceri [Sat, 14 Nov 2015 04:13:28 +0000 (15:13 +1100)]
glsl: add support for complie-time constant expressions

This patch replaces the old interger constant qualifiers with either
the new ast_layout_expression type if the qualifier requires merging
or ast_expression if the qualifier can't have mulitple declarations
or if all but the newest qualifier is simply ignored.

We also update the process_qualifier_constant() helper to be
similar to the one in the ast_layout_expression class, but in
this case it will be used to process the ast_expression qualifiers.

Global shader layout qualifier validation is moved out of the parser
in this change as we now need to evaluate any constant expression
before doing the validation.

V2: Fix minimum value check for vertices (Emil)

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: add new type for compile time constants
Timothy Arceri [Sun, 8 Nov 2015 20:48:46 +0000 (07:48 +1100)]
glsl: add new type for compile time constants

In this patch we introduce a new ast type for holding the new
compile-time constant expressions. The main reason for this is that
we can no longer do merging of layout qualifiers before they have been
converted into GLSL IR so we need to store them to be proccessed later.

The new type has two helper functions:

- process_qualifier_constant()

 Used to merge and then evaluate qualifier expressions

- merge_qualifier()

 Simply appends a qualifier to a list to be merged later by
 process_qualifier_constant()

In order to avoid cascading error messages the process_qualifier_constant()
helpers return a bool

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: call set_shader_inout_layout() earlier
Timothy Arceri [Sat, 14 Nov 2015 03:05:30 +0000 (14:05 +1100)]
glsl: call set_shader_inout_layout() earlier

This will allow us to add error checking to this function
in a later patch, if we don't move it the error messages
will go missing.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: replace binding layout min boundary check
Timothy Arceri [Sat, 14 Nov 2015 13:42:44 +0000 (00:42 +1100)]
glsl: replace binding layout min boundary check

Use new helper that will in a later patch allow for
compile time constants.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: encapsulate binding validation and setting
Timothy Arceri [Sat, 14 Nov 2015 13:55:29 +0000 (00:55 +1100)]
glsl: encapsulate binding validation and setting

This change moves the binding layout handing code into an apply
function to be consistent with other helper functions in the ast
code, and to encapsulate the code so that when we introduce
compile time constants the code will be much cleaner.

One small downside is for unnamed interface blocks we will now
be revalidating the binding for each member its applied to.
However this seems a small sacrifice in order to have code which
is readable.

We also remove the incorrect comment in the named interface code
about propagating bindings to members which seems to have been
copied from the unnamed interface code.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: move stream layout max validation
Timothy Arceri [Sat, 14 Nov 2015 03:32:38 +0000 (14:32 +1100)]
glsl: move stream layout max validation

This validation is moved later so we can validate the
max value when compile time constant support is added in a
later patch.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: move stream layout qualifier validation
Timothy Arceri [Fri, 13 Nov 2015 07:47:55 +0000 (18:47 +1100)]
glsl: move stream layout qualifier validation

We are moving this out of the parser in preparation for compile
time constant support.

The reason a validation function is used rather than an apply
function like what is used with bindings is because glsl allows
streams to be defined on members of blocks even though they must
match the stream thats associated with the current block, this
means we need access to the value after validation to do this
comparision.

V2: Fix typo in comment (Emil)

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: replace index layout min boundary check
Timothy Arceri [Sat, 14 Nov 2015 02:09:46 +0000 (13:09 +1100)]
glsl: replace index layout min boundary check

Use new helper that will in a later patch allow for
compile time constants.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: remove duplicate validation for index layout qualifier
Timothy Arceri [Fri, 13 Nov 2015 04:16:20 +0000 (15:16 +1100)]
glsl: remove duplicate validation for index layout qualifier

The minimum value for index is validated in apply_explicit_location()
and we want to remove validation from the parser so we can add
compile time constant support.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: move location layout qualifier validation
Timothy Arceri [Fri, 13 Nov 2015 04:10:57 +0000 (15:10 +1100)]
glsl: move location layout qualifier validation

We are moving this out of the parser in preparation for compile
time constant support.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agoglsl: add process_qualifier_constant() helper
Timothy Arceri [Sat, 14 Nov 2015 01:22:49 +0000 (12:22 +1100)]
glsl: add process_qualifier_constant() helper

For now this just validates that a qualifier is inside its
minimum boundary, in a later patch we will expand it to
evaluate compile time constants.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
8 years agodocs: mark GL_AMD_performance_monitor for nv50
Samuel Pitoiset [Tue, 10 Nov 2015 00:08:28 +0000 (01:08 +0100)]
docs: mark GL_AMD_performance_monitor for nv50

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agonv50: expose two groups of compute-related MP perf counters
Samuel Pitoiset [Tue, 10 Nov 2015 00:40:00 +0000 (01:40 +0100)]
nv50: expose two groups of compute-related MP perf counters

This turns on GL_AMD_performance_monitor.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
8 years agoi965/gen9: Support fast clears for 32b float
Ben Widawsky [Wed, 14 Oct 2015 03:50:27 +0000 (20:50 -0700)]
i965/gen9: Support fast clears for 32b float

SKL supports the ability to do fast clears and resolves of 32b RGBA as both
integer and floats. This patch only enables float color clears because we
haven't yet enabled integer color clears, (HW support for that was added in
BDW).

v2: Remove LUMINANCE16F and INTENSITY16F special cases since they are now
handled by Neil's patch to disable MSAA fast clears.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Chad Versace <chad.versace@intel.com>
8 years agoRevert "i965/gen9: Enable rep clears on gen9"
Ben Widawsky [Wed, 14 Oct 2015 03:50:24 +0000 (20:50 -0700)]
Revert "i965/gen9: Enable rep clears on gen9"

This reverts commit 8a0c85b25853decb4a110b6d36d79c4f095d437b.

It's not a strict revert because I don't want to bring back the gen < 9 check at
this point in time.

Reviewed-by: Neil Roberts <neil@linux.intel.com>