summaryrefslogtreecommitdiff
path: root/src/gallium
AgeCommit message (Collapse)Author
2010-03-10Merge branch 'master' into gallium-sampler-viewMichal Krol
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
2010-03-10svga: Disable debug message.Michal Krol
2010-03-10svga: Check if vertex elements has been bound before using it.Michal Krol
2010-03-10softpipe: Prevent NULL dereference.José Fonseca
2010-03-10python: Remove broken link hack.José Fonseca
2010-03-10python: More build fixes.José Fonseca
2010-03-10trace: Make tr_public.h c++ friendly.José Fonseca
2010-03-10target-helpers: remove swrast_xlib.c helperKeith Whitwell
This was a good idea, but ended up tying the build systems in knots. We can revisit this later, in particular if we can put in place dummy implementations of cell_create_screen(), llvmpipe_create_screen() which just return NULL if the driver isn't available. In the meantime, just duplicate this smallish function in the two places it was being called.
2010-03-10ws/xlib: remove dead linesKeith Whitwell
2010-03-10scons: Fixup the libgl-gdi build.José Fonseca
2010-03-10python: Handle the possibility that no driver is selected.José Fonseca
2010-03-10gallium: remove trace module injection from various state trackersKeith Whitwell
Components such as state trackers, drivers, etc, should be free to be recombined in arbtrary ways to build driver stacks. They should not be reaching out and trying to build the stack themselves - this is now expected to be handled by the "target" abstraction.
2010-03-10ws/gdi: add includeKeith Whitwell
2010-03-10target-helpers: helper for injecting common debug layersKeith Whitwell
Add a helper gallium_wrap_screen() for injecting the commonly used extra layers into a gallium stack. Currently that's just the trace module and identity layer, but there could be more in the future, eg. a validation layer.
2010-03-10python: Fix up state tracker for sw api.José Fonseca
2010-03-10Revert "r300-gallium: Skeleton for integrating into the python statetracker."José Fonseca
This reverts commit 2d56d0839e6db0861131893d67fe23734800085a. Never actually used.
2010-03-10st/wgl: add missing paramterKeith Whitwell
2010-03-10trace: include tr_public.hKeith Whitwell
2010-03-10gallium: plumb winsys-drawable-handle through to state trackerKeith Whitwell
The state trackers need this value so that they can supply it as the "void *" argument to flush_frontbuffer. Fixes single-buffer rendering.
2010-03-10Merge commit 'origin/master' into gallium-sw-api-2Keith Whitwell
2010-03-10llvmpipe: Cope with null Vertex element cso.José Fonseca
CSO can often be null. For example: 1. at initialization 2. using an util module (u_blit) right after initialization (it will push state and pop the previous null state) 3. at shutdown time (state shouldn't be bound when being destroyed) Glean was hitting 2.
2010-03-10nouveau: translate PIPE_BUFFER_USAGE_UNSYNCHRONIZEDBen Skeggs
2010-03-10nv50: inline nv50_state_flush_notify()Ben Skeggs
It's (rightly) not called from anywhere else now
2010-03-10nv50: remove nv50_context.state.instbufBen Skeggs
2010-03-10nv50: remove unnecessary macroBen Skeggs
2010-03-10nv50: move nv50_prim() into a header file rather than duplicatingBen Skeggs
2010-03-10nv50: add option to force immediate-mode submission, disable by defaultBen Skeggs
2010-03-10nv50: re-add immediate mode vertex submission pathsBen Skeggs
2010-03-10nv50: when doing inline indices, split elt lists so they fit into pushbufBen Skeggs
2010-03-10nv50: reimplement draw_elements_instance(), use for draw_elements() tooBen Skeggs
This makes draw_elements()/draw_elements_instanced() do the right thing for the non-inline elements cases, and not require flush_notify().
2010-03-10nv50: reimplement draw_arrays_instanced(), do draw_arrays() in terms of itBen Skeggs
This makes draw_arrays()/draw_arrays_instanced() do the right thing and not require the (probably broken anyway) flush_notify() usage. It also fixes a potential bug in the behaviour of reading InstanceID from shaders, where 0 should be read for non-instanced drawing, previously it was possible to read non-0 ids if mixing instanced/non-instanced.
2010-03-10nv50: rip out inline push draw paths temporarilyBen Skeggs
2010-03-10nv50: make use of scissor enable/disable methodBen Skeggs
2010-03-10nv50: move magic 0x142c stuff to after state emissionBen Skeggs
2010-03-10nv50: avoid unnecessary vp/gp/fp state changesBen Skeggs
2010-03-10nv50: remove pre_pipebuffer_map hack....Ben Skeggs
2010-03-10nv50: remove horrific abuse of nouveau_channel.flush_notifyBen Skeggs
Really though, using this at all is just not a good idea in the 3D driver. I'm almost certain the hardware will not like a reloc appearing between begin()/end().. Anyways, this is still better than before, more fixes to come..
2010-03-10nv50: always emit dummy relocs for all still-referenced buffersBen Skeggs
2010-03-10nv50: ensure enough room for state changes in current pushbufBen Skeggs
Also allows the nv50_state_validate() caller to request a minimum amount of space that itself requires, not all callers accurately use this yet but the simple cases are now accounted for. Rendering will also be dropped on the floor if validate fails now.
2010-03-10nv50: rework state emissionBen Skeggs
2010-03-10nv50: use relocs rather than re-uploading TIC all the timeBen Skeggs
2010-03-09r300g: Reorder regs, save one dword.Corbin Simpson
Or, put another way, save 10% on rendering calls.
2010-03-10winsys/drm: Handle circular dependencies in Makefile.egl.Chia-I Wu
The libraries have circular dependencies. Use --start-group and --end-group when producing the final shared libraries.
2010-03-10st/egl: Fix build errors in ximage backend after merge.Chia-I Wu
This fixes assorted merge conflicts when master is merged to gallium-sw-api-2 in 0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330.
2010-03-09drop stray XFree86Server, XGLServerGeorge Sapountzis
2010-03-09svga: Don't do culling while the software pipeline is active.Keith Whitwell
It does it for us, and additionally introduces potentially back-facing triangles.
2010-03-09null: Add a null software winsys.José Fonseca
One where framebuffer data will be read via texture transfers. Useful for e.g., python state tracker.
2010-03-09cso: don't forget to release vertex elements stateRoland Scheidegger
2010-03-09target-helpers: missing filesKeith Whitwell
2010-03-09r300g: kill pf_component_countMarek Olšák