Matt Turner
d12b07eb1a
build: Remove EXTRA_LIB_PATH
...
You can add extra library paths to LDFLAGS directly.
2012-08-16 15:04:54 -07:00
Matt Turner
e273ed37ea
build: Require X11 pkg-config files
2012-08-16 15:04:53 -07:00
Marek Olšák
f36c404f90
r600g: disable tiling for 422 formats again
2012-08-16 20:44:54 +02:00
Marek Olšák
795834432b
r600g: fix blits of subsampled formats
2012-08-16 20:44:54 +02:00
Marek Olšák
6fd9218bb4
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.
2012-08-16 20:44:54 +02:00
Marek Olšák
b8e9cf5d96
r600g: make F2U trans-only on r600-r700
...
This fixes a failing assertion in r600_asm.c.
2012-08-16 20:44:53 +02:00
Marek Olšák
0d7e002815
r600g: set CB_COLOR_INFO to INVALID for disabled colorbuffers on r600-r700
...
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com >
2012-08-16 20:44:53 +02:00
Marek Olšák
951ac46a6a
r600g: rename r600_resource_texture to r600_texture
2012-08-16 20:44:53 +02:00
Marek Olšák
952c905767
r600g: always put tiled textures in VRAM
2012-08-16 20:44:53 +02:00
Marek Olšák
773ff5705f
r600g: cleanup r600_resource_texture in favor of radeon_surface
2012-08-16 20:44:53 +02:00
Marek Olšák
362a25aac5
r600g: remove unused parameter in r600_texture_create_object
2012-08-16 20:44:53 +02:00
Marek Olšák
c4993d15eb
r600g: fixup the usage flag for the flushed depth texture
2012-08-16 20:44:53 +02:00
Philipp Brüschweiler
0efd564a09
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 >
2012-08-16 13:17:06 -04:00
José Fonseca
50dec63790
scons: Fix MinGW cross compilation.
...
Compensate for the recent changes and assumptions added to
Makefiles.sources
2012-08-16 17:21:52 +01:00
Tom Stellard
5f82d19248
radeon/llvm: Lower implicit parameters before ISel
2012-08-16 16:04:51 +00:00
Brian Paul
0d308ef8fe
gallium/draw: move misplaced brace
2012-08-16 09:16:42 -06:00
Brian Paul
f6b7157550
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 >
2012-08-16 09:11:14 -06:00
Brian Paul
d663a557fd
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 >
2012-08-16 09:01:31 -06:00
Brian Paul
10e552d056
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.
2012-08-16 09:01:31 -06:00
Brian Paul
109e87dc6a
gallium/trace: add 'start' parameter to bind_sampler_states/views()
2012-08-16 09:01:31 -06:00
Brian Paul
d4ab8bd095
gallium/identity: add 'start' parameter to bind_sampler_states/views()
2012-08-16 09:01:31 -06:00
Brian Paul
f3cc4990a0
galahad: add 'start' parameter to bind_sampler_states/views()
2012-08-16 09:01:31 -06:00
Brian Paul
bd3733c0be
svga: add 'start' parameter to bind_sampler_states/views()
2012-08-16 09:01:31 -06:00
Brian Paul
c969cb1447
llvmpipe: add 'start' parameter to bind_sampler_states/views()
2012-08-16 09:01:31 -06:00
Brian Paul
25a42f39e3
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.
2012-08-16 09:01:31 -06:00
Brian Paul
348ac08bfd
gallium/trace: consolidate sampler, sampler_view code
2012-08-16 09:01:31 -06:00
Brian Paul
0ad95b923a
gallium/identity: consolidate sampler, sampler_view code
...
This will simplify things when the pipe_context functions are consolidated.
2012-08-16 09:01:31 -06:00
Brian Paul
f3c3aff6ef
st/mesa: add support for GS textures and samplers
2012-08-16 09:01:31 -06:00
Brian Paul
6c8a132158
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.
2012-08-16 09:01:31 -06:00
Brian Paul
cab2fed135
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.
2012-08-16 09:01:31 -06:00
Brian Paul
a2c1df4c9a
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.
2012-08-16 09:01:31 -06:00
Brian Paul
bef196c792
draw: move tgsi-related state into a tgsi sub-struct
...
To better organize things a bit.
2012-08-16 09:01:31 -06:00
Brian Paul
df87fb5913
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.
2012-08-16 09:01:31 -06:00
Brian Paul
a8ed00d5f1
st/mesa: silence signed/unsigned comparison warning
2012-08-16 09:00:08 -06:00
Brian Paul
d733e5da9c
svga: move result->key expression after result != NULL check
2012-08-16 08:58:55 -06:00
Brian Paul
50188adf7d
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.
2012-08-16 08:58:55 -06:00
Brian Paul
d55e0f1ba0
svga: update comment (s/SVGA_NEW_VS_RESULT/SVGA_NEW_VS_PRESCALE/)
2012-08-16 08:58:55 -06:00
Brian Paul
2a5eeeaebe
svga: rename svga_hw_vs_parameters -> svga_hw_vs_constants
...
and similarly for svga_hw_fs_parameters
2012-08-16 08:58:55 -06:00
Niels Ole Salscheider
8cc1860d4a
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 >
2012-08-16 08:56:09 -06:00
Brian Paul
fd41cbc557
mesa: add cast to silence warning in _mesa_pack_rgba_span_from_ints()
2012-08-16 08:55:48 -06:00
Brian Paul
658044cde1
meta: remove unused variable
2012-08-16 08:53:55 -06:00
Michel Dänzer
1b11395a36
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 >
2012-08-16 12:01:16 +02:00
Michel Dänzer
51d9f37a72
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 >
2012-08-16 11:58:24 +02:00
Michel Dänzer
4b64fa2ff1
radeonsi: Fix LLVM context leak.
...
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com >
Reviewed-by: Alex Deucher <alexander.deucher@amd.com >
2012-08-16 11:58:24 +02:00
Michel Dänzer
18abc270c5
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 >
2012-08-16 11:58:24 +02:00
Michel Dänzer
a60be05284
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 >
2012-08-16 11:58:24 +02:00
Michel Dänzer
1f455ef5bc
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 >
2012-08-16 11:58:23 +02:00
Michel Dänzer
6d59b7f6dc
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 >
2012-08-16 11:58:23 +02:00
Michel Dänzer
f5fe81daea
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 >
2012-08-16 11:58:23 +02:00
Michel Dänzer
206d07625c
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 >
2012-08-16 09:39:36 +02:00