Age | Commit message (Collapse) | Author |
|
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
|
|
|
|
Conflicts:
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_draw_upload.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_state_derived.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_clear.c
|
|
|
|
Now SWTCL renders at least "something", we're close...
|
|
Taken over from c9928ac3ee5dc0d10127388f9312779a6c59da7c.
|
|
Conflicts:
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state_derived.c
|
|
|
|
|
|
Formerly known as vertex_format_state. These two are completely
unrelated when using HWTCL and decoupling them makes the design
less SWTCL-centric.
When bypass_vs_clip_and_viewport gets removed, the PSC setup will
no longer be a derived state.
This change shouldn't make unbreaking SWTCL harder.
|
|
Also cleaning up the nasty validation process.
|
|
|
|
|
|
The first non-state atom. It's better and cleaner to have it.
|
|
Maintaining a closer relationship between the atom size and what's passed
in BEGIN_CS.
|
|
The only practical limits are the ones derived from the currently-set
framebuffer state.
|
|
It wasn't such a good idea to remove it. :/
|
|
|
|
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
|
|
Needs testing.
|
|
This reverts commit fff5be8e7b4557c221f2425dcafc2e7cbbba76ba.
Probably went too soon with this, dileX reported OA not working for him
it works here fine, but the optimisations I wanted aren't working properly
yet so I'll fix that now.
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
This creates a cleaner winsys and drop the simple screen stuff.
It makes r300g use pb_bufmgr structs and adds usage of the cached
bufmgr for vertex/index buffers.
It also avoids mapping too often.
I'm not 100% sure this is perfect but it won't find its own bugs.
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
|
|
|
|
|
|
|
|
Emit as few regs as possible.
|
|
Some emits are not needed anymore.
|
|
Not supported by r300.
|
|
|
|
|
|
|
|
Might help with compiz being funky with MRTs.
|
|
|
|
Already emitted in r300_emit_draw_xxx.
|
|
This reverts commit 627a45848faf9e6d19d386b9eb30d36bf18d0998.
I was wrong. Who could have known? :3
|
|
Bisected so that only this commit has to be reverted if I'm wrong.
...Pfft, like I'm ever wrong. :3
|
|
|
|
progs/tests/drawbuffers should work, except I can't test it. GG new
shader parser. GG.
|
|
There might be some optimizations possible here...
|
|
|
|
At least one extraneous dirty was eliminated, as well as the chance for
avoiding dirty on shader change.
|
|
Some delicious hax here.
|
|
Based on Marek's immd-mode patch.
|
|
This reverts commit 112239e9a66a155d36fe2ad0ab130e6f26eff298.
|
|
Nearly 100% performance increase in glxgears.
|
|
|
|
I was being lazy on Sunday morning, Droste on irc called me on it ;-)
|
|
I swear ipers runs here after this commit.
After we flush we need to redo the space check
|
|
This fixes the code space checking VBOs, then resetting the space list
and space checking other buffers. it fixes demos/ipers
Signed-off-by: Dave Airlie <airlied@redhat.com>
|