Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-04 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c | ||||
| * | trace: Remove comma at end of enumerator list. | Vinson Lee | 2010-01-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-31 | 3 | -5/+7 |
|\| | | | | | | | | | | | | | | | Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c | ||||
| * | trace: Silence unused variable warnings. | Vinson Lee | 2009-12-27 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-27 | 2 | -5/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h | ||||
| | * | trace: Silence uninitialized variable warnings. | Vinson Lee | 2009-12-22 | 1 | -2/+2 |
| | | | |||||
| | * | trace: Add PIPE_OS_APPLE. | Vinson Lee | 2009-12-22 | 2 | -3/+3 |
| | | | |||||
* | | | xlib: Integrate the trace driver with all pipe drivers. | José Fonseca | 2009-12-28 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | And not just softpipe. It is particularly convenient to use llvmpipe instead, since it is much faster. It also allows to use rbug with all xlib drivers. | ||||
* | | | trace: Fix transfer size computation. | José Fonseca | 2009-12-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'gallium-edgeflags' | Roland Scheidegger | 2009-12-22 | 1 | -20/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_draw.c | ||||
| * | | | gallium: fix up drivers for edgeflag changes | Roland Scheidegger | 2009-12-19 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | | | | | | several drivers which chose to ignore edgeflags might require some more work, while edgeflags never worked there they might now crash. | ||||
* | | | | Move the remaining format pf_get_* functions to u_format.h. | Michal Krol | 2009-12-17 | 2 | -8/+10 |
|/ / / | | | | | | | | | | | | | Previously they depended on format blocks, but after removing those they started depending on format encoding. | ||||
* | | | Merge branch 'gallium-noblocks' | Roland Scheidegger | 2009-12-04 | 4 | -32/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_exa.c | ||||
| * | | | fixups for interface changes (mostly state trackers) | Roland Scheidegger | 2009-11-30 | 4 | -32/+11 |
| | | | | |||||
* | | | | trace: Implement separate vertex sampler state. | Michal Krol | 2009-12-01 | 2 | -8/+71 |
| | | | | |||||
* | | | | trace: Reduce double semicolons to single ones. | Michal Krol | 2009-12-01 | 1 | -30/+30 |
| | | | | |||||
* | | | | trace: Update for renamed sampler/texture state setters. | Michal Krol | 2009-12-01 | 1 | -6/+6 |
|/ / / | |||||
* / / | gallium: don't use arrays for texture width,height,depth | Keith Whitwell | 2009-11-19 | 2 | -6/+6 |
|/ / | |||||
* | | trace: Check for destroy before calling it | Jakob Bornecrantz | 2009-10-20 | 1 | -1/+3 |
| | | |||||
* | | trace: Handle transfer returning null | Jakob Bornecrantz | 2009-10-14 | 1 | -1/+2 |
| | | |||||
* | | gallium: Preparations for adding more PIPE_TRANSFER_* usage flags. | Michel Dänzer | 2009-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Always test for PIPE_TRANSFER_READ/WRITE using the bit-wise and operator, and add a pipe_transfer_buffer_flags() helper for getting the buffer usage flags corresponding to them. | ||||
* | | util: Enable sockets on BSD | Robert Noland | 2009-10-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | I think this should be safe for all of the BSDs. Signed-off-by: Robert Noland <[email protected]> Signed-off-by: Brian Paul <[email protected]> | ||||
* | | gallium/trace: casts to silence warnings | Brian Paul | 2009-09-24 | 1 | -4/+4 |
| | | |||||
* | | trace: fix printf warnings | Keith Whitwell | 2009-09-24 | 1 | -5/+5 |
|/ | |||||
* | trace: Don't set surface_[fill|copy] if not set on pipe | Jakob Bornecrantz | 2009-09-01 | 1 | -2/+4 |
| | |||||
* | drm_api: Operate on textures instead of buffers | Jakob Bornecrantz | 2009-08-28 | 1 | -56/+31 |
| | | | | | | | | | Most use cases just got the buffer from the texture and then called into one of the get_handle functions. Also with this patch it would be easier to move to a generic function for getting handles from textures and textures from handles, that is exposed via the screen. | ||||
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-18 | 1 | -1/+1 |
|\ | |||||
| * | trace: Remove space next to the class attribute of the trace. | José Fonseca | 2009-08-14 | 1 | -1/+1 |
| | | |||||
* | | gallium/trace: remove stray semicolons | Brian Paul | 2009-08-11 | 1 | -2/+2 |
| | | |||||
* | | gallium: Add texture usage information to surface_buffer_create | Jakob Bornecrantz | 2009-08-11 | 1 | -0/+3 |
| | | | | | | | | | | | | We need aditional meta data about the usage of the surface in softpipe because we need to be able tell the diffrence between PRIMARY and DISPLAY_TARGET surfaces. | ||||
* | | trace: Use correct texture in drm_api wrapper | Jakob Bornecrantz | 2009-08-05 | 1 | -1/+1 |
| | | |||||
* | | gallium/trace: Fix SCons build. | Michel Dänzer | 2009-07-20 | 1 | -0/+1 |
| | | |||||
* | | trace: Add drm api integration | Jakob Bornecrantz | 2009-07-02 | 4 | -12/+265 |
| | | | | | | | | | | | | This is okay since drm_api.h doesn't have any external dependancies, one could make it only compile on platforms that support drm. | ||||
* | | gallium: remove the pipe_sampler_state::shadow_ambient field | Brian Paul | 2009-06-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | This was only present for the sake of GL_ARB_shadow_ambient which we never implemented in Gallium. If we someday want GL_ARB_shadow_ambient we can implement it in the state tracker by adding a MAD after the relevant TEX instructions. | ||||
* | | trace: Don't write state objects to file if dumping is not set | Jakob Bornecrantz | 2009-06-14 | 1 | -0/+60 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-24 | 2 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i915/i915_tex_layout.c src/mesa/drivers/dri/i965/brw_wm_glsl.c src/mesa/drivers/dri/intel/intel_buffer_objects.c src/mesa/drivers/dri/intel/intel_pixel_bitmap.c src/mesa/drivers/dri/intel/intel_pixel_draw.c src/mesa/main/enums.c src/mesa/main/texstate.c src/mesa/vbo/vbo_exec_array.c | ||||
| * | trace: Use size_t consistently. | José Fonseca | 2009-06-18 | 2 | -5/+5 |
| | | |||||
* | | trace: __func__ --> __FUNCTION__. | Michal Krol | 2009-06-10 | 1 | -1/+1 |
| | | |||||
* | | trace/rbug: Add support for draw block rule | Jakob Bornecrantz | 2009-06-09 | 3 | -3/+91 |
| | | |||||
* | | trace/rbug: Return textures currently bound to context | Jakob Bornecrantz | 2009-06-09 | 3 | -3/+17 |
| | | |||||
* | | trace/rbug: Sleep on windows when blocked | Jakob Bornecrantz | 2009-06-08 | 1 | -1/+3 |
| | | |||||
* | | trace/rbug: Use condvar on system that has it for blocking | Jakob Bornecrantz | 2009-06-05 | 3 | -0/+14 |
| | | |||||
* | | trace/rbug: Add new contexts functions to trace rbug | Jakob Bornecrantz | 2009-06-04 | 3 | -1/+236 |
| | | |||||
* | | trace/rbug: Add rbug integration for remote debugging | Jakob Bornecrantz | 2009-06-01 | 6 | -6/+685 |
| | | |||||
* | | trace: Improve shader wrapping | Jakob Bornecrantz | 2009-05-18 | 3 | -4/+29 |
| | | |||||
* | | gallium: remove occlusion_count flag from depth-stencil state | Keith Whitwell | 2009-05-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | Drivers can just keep track of whether they are within a query by monitoring the begin/end query callbacks. The flag adds no information beyond that. Only softpipe was examining this flag -- it has been fixed up and retested with demos/arbocclude. | ||||
* | | trace: Export enabled status | Jakob Bornecrantz | 2009-05-16 | 4 | -9/+25 |
| | | |||||
* | | trace: Unwrap buffer in texture_blanket | Jakob Bornecrantz | 2009-05-16 | 1 | -1/+3 |
| | | |||||
* | | trace: If either shader is disabled don't draw | Jakob Bornecrantz | 2009-05-16 | 2 | -0/+19 |
| | | |||||
* | | trace: Put shaders on a list in the context | Jakob Bornecrantz | 2009-05-16 | 6 | -8/+151 |
| | |