Commit graph

21865 commits

Author SHA1 Message Date
José Fonseca
2a1f29c220 gallium: Use consistent semantics for map ranges in gallium.
Which are slightly different from ARB_map_buffer_range semantics, since
gallium still supports more than one mapping of the same buffer.
2009-03-04 17:48:26 +00:00
José Fonseca
99a540bfbe Merge commit 'origin/master' into gallium-map-range 2009-03-04 17:42:36 +00:00
Keith Whitwell
368ca83a3f vbo: second attempt - avoid getting buffer_ptr and buffer_map out of sync 2009-03-04 17:01:47 +00:00
José Fonseca
67cbe83a72 Merge commit 'origin/master' into gallium-map-range 2009-03-04 16:44:31 +00:00
José Fonseca
89f1f8f0b8 mesa: Clear cache->trans after destroying the transfer. 2009-03-04 16:43:45 +00:00
José Fonseca
50e38b0878 mesa: Clear cache->trans after destroying the transfer. 2009-03-04 16:43:13 +00:00
Brian Paul
ca06c0c16d cell: update cell driver after gallium reference count changes 2009-03-04 09:34:46 -07:00
Keith Whitwell
fba923ff44 Revert "vbo: avoid getting buffer_ptr and buffer_map out of sync"
This fixed a minor bug but broke everything else.

This reverts commit 579ef8ab19.
2009-03-04 16:09:14 +00:00
José Fonseca
e80d330419 gallium: Ensure map ranges are valid. 2009-03-04 16:07:51 +00:00
Keith Whitwell
579ef8ab19 vbo: avoid getting buffer_ptr and buffer_map out of sync 2009-03-04 16:06:05 +00:00
José Fonseca
5b04939b16 Merge commit 'origin/master' into gallium-map-range 2009-03-04 15:23:35 +00:00
Keith Whitwell
f9ce417aaf vbo: use FLUSH_UPDATE_CURRENT flag to indicate whether the vbo module is active
Add asserts for expected values on wakeup and flush.  Remove cases where
this flag is set or cleared except when waking up and flushing vbo module.
2009-03-04 15:17:16 +00:00
Brian Paul
945dcbfca6 mesa: include mfeatures.h
See bug 20319.
2009-03-04 07:58:38 -07:00
José Fonseca
cfd5298f24 mesa: Implement and use FlushMappedBufferRange. 2009-03-04 11:59:00 +00:00
Michel Dänzer
45bde75bd6 gallium: Remove some superfluous instances of #include "p_inlines.h". 2009-03-04 11:58:52 +01:00
Michel Dänzer
5e27cd46c0 gallium: Unify reference counting.
The core reference counting code is centralized in p_refcnt.h.

This has some consequences related to struct pipe_buffer:

* The screen member of struct pipe_buffer must be initialized, or
  pipe_buffer_reference() will crash trying to destroy a buffer with reference
  count 0. u_simple_screen takes care of this, but I may have missed some of
  the drivers not using it.
* Except for rare exceptions deep in winsys code, buffers must always be
  allocated via pipe_buffer_create() or via screen->*buffer_create() rather
  than via winsys->*buffer_create().
2009-03-04 11:58:48 +01:00
Corbin Simpson
60041203d5 r300-gallium, radeon-gallium: Continue migration to DRI2 state_tracker, part 2.
Almost there. glxinfo still works, and AFAICT so does trivial/clear.
2009-03-03 22:16:24 -08:00
Corbin Simpson
9e67b0a174 r300-gallium, radeon-gallium: Begin migration to DRI2 state tracker, part 1.
s/migration/migrane/ , actually. Anyway, this has working glxinfo...
2009-03-03 22:16:24 -08:00
Brian Paul
a255472ee7 mesa: include main/dd.h in t_vb_points.c and t_vp_build.c
For some reason makedepend doesn't seem to find the dependency on this
header in these two files.  Directly including the header is a work-around.
2009-03-03 20:45:45 -07:00
Jakob Bornecrantz
145aa57e45 st/dri2: Fake frontbuffer changes
Front buffer rendering works as it stands but it completely
	wrong. But as it stands fake front buffer rendering is
	completely broken. So we keep it as it is. But lets atleast
	handle it in the get buffers code.
2009-03-04 00:39:59 +01:00
Jakob Bornecrantz
28c325f8d3 st/dri2: Hook up flush_frontbuffer
Doesn't do anything because we can't tell the X server about
	any changes to the fake front buffer.
2009-03-04 00:35:33 +01:00
Jakob Bornecrantz
b7b046150b st/dri2: We are strictly a dri2 driver 2009-03-04 00:31:35 +01:00
Jakob Bornecrantz
16526b7099 st/drm: s/hocks/hooks/ 2009-03-03 22:18:14 +01:00
Brian Paul
3873ffe27d gallium: remove old state tracker renderbuffer attachment assertion
Not needed since renderbuffers are ref-counted.
Fixes progs/demos/shadowtex.
2009-03-03 14:01:49 -07:00
Brian Paul
c37872d8c0 xlib: code to force fixed function -> shader translation (for debug, disabled) 2009-03-03 14:01:10 -07:00
Brian Paul
de1caa5507 mesa: fix sw fallback state validation bug
When a hw driver fell back to swrast, swrast wasn't always getting informed
of program changes.  When fixed function is translated into shaders, flags
like _NEW_LIGHT, _NEW_TEXTURE, etc. should really signal _NEW_PROGRAM.
In this case, swrast wasn't seeing _NEW_PROGRAM when new fragment shaders
were generated.
2009-03-03 13:55:25 -07:00
José Fonseca
004d8f1188 mesa: Massage the interface to more closely resemble ARB_map_buffer_range 2009-03-03 18:52:51 +00:00
José Fonseca
190db8b4c3 gallium: Massage the interface to more closely resemble ARB_map_buffer_range 2009-03-03 18:52:16 +00:00
José Fonseca
317a7da2c4 wgl: Support the same combinations of single buffer pixel formats. 2009-03-03 17:56:22 +00:00
José Fonseca
1d4d27802d Merge commit 'origin/master' into gallium-map-range 2009-03-03 15:43:12 +00:00
Keith Whitwell
39a1a24b3f demos/engine: respect display list mode when drawing pistons 2009-03-03 15:40:14 +00:00
Dan Nicholson
4737a9fa25 autoconf: Update config.guess and config.sub from upstream
Grabbed the latest copies from the GNU config repo at
http://git.savannah.gnu.org/cgit/config.git .
2009-03-03 06:55:15 -08:00
José Fonseca
c7e46c1857 Merge commit 'origin/master' into gallium-map-range 2009-03-03 13:18:15 +00:00
José Fonseca
dceb09909e Merge commit 'origin/gallium-0.1'
Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
2009-03-03 12:26:21 +00:00
José Fonseca
efcea15aaa pipebuffer: Cleanup merge. 2009-03-03 12:25:41 +00:00
Keith Whitwell
0f3d226143 winsys: return null for DONTBLOCK flag on existing winsys
Add code so that existing driver behaviour doesn't change.
2009-03-03 12:11:08 +00:00
Keith Whitwell
9a9dc422b0 pb: fix up merge mistakes 2009-03-03 12:10:56 +00:00
José Fonseca
9036e0d724 pipebuffer: Fix copy'n'paste typo. 2009-03-03 12:01:01 +00:00
Keith Whitwell
916de35d67 Merge commit 'origin/gallium-0.1'
Conflicts:

	scons/gallium.py
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/include/pipe/p_defines.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_exec_draw.c
2009-03-03 11:51:14 +00:00
Keith Whitwell
2785af803f vbo: missing line from previous commit 2009-03-03 10:55:25 +00:00
Keith Whitwell
2e29b7d0f8 mesa/st: implement MapBufferRange callback
Using PIPE_BUFFER_USAGE_DONTBLOCK.
2009-03-03 10:47:31 +00:00
Keith Whitwell
c4d1f4607a vbo: use MapBufferRange where available
Previously would have to allocate a new VBO after firing a draw command
as subsequent call to Map() on old VBO might block if the driver had
submitted the commands to hardware.
2009-03-03 10:46:12 +00:00
Keith Whitwell
eb8a1d9642 mesa: add MapBufferRange driver callbacks
Will be needed in coming GL extensions (GL_map_buffer_range, GL 3.0).
Will be used by the vbo module to avoid reallocating vbo's at each
draw primitive call.
2009-03-03 10:44:35 +00:00
Keith Whitwell
c64a2b7089 mesa: Add BeginVertices driver call
Provides notification to the VBO modules prior to the first immediate call.
Pairs with FlushVertices()
2009-03-03 10:41:57 +00:00
Jakob Bornecrantz
72cf6e8e92 intel: Add Xorg driver 2009-03-03 03:24:31 +01:00
Jakob Bornecrantz
4a1b8cbab8 intel: Add dri2 driver for gallium 2009-03-03 03:23:32 +01:00
Jakob Bornecrantz
84711c6582 st/xorg: Add Xorg state tracker 2009-03-03 03:22:46 +01:00
Jakob Bornecrantz
1d060e36f2 st/dri2: Add DRI2 a state tracker
This was based of the unfinnished code that Keith
	Whitwell started on but never finnished. I moved
	the code from the glx directory because dri drivers
	can be used for more things then just glx.
2009-03-03 03:22:05 +01:00
Jakob Bornecrantz
cc9fbb16a6 intel: Increase max relocs per batchbuffer 2009-03-03 03:19:49 +01:00
Brian Paul
a3b7db0326 mesa: save some useful VBO debug/dump code (disabled) 2009-03-02 17:55:09 -07:00