mesa.git
9 years agoauxiliary/vl/drm: fd management cleanups
Emil Velikov [Mon, 23 Nov 2015 20:26:58 +0000 (20:26 +0000)]
auxiliary/vl/drm: fd management cleanups

Analogous to previous commit.

Spotted by Coverity (CID 1339868)

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
9 years agost/xa: fd management cleanups
Emil Velikov [Mon, 23 Nov 2015 20:26:57 +0000 (20:26 +0000)]
st/xa: fd management cleanups

Analogous to previous commit.

Spotted by Coverity (CID 1339866)

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
9 years agost/dri: fd management cleanups
Emil Velikov [Mon, 23 Nov 2015 20:26:56 +0000 (20:26 +0000)]
st/dri: fd management cleanups

Add some checks if the original/dup'd fd is valid and ensure that we
don't leak it on error. The former is implicitly handled within the
pipe_loader, although let's make things explicit and check beforehand.

Spotted by Coverity (CID 1339865)

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
9 years agopipe-loader: check if winsys.name is non-null prior to strcmp
Emil Velikov [Mon, 23 Nov 2015 20:26:55 +0000 (20:26 +0000)]
pipe-loader: check if winsys.name is non-null prior to strcmp

In theory this wouldn't be an issue, as we'll find the correct name and
break out of the loop before we hit the sentinel.

Let's fix this and avoid issues in the future.

Spotted by Coverity (CID 133986913398701339871)

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
9 years agost/va: add missing break statement
Emil Velikov [Sun, 29 Nov 2015 11:48:26 +0000 (11:48 +0000)]
st/va: add missing break statement

Earlier commit factored out the mpeg4 IQ matrix handling into separate
function, although it forgot to add a break in its case statement.
Thus the data ended up partially overwritten as the mpeg4 and h265
structs are members of the desc union.

Spotted by Coverity (CID 1341052)

Fixes: 64761a841db "st/va: move MPEG4 functions into separate file"
Cc: Julien Isorce <j.isorce@samsung.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
9 years agomesa: support GL_RED/GL_RG in ES2 contexts when driver support exists
Ilia Mirkin [Thu, 26 Nov 2015 15:32:57 +0000 (10:32 -0500)]
mesa: support GL_RED/GL_RG in ES2 contexts when driver support exists

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93126
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
9 years agoradeon: only suspend queries on flush if they haven't been suspended yet
Nicolai Hähnle [Fri, 27 Nov 2015 23:02:26 +0000 (00:02 +0100)]
radeon: only suspend queries on flush if they haven't been suspended yet

Non-timer queries are suspended during blits. When the blits end, the queries
are resumed, but this resume operation itself might run out of CS space and
trigger a flush. When this happens, we must prevent a duplicate suspend during
preflush suspend, and we must also prevent a duplicate resume when the CS flush
returns back to the original resume operation.

This fixes a regression that was introduced by:

commit 8a125afa6e88a3eeddba8c7fdc1a75c9b99d5489
Author: Nicolai Hähnle <nhaehnle@gmail.com>
Date:   Wed Nov 18 18:40:22 2015 +0100

    radeon: ensure that timing/profiling queries are suspended on flush

    The queries_suspended_for_flush flag is redundant because suspended queries
    are not removed from their respective linked list.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reported-by: Axel Davy <axel.davy@ens.fr>
Cc: "11.1" <mesa-stable@lists.freedesktop.org>
Tested-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoscons: Use LD version script for libgl-xlib.
Jose Fonseca [Thu, 26 Nov 2015 15:06:35 +0000 (15:06 +0000)]
scons: Use LD version script for libgl-xlib.

Trivial.

9 years agosvga: Don't return value from void function.
Jose Fonseca [Wed, 25 Nov 2015 13:34:18 +0000 (13:34 +0000)]
svga: Don't return value from void function.

Addresses MSVC warning C4098: 'svga_destroy_query' : 'void' function
returning a value.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
9 years agogallium: Make pipe_query_result::batch array length non-zero.
Jose Fonseca [Wed, 25 Nov 2015 13:33:08 +0000 (13:33 +0000)]
gallium: Make pipe_query_result::batch array length non-zero.

Zero length arrays are non standard:

   warning C4200: nonstandard extension used : zero-sized array in struct/union
   Cannot generate copy-ctor or copy-assignment operator when UDT contains a zero-sized array

And all code does `N * sizeof query_result->batch[0]`, so it should work
exactly the same.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
9 years agoutil: Tiny optimisation for the linear→srgb conversion
Neil Roberts [Thu, 26 Nov 2015 16:53:42 +0000 (17:53 +0100)]
util: Tiny optimisation for the linear→srgb conversion

When converting 0.0 it would be nice if it didn't do any arithmetic.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
9 years agodocs: Update GL3.txt to add ARB_internalformat_query2
Eduardo Lima Mitev [Thu, 26 Nov 2015 20:57:40 +0000 (21:57 +0100)]
docs: Update GL3.txt to add ARB_internalformat_query2

Added to OpenGL 4.3 section, tagged as 'in progress (elima)'. See
https://bugs.freedesktop.org/show_bug.cgi?id=92687.

Thanks to Thomas H.P. Andersen for remainding me about this.

v1: - Update the already existing entry in section 4.3
      instead (Ilia Mirkin).
    - Added my BZ nickname as contact person (Felix Schwarz).

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
9 years agoglsl: don't generate extra errors in ValidateProgramPipeline
Timothy Arceri [Thu, 26 Nov 2015 10:32:48 +0000 (21:32 +1100)]
glsl: don't generate extra errors in ValidateProgramPipeline

From Section 11.1.3.11 (Validation) of the GLES 3.1 spec:

   "An INVALID_OPERATION error is generated by any command that trans-
   fers vertices to the GL or launches compute work if the current set
   of active program objects cannot be executed, for reasons including:"

It then goes on to list the rules we validate in the
_mesa_validate_program_pipeline() function.

For ValidateProgramPipeline the only mention of generating an error is:

   "An INVALID_OPERATION error is generated if pipeline is not a name re-
   turned from a previous call to GenProgramPipelines or if such a name has
   since been deleted by DeleteProgramPipelines,"

Which we handle separately.

This fixes:
ES31-CTS.sepshaderobjs.PipelineApi

No regressions on the eEQP 3.1 tests.

Cc: Gregory Hainaut <gregory.hainaut@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
9 years agofreedreno/ir3: assign varying locations later
Rob Clark [Thu, 26 Nov 2015 17:26:53 +0000 (12:26 -0500)]
freedreno/ir3: assign varying locations later

Rather than assigning inloc up front, when we don't yet know if it will
be unused, assign it last thing before the legalize pass.

Also, realize when inputs are unused (since for frag shader's we can't
rely on them being removed from ir->inputs[]).  This doesn't make sense
if we don't also dynamically assign the inloc's, since we could end up
telling the hw the wrong # of varyings (since we currently assume that
the # of varyings and max-inloc are related..)

Signed-off-by: Rob Clark <robclark@freedesktop.org>
9 years agofreedreno/ir3: use instr flag to mark unused instructions
Rob Clark [Thu, 26 Nov 2015 17:25:18 +0000 (12:25 -0500)]
freedreno/ir3: use instr flag to mark unused instructions

Rather than magic depth value, which won't be available in later stages.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
9 years agofreedreno/a4xx: rework vinterp/vpsrepl
Rob Clark [Thu, 26 Nov 2015 17:21:21 +0000 (12:21 -0500)]
freedreno/a4xx: rework vinterp/vpsrepl

Same as previous commit, for a4xx.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
9 years agofreedreno/a3xx: rework vinterp/vpsrepl
Rob Clark [Thu, 26 Nov 2015 17:18:14 +0000 (12:18 -0500)]
freedreno/a3xx: rework vinterp/vpsrepl

Make the interpolation / point-sprite replacement mode setup deal with
varying packing.

In a later commit, we switch to packing just the varying components that
are actually used by the frag shader, so we won't be able to assume
everything is vec4's aligned to vec4.  Which would highly confuse the
previous vinterp/vpsrepl logic.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
9 years agoclover: fix tgsi compiler crash with invalid src
Serge Martin [Mon, 26 Oct 2015 15:53:00 +0000 (16:53 +0100)]
clover: fix tgsi compiler crash with invalid src

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
9 years agoi965/gen9+: Switch thread scratch space to non-coherent stateless access.
Francisco Jerez [Mon, 23 Nov 2015 17:18:26 +0000 (19:18 +0200)]
i965/gen9+: Switch thread scratch space to non-coherent stateless access.

The thread scratch space is thread-local so using the full IA-coherent
stateless surface index (255 since Gen8) is unnecessary and
potentially expensive.  On Gen8 and early steppings of Gen9 this is
not a functional change because the kernel already sets bit 4 of
HDC_CHICKEN0 which overrides all HDC memory access to be non-coherent
in order to workaround a hardware bug.

This happens to fix a full system hang when running any spilling code
on a pre-production SKL GT4e machine I have on my desk (forcing all
HDC access to non-coherent from the kernel up to stepping F0 might be
a good idea though regardless of this patch), and improves performance
of the OglPSBump2 SynMark benchmark run with INTEL_DEBUG=spill_fs by
33% (11 runs, 5% significance) on a production SKL GT2 (on which HDC
IA-coherency is apparently functional so it wouldn't make sense to
disable globally).

Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
9 years agoi965/fs: Don't use Gen7-style scratch block reads on Gen9+.
Francisco Jerez [Wed, 25 Nov 2015 19:02:15 +0000 (21:02 +0200)]
i965/fs: Don't use Gen7-style scratch block reads on Gen9+.

Unfortunately Gen7 scratch block reads and writes seem to be hardwired
to BTI 255 even on Gen9+ where that index causes the dataport to do an
IA-coherent read or write.  This change is required for the next patch
to be correct, since otherwise we would be writing to the scratch
space using non-coherent access and then reading it back using
IA-coherent reads, which wouldn't be guaranteed to return the value
previously written to the same location without introducing an
additional HDC flush in between.

Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
9 years agoi965: Add symbolic defines for some magic dataport surface indices.
Francisco Jerez [Mon, 23 Nov 2015 17:15:26 +0000 (19:15 +0200)]
i965: Add symbolic defines for some magic dataport surface indices.

Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
9 years agoradeon: use PIPE_DRIVER_QUERY_FLAG_DONT_LIST for perfcounters
Nicolai Hähnle [Thu, 19 Nov 2015 11:14:03 +0000 (12:14 +0100)]
radeon: use PIPE_DRIVER_QUERY_FLAG_DONT_LIST for perfcounters

Since the query names are not very enlightening, and there are thousands
of them, GALLIUM_HUD=help should only show the first and last query name
for each hardware block.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agogallium: add PIPE_DRIVER_QUERY_FLAG_DONT_LIST
Nicolai Hähnle [Thu, 19 Nov 2015 11:13:43 +0000 (12:13 +0100)]
gallium: add PIPE_DRIVER_QUERY_FLAG_DONT_LIST

This allows the driver to give a hint to the HUD so that GALLIUM_HUD=help is
less spammy.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeon: delay the generation of driver query names until first use
Nicolai Hähnle [Wed, 25 Nov 2015 11:32:23 +0000 (12:32 +0100)]
radeon: delay the generation of driver query names until first use

This shaves a bit more time off the startup of programs that don't
actually use performance counters.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agost/va: add missing profiles in PipeToProfile's switch.
Julien Isorce [Thu, 26 Nov 2015 08:21:45 +0000 (08:21 +0000)]
st/va: add missing profiles in PipeToProfile's switch.

Otherwise assert is raised from vlVaQueryConfigProfiles's for loop.

Signed-off-by: Julien Isorce <j.isorce@samsung.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
9 years agomesa: remove ARB_geometry_shader4
Marta Lofstedt [Wed, 25 Nov 2015 11:16:02 +0000 (12:16 +0100)]
mesa: remove ARB_geometry_shader4

No drivers currently implement ARB_geometry_shader4, nor are there
any plans to implement it.  We only support the version of geometry
shaders that was incorporated into OpenGL 3.2 / GLSL 1.50.

Signed-off-by: Marta Lofstedt <marta.lofstedt@linux.intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
9 years agomesa: error out in indirect draw when vertex bindings mismatch
Tapani Pälli [Fri, 13 Nov 2015 09:13:05 +0000 (11:13 +0200)]
mesa: error out in indirect draw when vertex bindings mismatch

Patch adds additional mask for tracking which vertex arrays have
associated vertex buffer binding set. This array can be directly
compared to which vertex arrays are enabled and should match when
drawing.

Fixes following CTS tests:

   ES31-CTS.draw_indirect.negative-noVBO-arrays
   ES31-CTS.draw_indirect.negative-noVBO-elements

v2: update mask in vertex_array_attrib_binding
v3: rename mask and make it track _BoundArrays which matches what
    was actually originally wanted (Fredrik Höglund)
v4: code cleanup, check for GLES 3.1 (Fredrik Höglund)

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Fredrik Höglund <fredrik@kde.org>
9 years agotargets/xvmc: use the non-inline sw helpers
Michel Dänzer [Thu, 26 Nov 2015 03:14:28 +0000 (12:14 +0900)]
targets/xvmc: use the non-inline sw helpers

This was missed in commit 59cfb21d ("targets: use the non-inline sw
helpers").

Fixes build failure:

  CXXLD    libXvMCgallium.la
../../../../src/gallium/auxiliary/pipe-loader/.libs/libpipe_loader_static.a(libpipe_loader_static_la-pipe_loader_sw.o):(.data.rel.ro+0x0): undefined reference to `sw_screen_create'
collect2: error: ld returned 1 exit status
Makefile:756: recipe for target 'libXvMCgallium.la' failed
make[3]: *** [libXvMCgallium.la] Error 1

Trivial.

9 years agotargets/nine: remove freedreno target
Emil Velikov [Mon, 23 Nov 2015 18:36:44 +0000 (18:36 +0000)]
targets/nine: remove freedreno target

Analogous to previous commit. As we no longer have anyone who uses NIR
we can drop the link.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
9 years agotargets/nine: remove vc4 target
Emil Velikov [Mon, 23 Nov 2015 18:36:43 +0000 (18:36 +0000)]
targets/nine: remove vc4 target

There are no users for it.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
9 years agogallium: remove unused function declarations
Emil Velikov [Sun, 22 Nov 2015 22:45:38 +0000 (22:45 +0000)]
gallium: remove unused function declarations

Unused as of commit 23fb11455b4 "{st,targets}/dri: use static/dynamic
pipe-loader"

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
9 years agotargets: use the non-inline sw helpers
Emil Velikov [Mon, 23 Nov 2015 15:28:55 +0000 (15:28 +0000)]
targets: use the non-inline sw helpers

Previously (with the inline ones) things were embedded into the
pipe-loader, which means that we cannot control/select what we want in
each target.

That also meant that at runtime we ended up with the empty
sw_screen_create() as the GALLIUM_SOFTPIPE/LLVMPIPE were not set.

v2: Cover all the targets, not just dri.

Cc: "11.1" <mesa-stable@lists.freedesktop.org>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Oded Gabbay <oded.gabbay@gmail.com>
Tested-by: Nick Sarnie <commendsarnex@gmail.com>
9 years agotarget-hepers: add non inline sw helpers
Emil Velikov [Mon, 23 Nov 2015 11:26:39 +0000 (11:26 +0000)]
target-hepers: add non inline sw helpers

Feeling rather dirty copying the inline ones, yet we need the inline
ones for swrast only targets like libgl-xlib, osmesa.

Cc: "11.1" <mesa-stable@lists.freedesktop.org>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Oded Gabbay <oded.gabbay@gmail.com>
Tested-by: Nick Sarnie <commendsarnex@gmail.com>
9 years agopipe-loader: fix off-by one error
Emil Velikov [Mon, 23 Nov 2015 21:37:51 +0000 (21:37 +0000)]
pipe-loader: fix off-by one error

With earlier commit we've dropped the manual iteration over the fixed
size array and prepemtively set the variable storing the size, that is
to be returned. Yet we forgot to adjust the comparison, as before we
were comparing the index, now we're comparing the size.

Fixes: ff9cd8a67ca "pipe-loader: directly use
pipe_loader_sw_probe_null() at probe time"
Cc: mesa-stable@lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93091
Reported-by: Tom Stellard <thomas.stellard@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
9 years agonir: include what we want/need
Emil Velikov [Tue, 24 Nov 2015 15:33:45 +0000 (15:33 +0000)]
nir: include what we want/need

Swap core.h with macros.h, as the latter provides the required MAX2
macro.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
9 years agoi965: Fix scalar vertex shader struct outputs.
Kenneth Graunke [Wed, 25 Nov 2015 05:33:01 +0000 (21:33 -0800)]
i965: Fix scalar vertex shader struct outputs.

While we correctly set output[] for composite varyings, we set completely
bogus values for output_components[], making emit_urb_writes() output
zeros instead of the actual values.

Unfortunately, our simple approach goes out the window, and we need to
recurse into structs to get the proper value of vector_elements for each
field.

Together with the previous patch, this fixes rendering in an upcoming
game from Feral Interactive.

v2: Use pointers instead of pass-by-mutable-reference (Jason, Matt).

Cc: "11.1 11.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
9 years agoi965: Fix fragment shader struct inputs.
Kenneth Graunke [Fri, 20 Nov 2015 04:03:25 +0000 (20:03 -0800)]
i965: Fix fragment shader struct inputs.

Apparently we have literally no support for FS varying struct inputs.
This is somewhat surprising, given that we've had tests for that very
feature that have been passing for a long time.

Normally, varying packing splits up structures for us, so we don't see
them in the backend.  However, with SSO, varying packing isn't around
to save us, and we get actual structs that we have to handle.

This patch changes fs_visitor::emit_general_interpolation() to work
recursively, properly handling nested structs/arrays/and so on.
(It's easier to read with diff -b, as indentation changes.)

When using the vec4 VS backend, this fixes rendering in an upcoming
game from Feral Interactive.  (The scalar VS backend requires additional
bug fixes in the next patch.)

v2: Use pointers instead of pass-by-mutable-reference (Jason, Matt).

Cc: "11.1 11.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
9 years agoradeonsi/compute: Use the compiler's COMPUTE_PGM_RSRC* register values
Tom Stellard [Mon, 16 Nov 2015 20:00:12 +0000 (20:00 +0000)]
radeonsi/compute: Use the compiler's COMPUTE_PGM_RSRC* register values

The compiler has more information and is able to optimize the bits
it sets in these registers.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
CC: <mesa-stable@lists.freedesktop.org>
9 years agoradeonsi: Rename si_shader::ls_rsrc{1,2} to si_shader::rsrc{1,2}
Tom Stellard [Mon, 16 Nov 2015 19:58:32 +0000 (19:58 +0000)]
radeonsi: Rename si_shader::ls_rsrc{1,2} to si_shader::rsrc{1,2}

In the future, these will be used by other shaders types.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agodocs: minimum required python mako version is 0.3.4
Samuel Iglesias Gonsálvez [Wed, 25 Nov 2015 15:33:47 +0000 (16:33 +0100)]
docs: minimum required python mako version is 0.3.4

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
9 years agodocs: update relnotes with AMD_performance_monitor for radeonsi
Nicolai Hähnle [Tue, 24 Nov 2015 15:48:04 +0000 (16:48 +0100)]
docs: update relnotes with AMD_performance_monitor for radeonsi

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeonsi: implement AMD_performance_monitor for CIK+
Nicolai Hähnle [Wed, 25 Nov 2015 14:30:03 +0000 (15:30 +0100)]
radeonsi: implement AMD_performance_monitor for CIK+

Expose most of the performance counter groups that are exposed by Catalyst.
Ideally, the driver will work with GPUPerfStudio at some point, but we are not
quite there yet. In any case, this is the reason for grouping multiple
instances of hardware blocks in the way it is implemented.

The counters can also be shown using the Gallium HUD. If one is interested to
see how work is distributed across multiple shader engines, one can set the
environment variable RADEON_PC_SEPARATE_SE=1 to obtain finer-grained performance
counter groups.

Part of the implementation is in radeon because an implementation for
older hardware would largely follow along the same lines, but exposing
a different set of blocks which are programmed slightly differently.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeon: scale query buffer size to result size
Nicolai Hähnle [Tue, 24 Nov 2015 13:54:54 +0000 (14:54 +0100)]
radeon: scale query buffer size to result size

Performance monitor queries can become very big, especially considering that
instances of a block in different shader engines are queried separately.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeonsi/sid: add performance counter registers
Nicolai Hähnle [Fri, 6 Nov 2015 21:43:58 +0000 (22:43 +0100)]
radeonsi/sid: add performance counter registers

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeonsi/sid: add hardware constants for COPY_DATA packet
Nicolai Hähnle [Wed, 11 Nov 2015 09:49:43 +0000 (10:49 +0100)]
radeonsi/sid: add hardware constants for COPY_DATA packet

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeon: extend CIK_UCONFIG_REG_END for performance counters
Nicolai Hähnle [Wed, 11 Nov 2015 13:38:59 +0000 (14:38 +0100)]
radeon: extend CIK_UCONFIG_REG_END for performance counters

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeon: add perfcounter-related EVENT_TYPEs
Nicolai Hähnle [Wed, 11 Nov 2015 11:49:52 +0000 (12:49 +0100)]
radeon: add perfcounter-related EVENT_TYPEs

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agoradeon: additional constants for WAIT_REG_MEM and EVENT_WRITE_EOP
Nicolai Hähnle [Wed, 18 Nov 2015 17:33:48 +0000 (18:33 +0100)]
radeon: additional constants for WAIT_REG_MEM and EVENT_WRITE_EOP

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
9 years agost/mesa: remove outdated comment
Nicolai Hähnle [Wed, 25 Nov 2015 13:26:41 +0000 (14:26 +0100)]
st/mesa: remove outdated comment

The enable of AMD_performance_monitor is no longer related to whether
queries are run by the GPU since the commit mentioned below.

Suggested-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
commit ddf27a3dd062c78ff49a69a1396be4de9c1b5d37
Author: Nicolai Hähnle <nhaehnle@gmail.com>
Date:   Tue Nov 10 13:35:01 2015 +0100

    gallium: remove pipe_driver_query_group_info field type

9 years agost/mesa: delay initialization of performance counters
Nicolai Hähnle [Wed, 25 Nov 2015 11:19:03 +0000 (12:19 +0100)]
st/mesa: delay initialization of performance counters

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
9 years agomesa/main: allow delayed initialization of performance monitors
Nicolai Hähnle [Wed, 25 Nov 2015 10:59:23 +0000 (11:59 +0100)]
mesa/main: allow delayed initialization of performance monitors

Most applications never use performance counters, so allow drivers to
skip potentially expensive initialization steps.

A driver that wants to use this must enable the appropriate extension(s)
at context initialization and set the InitPerfMonitorGroups driver function
which will be called the first time information about the performance monitor
groups is actually used.

The init_groups helper is called for API functions that can be called before
a monitor object exists. Functions that require an existing monitor object
can rely on init_groups having been called before.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
9 years agoglsl: handle case where index is array deref in optimize_split_arrays
Tapani Pälli [Thu, 19 Nov 2015 11:12:13 +0000 (13:12 +0200)]
glsl: handle case where index is array deref in optimize_split_arrays

Previously pass did not traverse to those array dereferences which were
used as indices to arrays. This fixes Synmark2 Gl42CSCloth application
issues.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
9 years agonouveau: move interlaced assert down in nouveau_vp3_video_buffer_create
Julien Isorce [Wed, 25 Nov 2015 08:17:34 +0000 (08:17 +0000)]
nouveau: move interlaced assert down in nouveau_vp3_video_buffer_create

templat->interlaced is 0 if not NV12 which is the case currently
when using VPP.

Signed-off-by: Julien Isorce <j.isorce@samsung.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
9 years agoi965: remove trailing spaces in various files
Iago Toral Quiroga [Tue, 24 Nov 2015 11:49:55 +0000 (12:49 +0100)]
i965: remove trailing spaces in various files

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
9 years agoglsl: remove trailing spaces in various files
Iago Toral Quiroga [Tue, 24 Nov 2015 11:40:53 +0000 (12:40 +0100)]
glsl: remove trailing spaces in various files

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
9 years agoi965: Pass brw_context pointer, not gl_context pointer.
Matt Turner [Wed, 25 Nov 2015 05:25:53 +0000 (21:25 -0800)]
i965: Pass brw_context pointer, not gl_context pointer.

Fixes a warning introduced by commit dcadd855.

9 years agoglsl: only call dead code pass when new inputs/outputs demoted
Timothy Arceri [Sat, 21 Nov 2015 08:02:01 +0000 (19:02 +1100)]
glsl: only call dead code pass when new inputs/outputs demoted

This will help avoid eliminating inputs/outputs needed by SSOs.

Cc: Gregory Hainaut <gregory.hainaut@gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
9 years agoglsl: move and reused code to find first and last shaders
Timothy Arceri [Sat, 21 Nov 2015 08:02:00 +0000 (19:02 +1100)]
glsl: move and reused code to find first and last shaders

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
9 years agomesa: Use unreachable() instead of a default case.
Matt Turner [Tue, 24 Nov 2015 00:23:29 +0000 (16:23 -0800)]
mesa: Use unreachable() instead of a default case.

(And add an unreachable() in one place that didn't have a default case)

9 years agometa: Don't save or restore the active client texture
Ian Romanick [Mon, 9 Nov 2015 19:15:04 +0000 (11:15 -0800)]
meta: Don't save or restore the active client texture

This setting is only used by glTexCoordPointer and related glEnable
calls.  Since the preceeding commits removed all of those, it is not
necessary to save, reset to default, or restore this state.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Don't save or restore the VBO binding
Ian Romanick [Thu, 5 Nov 2015 22:48:58 +0000 (14:48 -0800)]
meta: Don't save or restore the VBO binding

Nothing left in meta does anything with the VBO binding, so we don't
need to save or restore it.  The VAO binding is still modified.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa/TexSubImage: Don't pollute the buffer object namespace
Ian Romanick [Mon, 9 Nov 2015 21:11:02 +0000 (13:11 -0800)]
meta/TexSubImage: Don't pollute the buffer object namespace

tl;dr: For many types of GL object, we can *NEVER* use the Gen function.

In OpenGL ES (all versions!) and OpenGL compatibility profile,
applications don't have to call Gen functions.  The GL spec is very
clear about how you can mix-and-match generated names and non-generated
names: you can use any name you want for a particular object type until
you call the Gen function for that object type.

Here's the problem scenario:

 - Application calls a meta function that generates a name.  The first
   Gen will probably return 1.

 - Application decides to use the same name for an object of the same
   type without calling Gen.  Many demo programs use names 1, 2, 3,
   etc. without calling Gen.

 - Application calls the meta function again, and the meta function
   replaces the data.  The application's data is lost, and the app
   fails.  Have fun debugging that.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92363
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Don't pollute the buffer object namespace in _mesa_meta_DrawTex
Ian Romanick [Thu, 5 Nov 2015 22:44:26 +0000 (14:44 -0800)]
meta: Don't pollute the buffer object namespace in _mesa_meta_DrawTex

tl;dr: For many types of GL object, we can *NEVER* use the Gen function.

In OpenGL ES (all versions!) and OpenGL compatibility profile,
applications don't have to call Gen functions.  The GL spec is very
clear about how you can mix-and-match generated names and non-generated
names: you can use any name you want for a particular object type until
you call the Gen function for that object type.

Here's the problem scenario:

 - Application calls a meta function that generates a name.  The first
   Gen will probably return 1.

 - Application decides to use the same name for an object of the same
   type without calling Gen.  Many demo programs use names 1, 2, 3,
   etc. without calling Gen.

 - Application calls the meta function again, and the meta function
   replaces the data.  The application's data is lost, and the app
   fails.  Have fun debugging that.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92363
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Use internal functions for buffer object and VAO access in _mesa_meta_DrawTex
Ian Romanick [Thu, 5 Nov 2015 22:42:07 +0000 (14:42 -0800)]
meta: Use internal functions for buffer object and VAO access in _mesa_meta_DrawTex

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Track VBO using gl_buffer_object instead of GL API object handle in _mesa_meta_...
Ian Romanick [Thu, 5 Nov 2015 22:31:23 +0000 (14:31 -0800)]
meta: Track VBO using gl_buffer_object instead of GL API object handle in _mesa_meta_DrawTex

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Partially convert _mesa_meta_DrawTex to DSA
Ian Romanick [Thu, 5 Nov 2015 22:16:31 +0000 (14:16 -0800)]
meta: Partially convert _mesa_meta_DrawTex to DSA

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Don't pollute the buffer object namespace in _mesa_meta_setup_vertex_objects
Ian Romanick [Wed, 4 Nov 2015 01:41:16 +0000 (17:41 -0800)]
meta: Don't pollute the buffer object namespace in _mesa_meta_setup_vertex_objects

tl;dr: For many types of GL object, we can *NEVER* use the Gen function.

In OpenGL ES (all versions!) and OpenGL compatibility profile,
applications don't have to call Gen functions.  The GL spec is very
clear about how you can mix-and-match generated names and non-generated
names: you can use any name you want for a particular object type until
you call the Gen function for that object type.

Here's the problem scenario:

 - Application calls a meta function that generates a name.  The first
   Gen will probably return 1.

 - Application decides to use the same name for an object of the same
   type without calling Gen.  Many demo programs use names 1, 2, 3,
   etc. without calling Gen.

 - Application calls the meta function again, and the meta function
   replaces the data.  The application's data is lost, and the app
   fails.  Have fun debugging that.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92363
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Use internal functions for buffer object and VAO access
Ian Romanick [Wed, 4 Nov 2015 00:47:22 +0000 (16:47 -0800)]
meta: Use internal functions for buffer object and VAO access

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Use DSA functions for VBOs in _mesa_meta_setup_vertex_objects
Ian Romanick [Tue, 3 Nov 2015 23:55:14 +0000 (15:55 -0800)]
meta: Use DSA functions for VBOs in _mesa_meta_setup_vertex_objects

The fixed-function attribute paths don't get the DSA treatment because
there are no DSA entry-points for fixed-function attributes.  These
could have been added, but this is a temporary patch intended to make
later patches easier to review.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Track VBO using gl_buffer_object instead of GL API object handle
Ian Romanick [Tue, 3 Nov 2015 23:37:40 +0000 (15:37 -0800)]
meta: Track VBO using gl_buffer_object instead of GL API object handle

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Don't leave the VBO bound after _mesa_meta_setup_vertex_objects
Ian Romanick [Tue, 3 Nov 2015 04:11:02 +0000 (20:11 -0800)]
meta: Don't leave the VBO bound after _mesa_meta_setup_vertex_objects

Meta currently does this, but future changes will make this impossible.
Explicitly do it as a step in the patch series now to catch any possible
kinks.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agoi965: Use _mesa_NamedBufferSubData for users of _mesa_meta_setup_vertex_objects
Ian Romanick [Tue, 3 Nov 2015 03:10:08 +0000 (19:10 -0800)]
i965: Use _mesa_NamedBufferSubData for users of _mesa_meta_setup_vertex_objects

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Use _mesa_NamedBufferData and _mesa_NamedBufferSubData for users of _mesa_meta_...
Ian Romanick [Tue, 3 Nov 2015 02:36:34 +0000 (18:36 -0800)]
meta: Use _mesa_NamedBufferData and _mesa_NamedBufferSubData for users of _mesa_meta_setup_vertex_objects

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agometa: Use DSA functions for PBO in create_texture_for_pbo
Ian Romanick [Tue, 3 Nov 2015 02:33:54 +0000 (18:33 -0800)]
meta: Use DSA functions for PBO in create_texture_for_pbo

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agoi965: Don't pollute the buffer object namespace in brw_meta_fast_clear
Ian Romanick [Tue, 3 Nov 2015 01:04:41 +0000 (17:04 -0800)]
i965: Don't pollute the buffer object namespace in brw_meta_fast_clear

tl;dr: For many types of GL object, we can *NEVER* use the Gen function.

In OpenGL ES (all versions!) and OpenGL compatibility profile,
applications don't have to call Gen functions.  The GL spec is very
clear about how you can mix-and-match generated names and non-generated
names: you can use any name you want for a particular object type until
you call the Gen function for that object type.

Here's the problem scenario:

 - Application calls a meta function that generates a name.  The first
   Gen will probably return 1.

 - Application decides to use the same name for an object of the same
   type without calling Gen.  Many demo programs use names 1, 2, 3,
   etc. without calling Gen.

 - Application calls the meta function again, and the meta function
   replaces the data.  The application's data is lost, and the app
   fails.  Have fun debugging that.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92363
Reviewed-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agoi965: Use internal functions for buffer object access
Ian Romanick [Mon, 2 Nov 2015 22:49:03 +0000 (14:49 -0800)]
i965: Use internal functions for buffer object access

Instead of going through the GL API implementation functions, use the
lower-level functions.  This means that we have to keep track of a
pointer to the gl_buffer_object and the gl_vertex_array_object.

This has two advantages.  First, it avoids a bunch of CPU overhead in
looking up objects and validing API parameters.  Second, and much more
importantly, it will allow us to stop calling _mesa_GenBuffers /
_mesa_CreateBuffers and pollute the buffer namespace (next patch).

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agoi965: Use DSA functions for VBOs in brw_meta_fast_clear
Ian Romanick [Mon, 2 Nov 2015 22:31:56 +0000 (14:31 -0800)]
i965: Use DSA functions for VBOs in brw_meta_fast_clear

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agoi965: Pass brw_context instead of gl_context to brw_draw_rectlist
Ian Romanick [Mon, 2 Nov 2015 20:41:28 +0000 (12:41 -0800)]
i965: Pass brw_context instead of gl_context to brw_draw_rectlist

Future patches will use the brw_context instead.  Keeping this
non-functional change separate should make the function changes easier
to review.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agomesa: Refactor enable_vertex_array_attrib to make _mesa_enable_vertex_array_attrib
Ian Romanick [Wed, 4 Nov 2015 00:16:00 +0000 (16:16 -0800)]
mesa: Refactor enable_vertex_array_attrib to make _mesa_enable_vertex_array_attrib

Pulls the parts of enable_vertex_array_attrib that aren't just parameter
validation out into a function that can be called from other parts of
Mesa (e.g., meta).

_mesa_enable_vertex_array_attrib can also be used to enable
fixed-function arrays.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agomesa: Refactor update_array_format to make _mesa_update_array_format_public
Ian Romanick [Wed, 4 Nov 2015 00:09:22 +0000 (16:09 -0800)]
mesa: Refactor update_array_format to make _mesa_update_array_format_public

Pulls the parts of update_array_format that aren't just parameter
validation out into a function that can be called from other parts of
Mesa (e.g., meta).

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agomesa: Make bind_vertex_buffer avilable outside varray.c
Ian Romanick [Mon, 2 Nov 2015 20:40:32 +0000 (12:40 -0800)]
mesa: Make bind_vertex_buffer avilable outside varray.c

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
9 years agoRevert "i965: Combine assembly annotations if possible."
Kenneth Graunke [Thu, 19 Nov 2015 08:45:49 +0000 (00:45 -0800)]
Revert "i965: Combine assembly annotations if possible."

This reverts commit a280e83d71bb046098ed5380cb053318f9e8cf8e.

It breaks INTEL_DEBUG=fs output.  For example,
glsl-fs-discard-01.shader_test has 11 instructions but only prints 5.

Acked-by: Matt Turner <mattst88@gmail.com>
9 years agoglsl: Pass ast_type_qualifier by const reference.
Matt Turner [Mon, 23 Nov 2015 22:22:48 +0000 (14:22 -0800)]
glsl: Pass ast_type_qualifier by const reference.

Coverity noticed that we were passing this by value, and it's 152 bytes.

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
9 years agoi965: Clean up #includes in the compiler.
Matt Turner [Mon, 23 Nov 2015 02:27:42 +0000 (18:27 -0800)]
i965: Clean up #includes in the compiler.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Move brw_new_shader and brw_link_shader prototypes from brw_wm.h.
Matt Turner [Mon, 23 Nov 2015 17:31:21 +0000 (09:31 -0800)]
i965: Move brw_new_shader and brw_link_shader prototypes from brw_wm.h.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Compile brw_cs_fill_local_id_payload() as C.
Matt Turner [Mon, 23 Nov 2015 06:11:53 +0000 (22:11 -0800)]
i965: Compile brw_cs_fill_local_id_payload() as C.

It's only called from C, it compiles as C, so just compile it as C.

Notice the missing extern "C" on the definition of the function, which
would screw things up if the prototype wasn't parsed before the
definition.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Move MRF macros from brw_inst.h to brw_eu.h.
Matt Turner [Mon, 23 Nov 2015 01:58:51 +0000 (17:58 -0800)]
i965: Move MRF macros from brw_inst.h to brw_eu.h.

brw_inst.h is only for the brw_inst/brw_compact_inst functions.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Drop #include of main/glheader.h.
Matt Turner [Mon, 23 Nov 2015 01:40:26 +0000 (17:40 -0800)]
i965: Drop #include of main/glheader.h.

It's never used.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Push down inclusion of brw_program.h.
Matt Turner [Sun, 22 Nov 2015 23:30:59 +0000 (15:30 -0800)]
i965: Push down inclusion of brw_program.h.

We were including it in headers, which then caused it to be included in
tons of places it wasn't needed.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Mark functions called from C as extern "C".
Matt Turner [Mon, 23 Nov 2015 05:54:28 +0000 (21:54 -0800)]
i965: Mark functions called from C as extern "C".

These functions' prototypes are marked with extern "C", which apparently
overrides a lack of extern "C" at the definition site if the prototype
has been seen first.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Push down inclusion of vbo/vbo.h.
Matt Turner [Sun, 22 Nov 2015 23:35:07 +0000 (15:35 -0800)]
i965: Push down inclusion of vbo/vbo.h.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Remove duplicate #includes.
Matt Turner [Mon, 23 Nov 2015 00:08:23 +0000 (16:08 -0800)]
i965: Remove duplicate #includes.

Added in commits 36fd65381 and 337dad8ce even though the existing
include was in view.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Remove unneeded forward declarations.
Matt Turner [Sun, 22 Nov 2015 23:13:31 +0000 (15:13 -0800)]
i965: Remove unneeded forward declarations.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Mark count_trailing_one_bits() static.
Matt Turner [Sun, 22 Nov 2015 23:06:43 +0000 (15:06 -0800)]
i965: Mark count_trailing_one_bits() static.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoi965: Remove useless gen6_blorp.h/gen7_blorp.h headers.
Matt Turner [Sun, 22 Nov 2015 23:04:45 +0000 (15:04 -0800)]
i965: Remove useless gen6_blorp.h/gen7_blorp.h headers.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
9 years agoutil: Include assert.h in macros.h.
Matt Turner [Sun, 22 Nov 2015 23:28:25 +0000 (15:28 -0800)]
util: Include assert.h in macros.h.

9 years agoutil: Include <stdbool.h> in debug.h.
Matt Turner [Tue, 24 Nov 2015 18:05:04 +0000 (10:05 -0800)]
util: Include <stdbool.h> in debug.h.

9 years agoi965: Prevent implicit upcasts to brw_reg.
Matt Turner [Fri, 20 Nov 2015 05:51:37 +0000 (21:51 -0800)]
i965: Prevent implicit upcasts to brw_reg.

Now that backend_reg inherits from brw_reg, we have to be careful to
avoid the object slicing problem.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
9 years agoi965: Use scope operator to ensure brw_reg is interpreted as a type.
Matt Turner [Tue, 24 Nov 2015 00:17:28 +0000 (16:17 -0800)]
i965: Use scope operator to ensure brw_reg is interpreted as a type.

In the next patch, I make backend_reg's inheritance from brw_reg
private, which confuses clang when it sees the type "struct brw_reg" in
the derived class constructors, thinking it is referring to the
privately inherited brw_reg:

brw_fs.cpp:366:23: error: 'brw_reg' is a private member of 'brw_reg'
fs_reg::fs_reg(struct brw_reg reg) :
                      ^
brw_shader.h:39:22: note: constrained by private inheritance here
struct backend_reg : private brw_reg
                     ^~~~~~~~~~~~~~~
brw_reg.h:232:8: note: member is declared here
struct brw_reg {
       ^

Avoid this by marking brw_reg with the scope resolution operator.

9 years agoi965: Use implicit backend_reg copy-constructor.
Matt Turner [Sat, 21 Nov 2015 05:18:26 +0000 (21:18 -0800)]
i965: Use implicit backend_reg copy-constructor.

In order to do this, we have to change the signature of the
backend_reg(brw_reg) constructor to take a reference to a brw_reg in
order to avoid unresolvable ambiguity about which constructor is
actually being called in the other modifications in this patch.

As far as I understand it, the rule in C++ is that if multiple
constructors are available for parent classes, the one closest to you in
the class heirarchy is closen, but if one of them didn't take a
reference, that screws things up.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>