profile/ivi/mesa.git
12 years agovl: rework winsys interface
Christian König [Wed, 15 Feb 2012 16:20:50 +0000 (17:20 +0100)]
vl: rework winsys interface

Throw out all the old and now unneeded stuff.

Signed-off-by: Christian König <deathsimple@vodafone.de>
12 years agovl: cleanup dri winsys abstraction
Christian König [Wed, 15 Feb 2012 13:57:35 +0000 (14:57 +0100)]
vl: cleanup dri winsys abstraction

There was way to much dead code in it.

Signed-off-by: Christian König <deathsimple@vodafone.de>
12 years agoscons: Don't build the assembly sources on Mac OS X.
Vinson Lee [Sun, 19 Feb 2012 07:43:03 +0000 (23:43 -0800)]
scons: Don't build the assembly sources on Mac OS X.

This patch allows the Mac OS X SCons build to complete. The assembly
sources contain psuedo-ops that not are supported on Mac OS X.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agoi915g: Fix fallout from 8e4540ec2a82e72be491bc8fe23c10551d29a96c
Stéphane Marchesin [Fri, 24 Feb 2012 23:17:27 +0000 (15:17 -0800)]
i915g: Fix fallout from 8e4540ec2a82e72be491bc8fe23c10551d29a96c

Fixes piglit regressions from that change.

12 years agosvga: Fix stencil op mapping
Zack Rusin [Fri, 24 Feb 2012 19:26:41 +0000 (14:26 -0500)]
svga: Fix stencil op mapping

We were inverting the meaning of the stencil op flags: in svga/d3d
the normal incr/decr wraps and the SAT ops clamp.
This fixes piglit failures (at least stencil-twoside and stencil-wrap).
We should backport this everywhere we can.

Reviewed-by: Brian Paul <brianp@vmware.com>
12 years agosvga: fix use of SVGA3D_x vs. PIPE_FORMAT_x in svga_is_format_supported()
Brian Paul [Fri, 24 Feb 2012 16:46:44 +0000 (17:46 +0100)]
svga: fix use of SVGA3D_x vs. PIPE_FORMAT_x in svga_is_format_supported()

Two of the switch cases used PIPE_FORMAT_ tokens instead of SVGA3D_ tokens.
As it happens, the token values are equal for these formats so there's no
net change.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
12 years agomesa/gdi: include swrast.h to fix compilation
Brian Paul [Fri, 24 Feb 2012 16:27:35 +0000 (09:27 -0700)]
mesa/gdi: include swrast.h to fix compilation

12 years agost/mesa: initialize the MaxViewport, MaxRenderbufferSize constants
Brian Paul [Tue, 21 Feb 2012 15:26:30 +0000 (08:26 -0700)]
st/mesa: initialize the MaxViewport, MaxRenderbufferSize constants

Use the max 2D/rect texture size as the limit.  If that's not true
for some devices we'll need new PIPE_CAP_ queries.

12 years agomesa: move more swrast-related #defines out of core Mesa
Brian Paul [Mon, 20 Feb 2012 20:13:55 +0000 (13:13 -0700)]
mesa: move more swrast-related #defines out of core Mesa

12 years agomesa: remove STENCIL_BITS use
Brian Paul [Mon, 20 Feb 2012 20:01:17 +0000 (13:01 -0700)]
mesa: remove STENCIL_BITS use

12 years agoxlib: remove STENCIL_BITS
Brian Paul [Tue, 21 Feb 2012 15:01:05 +0000 (08:01 -0700)]
xlib: remove STENCIL_BITS

12 years agost/glx: remove STENCIL_BITS, DEFAULT_SOFTWARE_DEPTH_BITS
Brian Paul [Mon, 20 Feb 2012 20:00:17 +0000 (13:00 -0700)]
st/glx: remove STENCIL_BITS, DEFAULT_SOFTWARE_DEPTH_BITS

Remove some Mesa/swrast stuff.

12 years agomesa: remove last of MAX_WIDTH, MAX_HEIGHT
Brian Paul [Mon, 20 Feb 2012 18:07:01 +0000 (11:07 -0700)]
mesa: remove last of MAX_WIDTH, MAX_HEIGHT

Define new MAX_VIEWPORT_WIDTH/HEIGHT and MAX_RENDERBUFFER_SIZE values
instead.

12 years agomesa: remove MAX_WIDTH from prog_execute.h
Brian Paul [Mon, 20 Feb 2012 18:07:01 +0000 (11:07 -0700)]
mesa: remove MAX_WIDTH from prog_execute.h

define a PROG_MAX_WIDTH var instead.  It has to match MAX_WIDTH in
swrast.  More elaborate refactoring could fix that (someday).

12 years agost/glx: remove MAX_WIDTH/HEIGHT usage
Brian Paul [Mon, 20 Feb 2012 18:07:01 +0000 (11:07 -0700)]
st/glx: remove MAX_WIDTH/HEIGHT usage

12 years agointel: remove MAX_WIDTH usage in intelInitContext()
Brian Paul [Mon, 20 Feb 2012 18:07:01 +0000 (11:07 -0700)]
intel: remove MAX_WIDTH usage in intelInitContext()

12 years agoswrast: check max renderbuffer size against SWRAST_MAX_WIDTH
Brian Paul [Mon, 20 Feb 2012 18:07:00 +0000 (11:07 -0700)]
swrast: check max renderbuffer size against SWRAST_MAX_WIDTH

12 years agoosmesa: use SWRAST_MAX_WIDTH/HEIGHT
Brian Paul [Mon, 20 Feb 2012 18:07:00 +0000 (11:07 -0700)]
osmesa: use SWRAST_MAX_WIDTH/HEIGHT

12 years agodri/swrast: use SWRAST_MAX_WIDTH/HEIGHT
Brian Paul [Mon, 20 Feb 2012 18:07:00 +0000 (11:07 -0700)]
dri/swrast: use SWRAST_MAX_WIDTH/HEIGHT

12 years agoxlib: use SWRAST_MAX_WIDTH/HEIGHT
Brian Paul [Mon, 20 Feb 2012 18:07:00 +0000 (11:07 -0700)]
xlib: use SWRAST_MAX_WIDTH/HEIGHT

12 years agoswrast: define, use SWRAST_MAX_WIDTH/HEIGHT
Brian Paul [Mon, 20 Feb 2012 18:07:00 +0000 (11:07 -0700)]
swrast: define, use SWRAST_MAX_WIDTH/HEIGHT

We'll get rid of MAX_WIDTH, MAX_HEIGHT soon.

12 years agomesa: remove some cruft from config.h
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
mesa: remove some cruft from config.h

12 years agomesa: minor comment clean-ups in config.h
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
mesa: minor comment clean-ups in config.h

12 years agomesa: remove WIN32 MAX_WIDTH work-around in config.h
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
mesa: remove WIN32 MAX_WIDTH work-around in config.h

There aren't any more stack-allocated arrays dimensioned by MAX_WIDTH
so there shouldn't be any more stack overflows.

12 years agoswrast: remove MAX_WIDTH array in s_span.c
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: remove MAX_WIDTH array in s_span.c

12 years agoswrast: simplify mask array code
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: simplify mask array code

12 years agoswrast: stop using MAX_WIDTH arrays in triangle code
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: stop using MAX_WIDTH arrays in triangle code

12 years agoswrast: remove MAX_WIDTH arrays in stencil code
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: remove MAX_WIDTH arrays in stencil code

Use some per-context temporary arrays instead.

12 years agoswrast: remove MAX_WIDTH arrays in s_drawpix.c
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: remove MAX_WIDTH arrays in s_drawpix.c

12 years agoswrast: remove MAX_WIDTH arrays in s_zoom.c
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: remove MAX_WIDTH arrays in s_zoom.c

12 years agoswrast: remove MAX_WIDTH arrays in s_depth.c
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: remove MAX_WIDTH arrays in s_depth.c

12 years agoswrast: remove MAX_WIDTH arrays in s_copypix.c
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
swrast: remove MAX_WIDTH arrays in s_copypix.c

12 years agomesa: move/fix MAX_WIDTH/HEIGHT-related assertions
Brian Paul [Mon, 20 Feb 2012 03:08:52 +0000 (20:08 -0700)]
mesa: move/fix MAX_WIDTH/HEIGHT-related assertions

Max texture and viewport size is only limited by MAX_WIDTH/HEIGHT for swrast.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agost/mesa: stop using MAX_WIDTH in st_cb_texture.c
Brian Paul [Mon, 20 Feb 2012 03:08:51 +0000 (20:08 -0700)]
st/mesa: stop using MAX_WIDTH in st_cb_texture.c

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agost/mesa: stop using MAX_WIDTH in st_cb_drawpixels.c
Brian Paul [Mon, 20 Feb 2012 03:08:51 +0000 (20:08 -0700)]
st/mesa: stop using MAX_WIDTH in st_cb_drawpixels.c

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agomesa: stop using MAX_WIDTH in glReadPixels code
Brian Paul [Mon, 20 Feb 2012 03:08:51 +0000 (20:08 -0700)]
mesa: stop using MAX_WIDTH in glReadPixels code

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agomesa: stop using MAX_WIDTH in texstore code
Brian Paul [Mon, 20 Feb 2012 03:08:51 +0000 (20:08 -0700)]
mesa: stop using MAX_WIDTH in texstore code

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agou_blitter: decrease minimum buffer range alignment to 4 for copy_buffer
Marek Olšák [Fri, 24 Feb 2012 01:25:25 +0000 (02:25 +0100)]
u_blitter: decrease minimum buffer range alignment to 4 for copy_buffer

12 years agou_blitter: check for invalid values in copy_buffer
Marek Olšák [Fri, 24 Feb 2012 01:24:22 +0000 (02:24 +0100)]
u_blitter: check for invalid values in copy_buffer

12 years agor600g: rework queries
Marek Olšák [Tue, 21 Feb 2012 23:25:55 +0000 (00:25 +0100)]
r600g: rework queries

We always mapped the query buffer in begin_query, causing stalls
if the buffer was busy.

This commit reworks it such that the query buffer is only mapped
in get_query_result as it's supposed to be.

The query buffer is no longer treated as a ring buffer. Instead, the results
are just appended and when the buffer is full, we create a new one. One query
can have more than one query buffer, though that's a very rare case.
Begin_query releases all query buffers.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: cleanup magic numbers in set_xx_sampler
Marek Olšák [Tue, 21 Feb 2012 19:24:34 +0000 (20:24 +0100)]
r600g: cleanup magic numbers in set_xx_sampler

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: remove duplicated evergreen_context_ps_partial_flush
Marek Olšák [Tue, 21 Feb 2012 18:58:09 +0000 (19:58 +0100)]
r600g: remove duplicated evergreen_context_ps_partial_flush

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: remove duplicated evergreen_context_pipe_state_set_sampler
Marek Olšák [Tue, 21 Feb 2012 18:54:17 +0000 (19:54 +0100)]
r600g: remove duplicated evergreen_context_pipe_state_set_sampler

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: remove duplicated set_xx_resource functions
Marek Olšák [Tue, 21 Feb 2012 18:47:07 +0000 (19:47 +0100)]
r600g: remove duplicated set_xx_resource functions

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: remove duplicated function r600_state_sampler_init
Marek Olšák [Tue, 21 Feb 2012 18:40:22 +0000 (19:40 +0100)]
r600g: remove duplicated function r600_state_sampler_init

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: fixup name of evergreen-specific function
Marek Olšák [Tue, 21 Feb 2012 18:38:42 +0000 (19:38 +0100)]
r600g: fixup name of evergreen-specific function

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: simplify fail paths in create_context
Marek Olšák [Tue, 21 Feb 2012 18:03:14 +0000 (19:03 +0100)]
r600g: simplify fail paths in create_context

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agogallium/u_slab: fix possible crash in util_slab_destroy
Marek Olšák [Tue, 21 Feb 2012 17:40:11 +0000 (18:40 +0100)]
gallium/u_slab: fix possible crash in util_slab_destroy

It may happen if util_slab_create has not been called.

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: fix possible crashes in destroy_context when failing in create_context
Marek Olšák [Tue, 21 Feb 2012 17:30:18 +0000 (18:30 +0100)]
r600g: fix possible crashes in destroy_context when failing in create_context

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: consolidate common context init code
Marek Olšák [Tue, 21 Feb 2012 17:08:32 +0000 (18:08 +0100)]
r600g: consolidate common context init code

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agor600g: define GROUP_FORCE_NEW_BLOCK in common header
Marek Olšák [Tue, 21 Feb 2012 16:49:29 +0000 (17:49 +0100)]
r600g: define GROUP_FORCE_NEW_BLOCK in common header

Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
12 years agost/dri: Fix crash in st/dri from dri format commit
Jakob Bornecrantz [Thu, 23 Feb 2012 17:17:37 +0000 (18:17 +0100)]
st/dri: Fix crash in st/dri from dri format commit

Introduced with 8de5c355fa2bf0f30df2c7cf39aee01e793284bf, it would probably just crash.

Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Jesse Barnes <jbarnes@virtousgeek.org>
12 years agoglapi: Fix incorrect enum value.
Paul Berry [Wed, 15 Feb 2012 18:35:10 +0000 (10:35 -0800)]
glapi: Fix incorrect enum value.

From http://www.opengl.org/registry/specs/ARB/seamless_cube_map.txt:

    Accepted by the <cap> parameter of Enable, Disable and IsEnabled,
    and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv
    and GetDoublev:

    TEXTURE_CUBE_MAP_SEAMLESS                   0x884F

This caused a change in enums.c, which is manually built from the .xml
files.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
12 years agoutil: add mutex lock in u_debug_memory.c code
Brian Paul [Thu, 16 Feb 2012 19:25:22 +0000 (12:25 -0700)]
util: add mutex lock in u_debug_memory.c code

The linked list of memory allocations was not protected by a mutex.
This lead to sporadic failures with multi-threaded apps.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agosvga: no-op sampler view referencing if no change
Brian Paul [Fri, 17 Feb 2012 17:18:55 +0000 (10:18 -0700)]
svga: no-op sampler view referencing if no change

Just to be safe with ref counting and avoid atomic operations.

12 years agosvga: use pipe_sampler_view_release() to avoid segfault
Brian Paul [Thu, 16 Feb 2012 19:23:16 +0000 (12:23 -0700)]
svga: use pipe_sampler_view_release() to avoid segfault

This fixes another case of faulting when freeing a pipe_sampler_view
that belongs to a previously destroyed context.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agost/wgl: check for hPbuffer=0 in wgl pbuffer functions
Brian Paul [Thu, 16 Feb 2012 19:20:57 +0000 (12:20 -0700)]
st/wgl: check for hPbuffer=0 in wgl pbuffer functions

Per the GL_WGL_pbuffer spec, generate ERROR_INVALID_HANDLE and
return FALSE (and don't segfault).

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agost/wgl: Fix argument of stw_pixelformat_get_info().
José Fonseca [Wed, 8 Feb 2012 15:46:28 +0000 (15:46 +0000)]
st/wgl: Fix argument of stw_pixelformat_get_info().

stw_pixelformat_get_info takes zero based index, not a 1 based pixel
format number.

12 years agost/mesa: use pipe_sampler_view_release()
Brian Paul [Fri, 3 Feb 2012 18:10:40 +0000 (11:10 -0700)]
st/mesa: use pipe_sampler_view_release()

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agogallium: added pipe_sampler_view_release() function
Brian Paul [Fri, 3 Feb 2012 18:09:39 +0000 (11:09 -0700)]
gallium: added pipe_sampler_view_release() function

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agost/mesa: add floating point formats in st_new_renderbuffer_fb()
Brian Paul [Fri, 3 Feb 2012 18:08:50 +0000 (11:08 -0700)]
st/mesa: add floating point formats in st_new_renderbuffer_fb()

To allow creating floating point buffers / pbuffers.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agosvga: re-enable deleted surface caching
Brian Paul [Thu, 8 Dec 2011 00:11:00 +0000 (17:11 -0700)]
svga: re-enable deleted surface caching

Basically, instead of immediately freeing deleted surfaces, hang onto
them in a cache to do quick re-allocation.  This helps when surfaces
are frequently destroyed and then reallocated a bit later.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agosvga: implement surface cache size limit
Brian Paul [Wed, 7 Dec 2011 23:57:11 +0000 (16:57 -0700)]
svga: implement surface cache size limit

There was a SVGA_HOST_SURFACE_CACHE_BYTES symbol, but it was never
used.

Now when we go to add a newly deleted surface to the cache we check
if the cache size would be exceeded.  If so, try to free the least
recently "unused" surfaces until the cache is smaller.  If we can't
do that, simply don't cache the newly deleted surface.  The alternative
involves flushing and waiting and we don't want to do that.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agosvga: add svga_format_size() function
Brian Paul [Thu, 8 Dec 2011 00:05:48 +0000 (17:05 -0700)]
svga: add svga_format_size() function

Reviewed-by: José Fonseca <jfonseca@vmware.com>
12 years agosvga: use dummy shaders when translation fails
Brian Paul [Thu, 17 Nov 2011 23:40:02 +0000 (16:40 -0700)]
svga: use dummy shaders when translation fails

Before, if shader translation failed for any reason we'd keep trying
to translate the shader over and over again during state validation.
The dummy fragment shader emits solid red so that might be visual
clue that translation is failing.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agosvga: move temp register index assertions
Brian Paul [Mon, 21 Nov 2011 21:53:46 +0000 (14:53 -0700)]
svga: move temp register index assertions

The assertion recently added in dst_register() was invalid because that
function is also (suprisingly) used to declare constant registers.

Move the assertion to the callers where we're really creating temp
registers and add some code to prevent emitting invalid temp register
indexes for release builds.

Also, update the comment for get_temp().  It didn't return -1 if it
ran out of registers and none of the callers checked for that.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agosvga: check that we don't exceed temp register limit
Brian Paul [Thu, 17 Nov 2011 23:36:26 +0000 (16:36 -0700)]
svga: check that we don't exceed temp register limit

And assert on the register index in dst_register().  The dest can
only be an output or temp reg and there's more of the later.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agoscons: Update windows llvm libraries for version 3.0.
José Fonseca [Thu, 23 Feb 2012 11:50:42 +0000 (11:50 +0000)]
scons: Update windows llvm libraries for version 3.0.

12 years agoAdd a test for the compare opcode.
Alex Corscadden [Wed, 8 Sep 2010 17:42:41 +0000 (10:42 -0700)]
Add a test for the compare opcode.

This is a test for the compare opcode (CMP).  This should draw a green triangle
in the fs-test.

12 years agor600g: Fix build when libdrm is installed to non-standard dir.
Satyajit Sarangi [Mon, 20 Feb 2012 06:17:56 +0000 (01:17 -0500)]
r600g: Fix build when libdrm is installed to non-standard dir.

Signed-off-by: Satyajit Sarangi<kernel.saty@gmail.com>
Signed-off-by: Tom Stellard <tstellar@gmail.com>
12 years agoi915: Initialize swrast_texture_image structure fields.
Paul Berry [Fri, 17 Feb 2012 00:00:45 +0000 (16:00 -0800)]
i915: Initialize swrast_texture_image structure fields.

Commit 980f6f1 (mesa: move gl_texture_image::Width/Height/DepthScale
fields to swrast) moved the initialization of the Width, Height, and
DepthScale fields to _swrast_alloc_texture_image_buffer().  However,
i915 doesn't call this function because it performs its own buffer
allocation.  As a result, the Width, Height, and DepthScale fields
weren't getting initialized properly, and some operations requiring
swrast would fail.

This patch ensures that Width, Height, and DepthScale are properly
initialized by separating the code that sets them into a new function,
_swrast_init_texture_image(), which is called by
intel_alloc_texture_image_buffer() as well as
_swrast_alloc_texture_image_buffer().  It also moves the
initialization of _IsPowerOfTwo into this function.

Fixes piglit test fbo/fbo-cubemap on i915.

Partially fixes https://bugs.freedesktop.org/show_bug.cgi?id=41216

This is a candidate for the 8.0 branch.

Reviewed-and-tested-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
12 years agointel: bump DRI_IMAGE extension version to 3
Jesse Barnes [Wed, 22 Feb 2012 17:52:09 +0000 (09:52 -0800)]
intel: bump DRI_IMAGE extension version to 3

To indicate support for the format query.

Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
12 years agogbm: track buffer format through DRI drivers
Jesse Barnes [Tue, 21 Feb 2012 20:53:09 +0000 (12:53 -0800)]
gbm: track buffer format through DRI drivers

GBM needs the buffer format in order to communicate with DRM and clients
for things like scanout.

So track the DRI format requested in the various back ends and use it to
return the DRI format back to GBM when requested.  GBM will then map
this into the GBM surface type (which is in turn based on the DRM fb
format list).

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
12 years agotests/graw: Add a bunch of tests.
José Fonseca [Wed, 22 Feb 2012 15:22:31 +0000 (15:22 +0000)]
tests/graw: Add a bunch of tests.

These were rotting in an internal branch, but contain nothing confidential,
and would be much more useful if kept up-to-date with latest gallium
interface changes.

Several authors including Keith Whitwell, Zack Rusin, and Brian Paul.

12 years agomesa: add special case in texstore.c for GL_LUMINANCE_ALPHA src image
Brian Paul [Thu, 17 Nov 2011 23:03:35 +0000 (16:03 -0700)]
mesa: add special case in texstore.c for GL_LUMINANCE_ALPHA src image

About a 10% improvement over the swizzle-copy path.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
12 years agogallium/cso: Put the comment about shader in the code for future reference.
José Fonseca [Wed, 22 Feb 2012 08:41:19 +0000 (08:41 +0000)]
gallium/cso: Put the comment about shader in the code for future reference.

12 years agoi965/gen6: Fix near-NULL deref in setting up GS binding table for non-XFB.
Eric Anholt [Tue, 21 Feb 2012 21:17:40 +0000 (13:17 -0800)]
i965/gen6: Fix near-NULL deref in setting up GS binding table for non-XFB.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Correct the size of the state batch space allocated for binding tables.
Eric Anholt [Tue, 21 Feb 2012 21:05:57 +0000 (13:05 -0800)]
i965: Correct the size of the state batch space allocated for binding tables.

In the gen6 GS case, we were under-counting and so other state would
get smashed.  In the VS case, we were over-counting, so everything was
fine.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Fix a bad comment in gen6 sol setup.
Eric Anholt [Tue, 21 Feb 2012 21:04:12 +0000 (13:04 -0800)]
i965: Fix a bad comment in gen6 sol setup.

This was copy and paste from the VS where I had similar code.  We're
only looking at things derived from BRW_NEW_VERTEX_PROGRAM in this
block.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965/gen6: Fix the size of the GS surface binding table.
Eric Anholt [Tue, 21 Feb 2012 20:56:29 +0000 (12:56 -0800)]
i965/gen6: Fix the size of the GS surface binding table.

I obviously didn't test on gen6 before pushing.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agor600g: move invariant register updates into start_cs for evergreen and cayman
Marek Olšák [Wed, 8 Feb 2012 22:25:58 +0000 (23:25 +0100)]
r600g: move invariant register updates into start_cs for evergreen and cayman

12 years agor600g: move invariant register updates into start_cs for r6xx-r7xx
Marek Olšák [Fri, 3 Feb 2012 04:05:31 +0000 (05:05 +0100)]
r600g: move invariant register updates into start_cs for r6xx-r7xx

12 years agor600g: add a depth misc state which depends on occlusion queries
Marek Olšák [Thu, 2 Feb 2012 13:01:12 +0000 (14:01 +0100)]
r600g: add a depth misc state which depends on occlusion queries

This is a state which is derived from other states and is actually the first
state which doesn't correspond to any gallium state.

There are two state flags:
  bool occlusion_query_enabled
  bool flush_depthstencil_enabled

Additional flags can be added later if needed, e.g. bool hiz_enabled.
The emit function will have to figure out the register values by itself.

It basically just emits the registers when the state changes.
This commit also adds a few helper functions for writing registers directly
into a command stream.

12 years agor600g: consolidate the main draw code
Marek Olšák [Thu, 2 Feb 2012 09:04:29 +0000 (10:04 +0100)]
r600g: consolidate the main draw code

The code was almost the same for r600 and eg. What can't be consolidated is
in the *_prepare functions.

12 years agor600g: move all invariant state from draw_vbo into start_cs
Marek Olšák [Thu, 2 Feb 2012 07:27:01 +0000 (08:27 +0100)]
r600g: move all invariant state from draw_vbo into start_cs

12 years agor600g: turn init_config into a command buffer for starting a CS
Marek Olšák [Tue, 31 Jan 2012 09:50:51 +0000 (10:50 +0100)]
r600g: turn init_config into a command buffer for starting a CS

This is the first pure command buffer. It contains CS initialization
packets and emits invariant state (i.e. the registers which never or rarely
change).

The affected registers are removed from *_hw_context.c, so that both ways
of emitting commands can co-exist.

v2: emit context_control in cayman's start_cs too

12 years agoi965: Only set Last Render Target Select on the last FB write.
Kenneth Graunke [Sun, 19 Feb 2012 05:29:29 +0000 (21:29 -0800)]
i965: Only set Last Render Target Select on the last FB write.

Fixes GPU hangs in OilRush, Trine, and Amnesia: The Dark Descent,
which all use MRT (multiple render targets).

NOTE: This is a candidate for release branches.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38720
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40059
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45216
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agogallium/cso: kill off non-functional shader caching
Marek Olšák [Fri, 17 Feb 2012 01:13:32 +0000 (02:13 +0100)]
gallium/cso: kill off non-functional shader caching

Suggested by José.

We don't provide shader caching in CSO. Most of the time the api provides
object semantics for shaders anyway, and the cases where it doesn't
(eg mesa's internall-generated texenv programs), it will be up to
the state tracker to implement their own specialized caching.

12 years agogallium/util: remove u_simple_screen
Marek Olšák [Fri, 17 Feb 2012 00:54:37 +0000 (01:54 +0100)]
gallium/util: remove u_simple_screen

Deprecated and unused.

12 years agogallium: remove unused winsys pointers in pipe_screen and pipe_context
Marek Olšák [Fri, 17 Feb 2012 00:49:49 +0000 (01:49 +0100)]
gallium: remove unused winsys pointers in pipe_screen and pipe_context

A winsys is already a private object of a driver.

12 years agointel: Silence valgrind warning for getparam ioctl argument.
Eric Anholt [Thu, 16 Feb 2012 19:30:49 +0000 (11:30 -0800)]
intel: Silence valgrind warning for getparam ioctl argument.

It was concerned that the 4 pad bytes on LP64 were uninitialized.

12 years agoi965: Rename the original binding table to mention that it's the WM now.
Eric Anholt [Wed, 15 Feb 2012 22:24:37 +0000 (14:24 -0800)]
i965: Rename the original binding table to mention that it's the WM now.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Split the gen6 GS binding table to a separate table.
Eric Anholt [Wed, 15 Feb 2012 22:15:14 +0000 (14:15 -0800)]
i965: Split the gen6 GS binding table to a separate table.

Improves VS state change microbenchmark performance by 7.08729% +/-
1.22289% (n=10) on gen7, because we don't upload the 64 dwords of
unused binding table any more.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Split the VS binding table to a separate table.
Eric Anholt [Wed, 15 Feb 2012 21:33:07 +0000 (13:33 -0800)]
i965: Split the VS binding table to a separate table.

This is a step toward making the samplers/binding tables reflect
sampler uniform mappings instead of embedding those in the programs.
No significant performance difference on the microbenchmark (n=10).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965/gen6+: Avoid recomputing whether we use noperspective.
Eric Anholt [Wed, 15 Feb 2012 20:57:25 +0000 (12:57 -0800)]
i965/gen6+: Avoid recomputing whether we use noperspective.

Improves VS state change microbenchmark performance 2.38246% +/-
1.15046% (n=20).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965/gen7: Skip checking if we need a GS program for now.
Eric Anholt [Wed, 15 Feb 2012 18:55:02 +0000 (10:55 -0800)]
i965/gen7: Skip checking if we need a GS program for now.

We always say no.  Improves VS state change microbenchmark performance
7.68747% +/- 1.40826% (n=10).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Compute required barycentric interp modes once at FS compile time.
Eric Anholt [Wed, 15 Feb 2012 05:48:43 +0000 (21:48 -0800)]
i965: Compute required barycentric interp modes once at FS compile time.

Improves VS state change microbenchmark performance 1.78817% +/-
0.556878% (n=25).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Move VUE map computation to once at VS compile time.
Eric Anholt [Mon, 13 Feb 2012 18:08:23 +0000 (10:08 -0800)]
i965: Move VUE map computation to once at VS compile time.

With this and the previous patch, 640x480 nexuiz is running 0.169118%
+/- 0.0863696% faster (n=121).  On a VS state change microbenchmark,
performance is increased 8.28645% +/- 0.460478% (n=52).

v2: Fix CACHE_NEW_VS comment.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agoi965: Make the userclip flag for the VUE map come from VS prog data.
Eric Anholt [Mon, 13 Feb 2012 18:00:14 +0000 (10:00 -0800)]
i965: Make the userclip flag for the VUE map come from VS prog data.

This reduces recomputation of state based on non-clipping-related
transform changes, and is a step toward removing VUE map
recomputation.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
12 years agomesa: fix issues with texture border and array textures
Anuj Phogat [Wed, 15 Feb 2012 23:40:51 +0000 (15:40 -0800)]
mesa: fix issues with texture border and array textures

For a 1D texture array, the border only applies to the width.  For a 2D
texture array the border applies to the width and height but not the depth.
Sucha cases were  not handled correctly in _mesa_init_teximage_fields().

Note: This is a candidate for stable branches

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>