OSDN Git Service
Matt Turner [Tue, 14 Aug 2012 19:24:31 +0000 (12:24 -0700)]
build: Require X11 pkg-config files
Marek Olšák [Thu, 16 Aug 2012 18:36:40 +0000 (20:36 +0200)]
r600g: disable tiling for 422 formats again
Marek Olšák [Tue, 7 Aug 2012 01:30:43 +0000 (03:30 +0200)]
r600g: fix blits of subsampled formats
Marek Olšák [Thu, 16 Aug 2012 17:05:22 +0000 (19:05 +0200)]
r600g: fix copying between NPOT mipmapped compressed textures
We aligned the dimensions to the blocksize, then divided by it
(in r600_blit.c), then minified, which was wrong.
The minification must be done first, not last.
This fixes piglit/fbo-generatemipmap-formats with S3TC and maybe
a bunch of other tests too. Tested on RV730.
Marek Olšák [Wed, 15 Aug 2012 17:06:04 +0000 (19:06 +0200)]
r600g: make F2U trans-only on r600-r700
This fixes a failing assertion in r600_asm.c.
Marek Olšák [Tue, 14 Aug 2012 20:10:35 +0000 (22:10 +0200)]
r600g: set CB_COLOR_INFO to INVALID for disabled colorbuffers on r600-r700
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Marek Olšák [Tue, 14 Aug 2012 00:29:17 +0000 (02:29 +0200)]
r600g: rename r600_resource_texture to r600_texture
Marek Olšák [Tue, 14 Aug 2012 00:22:13 +0000 (02:22 +0200)]
r600g: always put tiled textures in VRAM
Marek Olšák [Sun, 12 Aug 2012 16:40:33 +0000 (18:40 +0200)]
r600g: cleanup r600_resource_texture in favor of radeon_surface
Marek Olšák [Sun, 12 Aug 2012 16:36:52 +0000 (18:36 +0200)]
r600g: remove unused parameter in r600_texture_create_object
Marek Olšák [Sun, 12 Aug 2012 16:22:42 +0000 (18:22 +0200)]
r600g: fixup the usage flag for the flushed depth texture
Philipp Brüschweiler [Wed, 15 Aug 2012 16:14:44 +0000 (18:14 +0200)]
wayland-drm: close fd after the display is uninitialized
This fixes a "kernel rejected pushbuf: Bad file descriptor" error on
wl_drm display destruction.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
José Fonseca [Wed, 15 Aug 2012 18:24:58 +0000 (19:24 +0100)]
scons: Fix MinGW cross compilation.
Compensate for the recent changes and assumptions added to
Makefiles.sources
Tom Stellard [Thu, 16 Aug 2012 15:49:31 +0000 (15:49 +0000)]
radeon/llvm: Lower implicit parameters before ISel
Brian Paul [Thu, 16 Aug 2012 15:16:42 +0000 (09:16 -0600)]
gallium/draw: move misplaced brace
Brian Paul [Fri, 10 Aug 2012 16:36:17 +0000 (10:36 -0600)]
mesa: raise GL_INVALID_OPERATION in glGenerateMipmap for missing base image
This seems to be expected by the WebGL texture-mips test. The error makes
sense, but I haven't found (yet) any OpenGL documentation specifying this
error condition.
See http://bugs.freedesktop.org/show_bug.cgi?id=44912
Note: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
r600: update sampler, sampler_view code for the future
For when we have pipe->set_sampler_states(pipe, shader, start, num, samplers),
etc.
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
rbug: update data structures, functions for future changes
To support geom/compute/etc shaders, samplers, sampler views, etc.
To support pipe->bind_sampler_states() w/ start_slot.
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
gallium/trace: add 'start' parameter to bind_sampler_states/views()
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
gallium/identity: add 'start' parameter to bind_sampler_states/views()
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
galahad: add 'start' parameter to bind_sampler_states/views()
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
svga: add 'start' parameter to bind_sampler_states/views()
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
llvmpipe: add 'start' parameter to bind_sampler_states/views()
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
softpipe: add 'start' parameter to bind_sampler_states/views()
To support updating a sub-range of sampler states/views in the future.
Note that we always pass start=0 at this time.
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
gallium/trace: consolidate sampler, sampler_view code
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
gallium/identity: consolidate sampler, sampler_view code
This will simplify things when the pipe_context functions are consolidated.
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
st/mesa: add support for GS textures and samplers
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
st/mesa: combine vertex/fragment sampler state in arrays
As with other recent changes, put the vertex and fragment sampler state
into arrays indexed by the shader type. This will let us easily add
support for other types of shaders in the future.
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
gallium: remove PIPE_MAX_VERTEX/GEOMETRY_SAMPLERS #define
PIPE_MAX_SAMPLERS, PIPE_MAX_VERTEX_SAMPLERS and PIPE_MAX_GEOMETRY_SAMPLERS
were all defined to the same value (16).
In various places we're creating arrays such as
sampler_views[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS] so we were assuming
the same number of max samplers for all shader stages anyway.
Of course, drivers are still free to advertise different numbers of max
samplers for different shaders.
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
draw: index samplers and sampler_view state by shader type
So that we can handle GS state and other types of shaders in the future.
Brian Paul [Fri, 10 Aug 2012 02:59:44 +0000 (20:59 -0600)]
draw: move tgsi-related state into a tgsi sub-struct
To better organize things a bit.
Brian Paul [Fri, 10 Aug 2012 02:59:43 +0000 (20:59 -0600)]
gallium: add a shader stage/type param to some draw functions
To prepare for geometry shader texture support in the draw module.
Note: we still only handle the vertex shader case.
Brian Paul [Thu, 16 Aug 2012 15:00:08 +0000 (09:00 -0600)]
st/mesa: silence signed/unsigned comparison warning
Brian Paul [Thu, 9 Aug 2012 16:14:51 +0000 (10:14 -0600)]
svga: move result->key expression after result != NULL check
Brian Paul [Thu, 9 Aug 2012 16:14:51 +0000 (10:14 -0600)]
svga: fix result==NULL logic in emit_fs_consts()
The previous test for result != NULL was kind of bogus since we dereferenced
the pointer earlier in the code. Now, check for result != NULL first, then
get the result->key info.
Also, remove the useless "offset +=" code at the end.
Brian Paul [Thu, 9 Aug 2012 16:14:51 +0000 (10:14 -0600)]
svga: update comment (s/SVGA_NEW_VS_RESULT/SVGA_NEW_VS_PRESCALE/)
Brian Paul [Thu, 9 Aug 2012 16:14:51 +0000 (10:14 -0600)]
svga: rename svga_hw_vs_parameters -> svga_hw_vs_constants
and similarly for svga_hw_fs_parameters
Niels Ole Salscheider [Sun, 12 Aug 2012 16:35:10 +0000 (18:35 +0200)]
st/mesa: index can be negative in the PROGRAM_CONSTANT case
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
Brian Paul [Thu, 16 Aug 2012 14:55:48 +0000 (08:55 -0600)]
mesa: add cast to silence warning in _mesa_pack_rgba_span_from_ints()
Brian Paul [Thu, 16 Aug 2012 14:53:55 +0000 (08:53 -0600)]
meta: remove unused variable
Michel Dänzer [Thu, 16 Aug 2012 08:37:44 +0000 (10:37 +0200)]
radeonsi: Fix symbol conflicts with r600g.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50389
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Wed, 15 Aug 2012 15:18:30 +0000 (17:18 +0200)]
radeonsi: Fix memory leaks if returning early from some state functions.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Wed, 15 Aug 2012 16:22:46 +0000 (18:22 +0200)]
radeonsi: Fix LLVM context leak.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Wed, 15 Aug 2012 13:59:07 +0000 (15:59 +0200)]
gallium/radeon: Don't assign virtual address space for BO that already has one.
We'd end up re-using the old one and throwing away the new one anyway, but only
after a roundtrip to the kernel.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Wed, 15 Aug 2012 13:48:34 +0000 (15:48 +0200)]
gallium/radeon: Create hole for waste when allocating from va_offset.
Otherwise, the wasted area could never be used for an allocation again.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Thu, 26 Apr 2012 10:10:02 +0000 (12:10 +0200)]
gallium/radeon: Fix potential address space loss in radeon_bomgr_force_va().
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Thu, 26 Apr 2012 18:41:17 +0000 (20:41 +0200)]
gallium/radeon: Delete uppermost virtual address space hole if it's at the top.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Thu, 26 Apr 2012 09:44:11 +0000 (11:44 +0200)]
gallium/radeon: Fix losing holes when allocating virtual address space.
If a hole exactly matches the allocated size plus alignment, we would fail to
preserve the alignment as a hole. This would result in never being able to use
the alignment area for an allocation again.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Thu, 26 Apr 2012 13:26:01 +0000 (15:26 +0200)]
gallium/radeon: Merge holes when freeing virtual address space.
Otherwise we'll likely end up with an ever increasing amount of ever smaller
holes.
Requires keeping the list ordered wrt offsets.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Michel Dänzer [Fri, 3 Aug 2012 09:31:55 +0000 (11:31 +0200)]
gallium/radeon: Make va_offset 64 bits wide.
Otherwise we'd wrap around after 32 bits. The kernel currently limits GPU
virtual address space to 4GB anyway, but that will probably change sooner or
later, and this would result in confusing error messages when running out of
virtual address space even now.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Vinson Lee [Sun, 12 Aug 2012 07:20:21 +0000 (00:20 -0700)]
llvmpipe: Silence Coverity incorrect sizeof expression defect.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Vinson Lee [Sun, 12 Aug 2012 07:02:32 +0000 (00:02 -0700)]
scons: Add option to enable floating-point textures.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Dave Airlie [Fri, 12 Mar 2010 06:09:23 +0000 (16:09 +1000)]
glx/dri2: add dri2 prime support.
This adds support for having libGL pick a different driver for prime support.
DRI_PRIME env var is set to the value retrieved from the server randr
provider calls, by the calling process. (generally DRI_PRIME=1 will be
the right answer).
Signed-off-by: Dave Airlie <airlied@redhat.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:49:44 +0000 (22:49 +0200)]
radeon/llvm: Enable if-cvt
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:49:43 +0000 (22:49 +0200)]
radeon/llvm: Add callbacks needed by if-cvt
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:49:42 +0000 (22:49 +0200)]
radeon/llvm: Lower branch/branch_cond into predicated jump
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:49:41 +0000 (22:49 +0200)]
radeon/llvm: Add a predicated JUMP instruction
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:49:40 +0000 (22:49 +0200)]
radeon/llvm: Support for predicate bit
Tom Stellard:
- A few changes to predicate register defs
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Fri, 3 Aug 2012 22:15:51 +0000 (00:15 +0200)]
r600g: Glue to handle predicate aware output from llvm
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:52:54 +0000 (22:52 +0200)]
r600g: Fix instruction group merge when there are predicated insts.
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:52:53 +0000 (22:52 +0200)]
radeon/llvm: Do not use PV/PS if PRED_SEL does not match
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Vincent Lejeune [Wed, 1 Aug 2012 20:52:52 +0000 (22:52 +0200)]
r600g: Add support for predicates
Signed-off-by: Tom Stellard <thomas.stellard@amd.com>
Christian König [Sun, 12 Aug 2012 17:42:38 +0000 (19:42 +0200)]
radeonsi: move ps sampler state into PM4 stream
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Christian König [Sun, 12 Aug 2012 17:32:51 +0000 (19:32 +0200)]
radeonsi: move ps sampler views into PM4 stream
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Christian König [Sun, 12 Aug 2012 17:26:24 +0000 (19:26 +0200)]
radeonsi: move vertex state descriptors into PM4 stream
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Christian König [Sun, 12 Aug 2012 17:16:48 +0000 (19:16 +0200)]
radeonsi: add shader data infrastructure
With this we can embed data for the shaders (like resource
descriptors) into the PM4 stream.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Christian König [Sun, 12 Aug 2012 18:06:21 +0000 (20:06 +0200)]
radeon/llvm: add support to fetch temps as vectors
Necessary for texture fetches with temp regs as source on SI.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tom Stellard [Thu, 26 Jul 2012 19:20:14 +0000 (19:20 +0000)]
radeon/llvm: Remove AMDGPUUtil.cpp
Apostolos Bartziokas [Thu, 26 Jul 2012 19:00:20 +0000 (15:00 -0400)]
radeon/llvm: Cleanup AMDGPUUtil.cpp
Tom Stellard [Thu, 26 Jul 2012 14:30:23 +0000 (14:30 +0000)]
radeon/llvm: Lower loads from USE_SGPR adddress space during DAG lowering
Tom Stellard [Wed, 25 Jul 2012 19:17:16 +0000 (19:17 +0000)]
radeon/llvm: Add live-in registers during DAG lowering
Psuedo instructions emulating live-in registers have been removed
and their corresponding intrinsics are now being lowered during DAG
lowering.
Tom Stellard [Thu, 26 Jul 2012 17:10:47 +0000 (17:10 +0000)]
radeon/llvm: Lower store_output intrinsic during DAG lowering
Tom Stellard [Wed, 15 Aug 2012 18:19:27 +0000 (18:19 +0000)]
radeon/llvm: Force VTX_READ instructions to use same reg for src and dst
I was seeing some GPU hangs that seemed to be cause by ALU instructions
writing to the same register used as the source for VTX_READ. Adding
this constraint to the VTX_READ instructions avoids this situation.
Marek Olšák [Wed, 15 Aug 2012 18:03:23 +0000 (20:03 +0200)]
radeonsi: fix build breakage after u_blitter changes
Marek Olšák [Mon, 13 Aug 2012 21:37:30 +0000 (23:37 +0200)]
gallium/u_blitter: document custom meta helpers
Marek Olšák [Wed, 15 Aug 2012 17:11:51 +0000 (19:11 +0200)]
r600g: disable handling of DISCARD_RANGE
https://bugs.freedesktop.org/show_bug.cgi?id=53130
Marek Olšák [Thu, 5 Jul 2012 18:06:41 +0000 (20:06 +0200)]
r600g: implement timestamp query and get_timestamp hook
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Marek Olšák [Thu, 9 Aug 2012 15:22:35 +0000 (17:22 +0200)]
r600g: enable MSAA on evergreen by default
v2: add the DRM version check
Marek Olšák [Thu, 9 Aug 2012 15:21:56 +0000 (17:21 +0200)]
r600g: implement copying between MSAA textures
Marek Olšák [Thu, 9 Aug 2012 15:21:10 +0000 (17:21 +0200)]
r600g: implement MSAA color resolve
Marek Olšák [Thu, 9 Aug 2012 15:17:18 +0000 (17:17 +0200)]
r600g: implement MSAA depth-stencil decompression and resolve
and integer textures, which are resolved the same as depth, I think.
Marek Olšák [Thu, 9 Aug 2012 15:01:46 +0000 (17:01 +0200)]
r600g: implement TXQ_LZ opcode
Marek Olšák [Thu, 9 Aug 2012 14:48:45 +0000 (16:48 +0200)]
r600g: implement MSAA rendering and texturing for evergreen and cayman
Marek Olšák [Sun, 22 Jul 2012 05:48:52 +0000 (07:48 +0200)]
r600g: implement set_sample_mask
Marek Olšák [Sun, 22 Jul 2012 04:36:58 +0000 (06:36 +0200)]
r600g: implement alpha-to-coverage
Marek Olšák [Fri, 3 Aug 2012 23:50:10 +0000 (01:50 +0200)]
r600g: implement alpha-to-one
Marek Olšák [Sat, 4 Aug 2012 12:29:25 +0000 (14:29 +0200)]
r600g: remove support for 3-channel colorbuffers
We have no sampler support for them.
Marek Olšák [Sun, 12 Aug 2012 15:18:23 +0000 (17:18 +0200)]
configure.ac: bump libdrm_radeon requirement to 2.6.38
Marek Olšák [Sat, 4 Aug 2012 18:02:30 +0000 (20:02 +0200)]
winsys/radeon: print error if CS is overflowed
and don't submit the CS to the kernel.
Marek Olšák [Sat, 4 Aug 2012 01:15:29 +0000 (03:15 +0200)]
gallium/u_blitter: implement X and Y texture flipping
Marek Olšák [Wed, 25 Jul 2012 10:38:22 +0000 (12:38 +0200)]
gallium/u_blitter: implement blitting multisample resources
It can blit only one sample at a time (it should be called in a loop).
Marek Olšák [Sat, 28 Jul 2012 11:29:02 +0000 (13:29 +0200)]
gallium: add TGSI support for multisample textures
The only allowed instructions are TXQ_LZ and TXF.
TXQ_LZ is like TXQ, but without the LOD parameter (which is always zero
with MSAA textures)
The 3rd or the 4th texcoord component in TXF should contain the sample index
for a 2D_MSAA or 2D_ARRAY_MSAA texture, respectively.
Marek Olšák [Sat, 4 Aug 2012 17:11:44 +0000 (19:11 +0200)]
gallium/tgsi: fix TGSI text parser
The problem was that the string matching succeeded e.g. for "2D" when there
was actually "2D_MSAA" and then failed parsing "_MSAA".
To prevent similar failures in the future, let's fix this kind of error
everywhere.
Marek Olšák [Sun, 5 Aug 2012 00:46:41 +0000 (02:46 +0200)]
gallium/u_blit: set dst format from pipe_resource, not pipe_surface
We use it to decide whether we can use resource_copy_region.
NOTE: This is a candidate for the 8.0 branch.
Marek Olšák [Sat, 4 Aug 2012 01:14:14 +0000 (03:14 +0200)]
gallium: make pipe_box signed in order to represent flipped blits
This will be used by u_blitter.
Marek Olšák [Sat, 4 Aug 2012 11:32:21 +0000 (13:32 +0200)]
st/mesa: don't clamp fragment color with integer colorbuffer
Marek Olšák [Sat, 4 Aug 2012 11:37:03 +0000 (13:37 +0200)]
mesa: flush vertices in test_framebuffer_completeness
Michel Dänzer [Wed, 15 Aug 2012 08:49:22 +0000 (10:49 +0200)]
st/egl: Fix up for ClientVersion -> ClientMajorVersion rename.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=53513
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Jordan Justen [Sat, 9 Jun 2012 19:19:11 +0000 (12:19 -0700)]
i965: add ARB_texture_rgb10_a2ui support
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Jordan Justen [Thu, 21 Jun 2012 16:40:47 +0000 (09:40 -0700)]
meta: allow CopyTexSubImage on integer formats
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>