182c42c8da
Merge branch '7.8'
...
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/mesa/state_tracker/st_cb_drawpixels.c
2010-03-22 09:07:46 -06:00
ca97f8b9ba
glslcompiler: fix build breakage
2010-03-22 09:00:13 -06:00
5cb4a3524b
mesa: remove return, do as the comment says
2010-03-22 08:23:14 -06:00
361e8e9118
mesa: Add end of line to the end of a debug output.
2010-03-22 15:16:02 +02:00
4ea694a26b
r200: Fix emit size prediction to account elt splitting.
...
Emit sizes prediction didn't account for render splitting in
hwtnl path.
2010-03-21 23:39:55 +02:00
0900544fb5
r200: Don't flush when closing elts in KMS.
...
Flush in middle of rendering in KMS is not allowed because
buffers are discarded in flush.
Fixes crash when emiting split indices with RADEON_DEBUG=all.
2010-03-21 23:39:53 +02:00
9fc6c8b831
r300g: disable tiling for YUV formats
2010-03-21 22:17:14 +01:00
8bf9842fac
r300g: fix scons build
2010-03-21 22:05:27 +01:00
7733bac66c
r300g: accelerate blitting for all 64-bit texture formats
2010-03-21 21:54:07 +01:00
12dc497173
r300g: add and enable square microtiling
...
It requires DRM 2.1.0 (e.g. kernel 2.6.34) and is disabled on older ones.
Finally, the texture tiling implementation is now complete. Uff.
2010-03-21 21:54:07 +01:00
33d2349119
r300g: cleanup tiling flags propagation
2010-03-21 21:54:06 +01:00
d0d3abd360
r300g: put common defines into one file
2010-03-21 21:54:06 +01:00
bc5778e202
r300g: remove unused code
2010-03-21 21:54:02 +01:00
1968d8f31d
r200: Fix swtnl fallback to flush pending rendering before transition.
...
Flush after transition would emit wrong state that could cause
wrong state emited for pending rendering operation.
Fixes wan once from extrement tuxracer that is using per vertex
materials.
2010-03-21 20:27:49 +02:00
44e3ec3c05
r200: Fix mixed indetion in r200TclFallback.
2010-03-21 20:27:44 +02:00
a0ce955764
Revert "drm/sw: does not need sw_winsys"
...
This reverts commit 97a694e221
2010-03-21 19:36:28 +02:00
15c7fa460b
Revert "gallium: add soft screen helper"
...
This reverts commit f87a5f6499
2010-03-21 19:33:17 +02:00
f9c0cbd1ad
Revert "drm/sw: just s/softpipe_create_screen/gallium_soft_create_screen/"
...
This reverts commit 5d524cce9c
2010-03-21 19:33:09 +02:00
63aa8a39c4
Revert "fix scons build"
...
This reverts commit 29ec051648
2010-03-21 19:32:40 +02:00
29ec051648
fix scons build
2010-03-21 19:20:15 +02:00
dd120776d1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
2010-03-21 15:37:40 +02:00
59629b413a
Revert "Makefile.template: respect LIBRARY_DEFINES in mkdep"
...
This reverts commit 9ec29e3191
2010-03-21 15:32:50 +02:00
f7273f2a27
nv50: report driver as GLSL capable
...
There's still no hint of optimization in the shaders, but
we support conditionals, loops and even integer opcodes so
it isn't that big a lie.
2010-03-21 14:11:59 +01:00
f2fa4a1888
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa
2010-03-21 15:05:21 +02:00
5d524cce9c
drm/sw: just s/softpipe_create_screen/gallium_soft_create_screen/
...
This partially reverts commit f87a5f6499
2010-03-21 15:03:13 +02:00
1afda5303d
nv50: don't validate arrays on clear
...
The vertex elements and buffers might not be valid anymore.
2010-03-21 13:23:53 +01:00
272bbbffb0
nv50: get rid of the static_init stateobj
...
Relocations of per-screen buffers are now emitted directly,
and include the necessary method to get changes in constbuf
addresses committed to the hw.
It should also be a bit cheaper than the way stateobjs emit
relocation markers, use a little less pushbuf space.
2010-03-21 13:23:47 +01:00
f87a5f6499
gallium: add soft screen helper
2010-03-21 13:21:46 +02:00
c28f5f98d6
dri1_api: need not include drm.h
2010-03-21 13:21:46 +02:00
97a694e221
drm/sw: does not need sw_winsys
2010-03-21 13:21:46 +02:00
016c5c953f
drm/sw: llvmpipe texture_from_handle
...
Not sure, but judging by softpipe, this hook was forgotten.
2010-03-21 13:21:46 +02:00
9ec29e3191
Makefile.template: respect LIBRARY_DEFINES in mkdep
2010-03-21 13:21:45 +02:00
a13bcf945f
rename dri_sw to drisw_util for consistency
2010-03-21 13:21:45 +02:00
0b932284f2
dri_inteface: add define for checking presence of drm.h
...
__NOT_HAVE_DRM_H is a like a feature, defined by default on specific platforms
and allows to be defined externally as well.
__NOT_HAVE_DRM_H should only be used by xserver and mesa swrast_dri drivers
2010-03-21 13:21:45 +02:00
2b5a6e083c
glx: minor cosmetic
2010-03-21 13:21:45 +02:00
2d1641b191
glx: swapBuffers prototype has changed
2010-03-21 13:21:45 +02:00
9a7acbccfb
vbo: Fix vbo_split_copy to pass correct max_index to draw.
...
vbo_split_copy was passing one past the max_index to draw function
which caused _tnl_draw_prims function to read uninitialized values
from copied array.
Bug was spoted in valgrind report of progs/tests/cva_huge.
2010-03-21 13:18:36 +02:00
c48226e81d
dri/nouveau: Reemit the light model state when lighting goes on/off.
2010-03-21 11:49:46 +01:00
7f1f4c14ec
dri/nouveau: Random cleanups.
2010-03-21 11:49:20 +01:00
bb324182fc
r300g: fix occlusion query hangs.
...
Okay need to revist the whole OQ stuff anyways, glean test asserts
which is never good.
I'm liking the cached bufmgr restrictions less and less, I think I'll
probably play with the fence and/or busy stuff ASAP and try and clean it up.
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-21 19:39:28 +10:00
ff1c7baad2
r300g: add bufmgr cached for vertex/index buffers.
...
This adds the cached bufmgr for vertex/index buffers on top of the kernel
manager.
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-21 19:39:28 +10:00
0dab3189e1
gallium: cached bufmgr add map busy check
...
Suggested by Jose on the list, probably not perfect but will let me get
past this for now, testing with a fenced bufmgr on top of this, was slower,
Also this doesn't let you do the busy early exit optimisation either from
what I can see.
Signed-off-by: Dave Airlie <airlied@redhat.com >
2010-03-21 19:38:41 +10:00
12deb9e6ca
Merge remote branch 'origin/gallium-st-api-dri'
2010-03-21 16:32:34 +08:00
162bc831c9
r300g: align misaligned ushort vertex indices
2010-03-21 05:42:50 +01:00
53ca4f8401
r300g: fix misaligned generated offset for ubyte vertex indices
2010-03-21 05:42:49 +01:00
04de5f4b8b
r300g: split the vertex buffer alignment validation
2010-03-21 02:19:55 +01:00
951d89ae3a
r300g: skip null vertex buffers
2010-03-21 02:19:55 +01:00
7b38f946a0
r300/compiler: fix assertion failure in the r500-fragprog emission path
2010-03-21 02:06:44 +01:00
44cfc4ad74
r300g: Bump immediate limits.
...
Seems like a decent idea, especially since the big barrier now is
getting the VBOs back from the VRAM boundary.
2010-03-20 17:18:22 -07:00
4711aa089e
r300g: Correctly hax max_index on pipe_vertex_buffers.
...
Still not happy with this, but at least things seem to work.
2010-03-20 17:16:46 -07:00
Brian Paul