c727fa6dbf
Merge commit 'origin/gallium-draw-retval'
...
Conflicts:
src/gallium/drivers/identity/id_context.c
2010-01-05 14:13:40 +00:00
5ac16495a2
Merge branch 'mesa_7_7_branch'
...
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
2010-01-04 19:16:24 -07:00
1d95544446
trace: Remove comma at end of enumerator list.
2010-01-03 03:08:40 -08:00
25024d9482
Merge branch 'mesa_7_7_branch'
...
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
2009-12-31 09:02:27 -07:00
67171ed85f
xlib: Integrate the trace driver with all pipe drivers.
...
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.
2009-12-28 22:53:40 +00:00
d1f64fa72f
trace: Silence unused variable warnings.
2009-12-27 18:12:58 -08:00
d0b7ff551a
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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
2009-12-27 15:31:08 -07:00
3f176bf08c
trace: Fix transfer size computation.
2009-12-26 01:14:08 +00:00
b20382d477
trace: Silence uninitialized variable warnings.
2009-12-22 17:34:39 -08:00
f6ca26e5a7
trace: Add PIPE_OS_APPLE.
2009-12-22 17:17:28 -08:00
35e8283c69
Merge branch 'gallium-edgeflags'
...
Conflicts:
src/mesa/state_tracker/st_draw.c
2009-12-22 20:54:26 +01:00
09e785ee04
gallium: remove return value from draw calls
2009-12-21 22:14:35 +00:00
429f0e3b37
gallium: fix up drivers for edgeflag changes
...
several drivers which chose to ignore edgeflags might require some more work,
while edgeflags never worked there they might now crash.
2009-12-19 00:18:43 +01:00
b1ed72ebe2
Move the remaining format pf_get_* functions to u_format.h.
...
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
2009-12-17 23:41:57 +01:00
9c6a9363ef
Merge branch 'gallium-noblocks'
...
Conflicts:
src/gallium/state_trackers/xorg/xorg_exa.c
2009-12-04 00:35:14 +01:00
57ed791305
trace: Implement separate vertex sampler state.
2009-12-01 09:52:44 +01:00
3f900c33ae
trace: Reduce double semicolons to single ones.
2009-12-01 09:52:37 +01:00
eeb8dd12b4
trace: Update for renamed sampler/texture state setters.
2009-12-01 09:52:25 +01:00
decf6ed810
fixups for interface changes (mostly state trackers)
2009-11-30 23:02:49 +01:00
683e35f726
gallium: don't use arrays for texture width,height,depth
2009-11-19 14:39:34 -08:00
fc07ca004a
trace: Check for destroy before calling it
2009-10-20 17:19:05 +02:00
72fd1cf292
trace: Handle transfer returning null
2009-10-14 11:44:09 +02:00
47e41b024e
gallium: Preparations for adding more PIPE_TRANSFER_* usage flags.
...
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.
2009-10-02 18:13:26 +02:00
0b466c8705
util: Enable sockets on BSD
...
I think this should be safe for all of the BSDs.
Signed-off-by: Robert Noland <rnoland@2hip.net >
Signed-off-by: Brian Paul <brianp@vmware.com >
2009-10-01 08:42:48 -06:00
6be2bc56af
gallium/trace: casts to silence warnings
2009-09-24 10:47:42 -06:00
90dcfb3b47
trace: fix printf warnings
2009-09-24 16:49:40 +01:00
8c3f622a34
trace: Don't set surface_[fill|copy] if not set on pipe
2009-09-01 11:56:14 +02:00
1e5014f7df
drm_api: Operate on textures instead of buffers
...
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.
2009-08-28 13:38:23 +01:00
73fc09a7bf
Merge branch 'mesa_7_5_branch'
2009-08-18 17:55:27 -06:00
10430f47a4
trace: Remove space next to the class attribute of the trace.
2009-08-14 20:05:51 +01:00
9ba19b892c
gallium/trace: remove stray semicolons
2009-08-11 20:34:21 -06:00
a41a253ce3
gallium: Add texture usage information to surface_buffer_create
...
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.
2009-08-11 18:34:43 +01:00
1f9ee623d1
trace: Use correct texture in drm_api wrapper
2009-08-05 19:29:29 +01:00
0b7a907f39
gallium/trace: Fix SCons build.
2009-07-20 02:05:38 +02:00
c0d7502a2c
trace: Add drm api integration
...
This is okay since drm_api.h doesn't have any external
dependancies, one could make it only compile on platforms
that support drm.
2009-07-02 14:57:55 +02:00
b750b9fc3d
gallium: remove the pipe_sampler_state::shadow_ambient field
...
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.
2009-06-30 08:51:32 -06:00
d609df1dae
trace: Use size_t consistently.
2009-06-18 14:54:09 +01:00
210ad58ee3
trace: Don't write state objects to file if dumping is not set
2009-06-14 06:07:50 +02:00
a04af335a4
Merge branch 'mesa_7_5_branch'
...
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
2009-06-24 08:54:37 -06:00
1b334587e9
trace: __func__ --> __FUNCTION__.
2009-06-10 11:56:38 +02:00
41482a6461
trace/rbug: Add support for draw block rule
2009-06-09 19:24:06 +01:00
b71a254f05
trace/rbug: Return textures currently bound to context
2009-06-09 16:00:40 +01:00
8d2324d355
trace/rbug: Sleep on windows when blocked
2009-06-08 15:01:48 +02:00
61ffba44fd
trace/rbug: Use condvar on system that has it for blocking
2009-06-05 03:01:34 +01:00
76b3072e9b
trace/rbug: Add new contexts functions to trace rbug
2009-06-04 23:45:29 +01:00
01fa34cb98
trace/rbug: Add rbug integration for remote debugging
2009-06-01 11:19:56 +01:00
bd59dd69ba
trace: Improve shader wrapping
2009-05-18 20:54:09 +01:00
57fd202375
gallium: remove occlusion_count flag from depth-stencil state
...
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.
2009-05-16 17:26:39 +01:00
f04c38fa1f
trace: Export enabled status
2009-05-16 01:50:53 +01:00
ee05658798
trace: Unwrap buffer in texture_blanket
2009-05-16 01:50:53 +01:00
Keith Whitwell