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
Brian Paul
433f2ab2ec
mesa: more tex image debug/dumping code
2009-03-02 17:52:30 -07:00
Brian Paul
d652d26a97
mesa: comments and code documenting a bug with depth 32 TrueColor drawing/reading
...
It seems that XGetImage() from a depth 32 TrueColor window is flakey.
Drawing with XPutImage() instead of XPutPixel() seems to work better, but
still not perfectly.
Keep using the original code for now until more is learned.
2009-03-02 17:51:44 -07:00
Brian Paul
6c75d7b4e6
mesa: move call to update_texture_compare_function()
...
Another conditional can be avoided.
2009-03-02 15:21:50 -07:00
Brian Paul
e232471baa
mesa: fix texture enable regression
...
Need to clear the _ReallyEnabled field before possibly continuing the loop.
Also, set _Current pointer to NULL if the unit is no longer enabled.
Fixes piglit lodbias regression
2009-03-02 15:19:53 -07:00
Brian Paul
7e0f47c134
mesa: use _mesa_reference_texobj() when setting texUnit->Current pointer
...
Fixes piglit copytexsubimage regression.
2009-03-02 14:29:37 -07:00
Brian Paul
97dd2ddbd9
mesa: don't draw arrays if vertex position array is not enabled
...
For regular GL, we must have vertex positions in order to draw. But ES2
doesn't have that requirement (positions can be computed from any array
of data).
See bug 19911.
2009-03-02 12:27:16 -07:00
Brian Paul
f1a083d4b8
gallium: only enable depth test if a depth bufffer is available
2009-03-02 11:51:46 -07:00
Brian Paul
8fec37c0f1
mesa: remove warning/short-circuit of stencil enable w/ no stencil buffer
...
With FBOs one could enable stencil before a stencil buffer is later bound.
2009-03-02 11:49:37 -07:00
Brian Paul
91e61f435a
mesa: use Stencil._Enabled field instead of Stencil.Enabled
2009-03-02 11:49:37 -07:00
Brian Paul
f352a80aec
mesa: add ctx->Stencil._Enabled field
...
Only true if stenciling is enabled, and there's a stencil buffer.
2009-03-02 11:49:37 -07:00
Younes Manton
2755a27d7d
nouveau: Grab correct surface from temp texture for transfers.
2009-03-02 13:05:06 -05:00
Younes Manton
c9fe0f7ab5
g3dvl: Grab surface pointer when flushing front buffer in SP winsys.
2009-03-02 13:05:05 -05:00
Brian Paul
07e50058a5
swrast: use _EnabledCoordUnits for fixed-function texturing
...
Using _EnabledUnits was wrong because it included vertex texture units.
This change plus the prev commit fixes occasional failures of glean/glsl1
vertex texture test failure.
2009-03-02 11:01:16 -07:00
Brian Paul
e68208f262
mesa: fixed computation of _EnabledCoordUnits
...
This field should not include vertex textures. It indicates the coord
inputs for fragment / fixed-function processing.
2009-03-02 10:58:51 -07:00
José Fonseca
050ce17799
pipebuffer: Cleanup code & comments.
2009-03-02 17:45:35 +00:00
José Fonseca
fe64aa0c8e
pipebuffer: Handle PIPE_BUFFER_USAGE_DONTBLOCK flag.
...
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
2009-03-02 17:35:28 +00:00
José Fonseca
cfc3d5c219
gallium: New PIPE_BUFFER_USAGE_DONTBLOCK flag.
...
To prevent blocking when mapping a buffer.
2009-03-02 17:33:25 +00:00
José Fonseca
2c1d40a051
pipebuffer: Wait for the GPU to finish reading too.
...
No real change, as we're not tracking relocations read/write access yet.
2009-03-02 17:32:37 +00:00
José Fonseca
802a5ff507
pipebuffer: Remove unused var.
2009-03-02 17:19:12 +00:00
Brian Paul
e30f765763
mesa: clarify comments for per-unit texture bitfields
2009-03-02 09:44:32 -07:00
Brian Paul
000c3438c9
mesa: move texture_override() code into calling loop
...
We can avoid a few iterations this way.
2009-03-02 09:44:32 -07:00
Brian Paul
ebabdf9920
mesa: move update_texture_compare_function() call out of loop
2009-03-02 09:44:32 -07:00
Brian Paul
555f0a8818
mesa: remove unused AUX buffers
...
Remove all references to aux buffers 1..3. Keep AUX0 around for now just
in case, but it'll probably go too someday. I don't know of any OpenGL
drivers since the IRIX days that support aux color buffers.
2009-03-02 09:44:32 -07:00
Brian Paul
baf2c746c1
mesa: remove VF_SOURCES, simplify MATH_XFORM_SOURCES
2009-03-02 08:05:30 -07:00
Corbin Simpson
b70f344e22
r300-gallium: Clean up casts and indents.
2009-03-01 18:24:40 -08:00
Corbin Simpson
af8a41e5c7
r300-gallium: Split off invariant state.
...
It's kind of like a CSO todo list. :3
2009-03-01 18:12:05 -08:00
Corbin Simpson
8b8e954f9e
r300-gallium: Add RADEON_NO_TCL debugging option.
...
Just like R300_NO_TCL, when set, forces HW TCL off.
2009-02-28 14:07:17 -08:00
Corbin Simpson
0328e838c2
r300-gallium: Fix register count.
2009-02-28 14:01:28 -08:00
Corbin Simpson
ba5f184829
r300-gallium: Fix hardlocks on trivial/clear.
...
I'm so happy I could cry.
2009-02-28 13:27:28 -08:00
Corbin Simpson
731aa326ff
r300-gallium: Use rs_state emit for r300_surface, move a few things around.
...
Also a possible fix for non-TCL chipsets and trivial/clear.
2009-02-28 11:22:40 -08:00
Corbin Simpson
2b7d39da1f
r300-gallium: Move maths from r300_state to r300_state_inlines.
2009-02-28 11:22:40 -08:00
Brian Paul
23682dc629
mesa: just re-order some parts and update comments in sources.mak
2009-02-28 11:56:15 -07:00
Brian Paul
8d475822e6
mesa: rename, reorder FRAG_RESULT_x tokens
...
s/FRAG_RESULT_DEPR/FRAG_RESULT_DEPTH/
s/FRAG_RESULT_COLR/FRAG_RESULT/COLOR/
Remove FRAG_RESULT_COLH (NV half-precision) output since we never used it.
Next, we might merge the COLOR and DATA outputs (COLOR0, COLOR1, etc).
2009-02-28 11:49:46 -07:00