Commit graph

28618 commits

Author SHA1 Message Date
Corbin Simpson
a70eba5648 Revert "r300g: flush CS if a buffer being deleted is referenced by it"
As requested by just about everybody. I'm going back to actually reading
patches before ACKing and pushing them.

This reverts commit 417ce06306.

Conflicts:

	src/gallium/winsys/drm/radeon/core/radeon_buffer.c
2009-12-18 02:55:28 -08:00
Michal Krol
7855fcb63b Merge branch 'pipe-format-simplify' 2009-12-18 09:08:26 +01:00
Richard Li
465333ab70 r600 : enable gl2, set R600_ENABLE_GLSL_TEST by default. 2009-12-18 00:23:04 -05:00
Dave Airlie
112908c279 radeon: fix frontbuffer read/drawpixels
Bug 25699

The main problem was the optimising flush wasn't doing the front
rendering checks properly.
2009-12-18 14:35:03 +10:00
Dave Airlie
5f59e79f3a r300g: store own copy of flush_cb and flush data.
don't go sneaking around inside the libdrm copy.
2009-12-18 10:24:50 +10:00
Michal Krol
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
Michal Krol
ec5577a83d util: Remove util_format_get_block(). 2009-12-17 22:39:03 +01:00
Michal Krol
16c6dce013 Merge branch 'master' into pipe-format-simplify
Conflicts:
	src/gallium/auxiliary/draw/draw_pipe_aaline.c
	src/gallium/auxiliary/draw/draw_pipe_pstipple.c
	src/gallium/auxiliary/util/u_blit.c
	src/gallium/auxiliary/util/u_gen_mipmap.c
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
	src/gallium/drivers/cell/ppu/cell_texture.c
	src/gallium/drivers/llvmpipe/lp_texture.c
	src/gallium/drivers/r300/r300_emit.c
	src/gallium/drivers/r300/r300_texture.c
	src/gallium/drivers/softpipe/sp_texture.c
	src/gallium/drivers/softpipe/sp_tile_cache.c
	src/gallium/drivers/svga/svga_state_vs.c
	src/gallium/include/pipe/p_format.h
	src/gallium/state_trackers/dri/dri_drawable.c
	src/gallium/state_trackers/egl/egl_surface.c
	src/gallium/state_trackers/python/p_device.i
	src/gallium/state_trackers/python/st_softpipe_winsys.c
	src/gallium/state_trackers/vega/api_filters.c
	src/gallium/state_trackers/vega/image.c
	src/gallium/state_trackers/vega/mask.c
	src/gallium/state_trackers/vega/paint.c
	src/gallium/state_trackers/vega/renderer.c
	src/gallium/state_trackers/vega/vg_tracker.c
	src/gallium/state_trackers/xorg/xorg_crtc.c
	src/gallium/state_trackers/xorg/xorg_dri2.c
	src/gallium/state_trackers/xorg/xorg_exa.c
	src/gallium/state_trackers/xorg/xorg_renderer.c
	src/gallium/state_trackers/xorg/xorg_xv.c
	src/gallium/state_trackers/xorg/xvmc/surface.c
	src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
	src/gallium/winsys/drm/radeon/core/radeon_buffer.c
	src/gallium/winsys/egl_xlib/sw_winsys.c
	src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
	src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c
	src/gallium/winsys/gdi/gdi_softpipe_winsys.c
	src/gallium/winsys/xlib/xlib_cell.c
	src/gallium/winsys/xlib/xlib_llvmpipe.c
	src/gallium/winsys/xlib/xlib_softpipe.c
	src/mesa/state_tracker/st_cb_fbo.c
	src/mesa/state_tracker/st_cb_texture.c
	src/mesa/state_tracker/st_texture.c
2009-12-17 22:37:15 +01:00
Michal Krol
440fc5bf78 util/format: Fix bogus assertion. 2009-12-17 21:57:24 +01:00
Michal Krol
3af2ddbe94 s/desc->type/desc->channel[0].type/ 2009-12-17 21:25:47 +01:00
Sedat Dilek
294bd53d4b glsl/apps: Add dummy install target to fix 'make install'
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-12-17 12:46:55 -07:00
Sedat Dilek
2f127e5236 configure.ac: Add glsl to SRC_DIRS
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-12-17 12:46:55 -07:00
Michal Krol
e195eab909 Merge branch 'glsl-pp-rework-2' 2009-12-17 17:00:46 +01:00
Dave Airlie
1c28073fdf radeon: drop assert accessing cref which is meant to be hidden 2009-12-17 14:23:53 +10:00
Dave Airlie
5484f9dfc6 radeon: drop unused members of radeon_state. 2009-12-17 14:23:47 +10:00
Dave Airlie
f24c29cc39 r600: move structs for legacy cmdbuf into cmdbuf C file.
these really shouldn't be exposed here
2009-12-17 14:23:08 +10:00
Richard Li
09cef45393 r600 : clean a bit to prepare to enable gl2. 2009-12-16 11:41:37 -05:00
José Fonseca
2584c5bd25 llvmpipe: add LP_DEBUG env var
Cherry-picked from dec35d04ae.
2009-12-16 15:06:17 +00:00
Brian Paul
f1f49bd465 llvmpipe: fix broken TGSI_OPCODE_FRC codegen 2009-12-16 15:06:17 +00:00
Brian Paul
43d6c81ae2 llvmpipe: fix broken lp_build_abs() 2009-12-16 15:06:16 +00:00
Marek Olšák
2ddee2cfbc r300g: fix emission of which textures are enabled
It fixes most of the "Bad CS" issues in piglit/texCombine and piglit/fbo.
Some other issues of this kind will get fixed in the kernel soon (depth-only
rendering, S3TC, and RGTC).
2009-12-15 19:04:46 -08:00
Marek Olšák
ded4ecde60 r300g: clean up the invariant state 2009-12-15 19:04:46 -08:00
Marek Olšák
acce4824ec r300g: clamp vertex indices to [min,max] everywhere 2009-12-15 19:04:46 -08:00
Marek Olšák
a6d701d1c6 r300g: if no colorbuffers are set, disable blending and set the color mask to 0
This seems to be the only way to disable the first colorbuffer.
2009-12-15 19:04:46 -08:00
Marek Olšák
cf85bf9cd0 r300g: set the number of colorbuffers in RB3D_CCTL 2009-12-15 19:04:46 -08:00
Marek Olšák
de0befc4b2 r300g: remove unnecessary flush in set_sampler_textures 2009-12-15 19:04:45 -08:00
Marek Olšák
c5e0b0bc37 r300g: add Z24X8 to the list of unsupported sampler formats on R3xx-R4xx 2009-12-15 19:04:45 -08:00
Marek Olšák
38a97148bf r300g: add acceleration of the clear, surface_copy, and surface_fill functions 2009-12-15 19:04:45 -08:00
Marek Olšák
417ce06306 r300g: flush CS if a buffer being deleted is referenced by it 2009-12-15 19:04:45 -08:00
Michel Dänzer
bc443d841c r300: Fix typo on < R5xx RS setup for blits. 2009-12-16 00:51:55 +01:00
Marek Olšák
80e8156394 util/blitter: kill the draw_quad callback 2009-12-15 18:00:48 +00:00
Marek Olšák
85bf420a78 util/blitter: allocate most of the state objects on-demand 2009-12-15 18:00:48 +00:00
Marek Olšák
ab85ba30e2 util/blitter: use PIPE_MAX_* limits, and fix a memory leak 2009-12-15 18:00:48 +00:00
Marek Olšák
e1d0f47808 pipe: add PIPE_MAX_TEXTURE_TYPES 2009-12-15 18:00:39 +00:00
Marek Olšák
55753f59ae util: add blitter 2009-12-15 18:00:30 +00:00
Marek Olšák
4c61022b4a util: add a function which converts 2D coordinates to cubemap coordinates
The code was taken over from u_gen_mipmap.
2009-12-15 17:59:54 +00:00
Marek Olšák
dff4c9ed55 util: add new fragment shaders to simple_shaders
New shaders:
* Fragment shader which writes depth sampled from a texture
* Fragment shader which copies COLOR[0] to multiple render targets

Additional improvements:
* The fragment 'tex' shaders now take a sampler type (TGSI_TEXTURE_*)
  so that they can sample from any type of texture, not only from a 2D one.
2009-12-15 17:59:50 +00:00
José Fonseca
3a15c48ece llvmpipe: Fix yet another copynpaste typo in lp_build_log2_approx.
Now fslight looks perfect.
2009-12-15 14:46:43 +00:00
José Fonseca
85c27c3ef7 llvmpipe: Fix lp_build_polynomial comment. 2009-12-15 14:15:52 +00:00
José Fonseca
72c9878069 llvmpipe: Fix typo in lp_build_log constant. 2009-12-15 13:58:53 +00:00
José Fonseca
079b1cf4cf util: Fix unity value for swizzle 1.
It should be 255 for ubytes, and not 1.

Thanks Michal for spotting this.
2009-12-15 13:40:13 +00:00
José Fonseca
846e38f1c3 llvmpipe: Fix bad SI -> FP conversion into lp_build_log2_approx.
It should be a bitcast  as the integer value is actually an encoded FP
already.
2009-12-15 13:15:16 +00:00
José Fonseca
d508bf862b util: Add dl wrappers.
Borrowed from Mesa, slightly changed for more type safety.
2009-12-15 13:15:16 +00:00
Michal Krol
c1efa45e04 tgsi/text: Don't use strncasecmp(), it breaks windows build.
Also, break out of the for-loop when a matching property is found.
2009-12-15 13:54:05 +01:00
Andre Maasikas
f8135d545b r600: use _mesa_insert_instructions to fixup wpos instead of manual ins insert
this keeps branch targets correct.
glsl/trirast works correctly now afaics
2009-12-15 12:08:55 +02:00
Andre Maasikas
dbc374cd30 r600: fix typos for vert-tex
at least i think this is how it was meant to work
2009-12-15 10:26:37 +02:00
Andre Maasikas
bae5e7f213 r600: fix fragment.position
wpos.y seems inferted to what opengl expexts, so calculate correct
value from window dimension and replace references in fragmentprog
with calculated value
2009-12-15 09:46:57 +02:00
Andre Maasikas
10f5cff6ac r600: add support for FRAG_ATTRIB_PNTC 2009-12-15 09:46:49 +02:00
Andre Maasikas
0c046bec8f r600: add DDX DDY opcodes 2009-12-15 09:46:34 +02:00
Richard Li
18ebcfe393 r600 : add texture support for vertex shader. 2009-12-14 18:08:40 -05:00