Corbin Simpson
bf611cef29
r300g: Eliminate a couple more asserts.
2009-12-18 14:07:12 -08:00
Corbin Simpson
62afcbb233
r300g: Nuke r300_vbo.
2009-12-18 14:07:12 -08:00
Brian Paul
0478b745fe
glsl: clear out shader code before compiling
...
When we start compiling a shader, first free the existing gl_program.
This (mostly) fixes the piglit glsl-reload-source test.
Without this change, we were actually appending the new GPU code
onto the previous program.
2009-12-18 11:57:17 -07:00
Alex Deucher
c8de081dc1
radeon: protect fbo allocation message with debug
...
fixes fdo bug 25708
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-12-18 10:57:37 -05:00
Roland Scheidegger
9d938e29f2
fix debug output mising from edgeflag changes
2009-12-18 16:09:32 +01:00
Roland Scheidegger
890809d71b
gallium: fix mesa to tgsi translation for edgeflags
...
test apps (progs/trivial/tri-edgeflags and similar) seem to work now
2009-12-18 15:54:28 +01:00
Michal Krol
c35e5c19e7
util: Add util_format_has_alpha(), enclose in extern C.
2009-12-18 14:15:21 +01:00
Michal Krol
b1580a1623
util/pack: Handle the remaining formats with generic u_format access functions.
2009-12-18 13:06:10 +01:00
Corbin Simpson
f874da422b
util: Update blitter for u_format changes.
...
:T
2009-12-18 03:20:19 -08:00
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
Brian Paul
aeb6351a09
llvmpipe: fix upper/lower-case typo
2009-12-17 14:26:48 -07:00
Brian Paul
7d9b97703a
llvmpipe: added function comments
2009-12-17 14:22:43 -07: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
Brian Paul
5771f3d483
llvmpipe: remove unused code, added comments, etc
2009-12-17 10:52:50 -07:00
Brian Paul
808170a0ff
llvmpipe: replace INT_MIN/2 with INT_MIN
...
Since changing the in/out test we can just use INT_MIN to be sure the
comparison against the step values always passes.
2009-12-17 09:01:01 -07:00
Michal Krol
e195eab909
Merge branch 'glsl-pp-rework-2'
2009-12-17 17:00:46 +01:00
Brian Paul
b9d33db0a4
llvmpipe: improve the in/out test a little
...
Instead of:
s = c + step
m = s > 0
Do:
m = step > c (with negated c)
2009-12-17 08:17:04 -07:00
Keith Whitwell
7f2ba80025
llvmpipe: keep copy of framebuffer state in setup context
...
Avoids crashes when first frame is rendered before window is mapped.
Avoids potential issue where fb state is changed before setup context is
flushed.
2009-12-17 11:29:37 +00: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
Brian Paul
ab94381930
llvmpipe: do final the pixel in/out triangle test in the fragment shader
...
The test to determine which of the pixels in a 2x2 quad is now done in
the fragment shader rather than in the calling C code. This is a little
faster but there's a few more things to do.
Note that the step[] array elements are in a different order now. Rather
than being in row-major order for the 4x4 grid, they're in "quad-major"
order. The setup of the step arrays is a little more complicated now.
So is the course/intermediate tile test code, but some lookup tables
help with that.
Next steps:
- early-cull 2x2 quads which are totally outside the triangle.
- skip the in/out test for fully contained quads
- make the in/out comparison code tighter/faster.
2009-12-16 16:10:05 -07:00
Alex Deucher
20ee275974
r600: Invert front face winding when rendering to FBO
...
fixes fdo bug 25679
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-12-16 16:18:22 -05:00
Roland Scheidegger
50caff5675
gallium: edgeflags change fixes
...
use correct number of vertex inputs
fix not running pipeline in case of edgeflags
changes to mesa to tgsi translation still very broken
2009-12-16 22:12:16 +01:00
Brian Paul
e288796c92
llvmpipe: added lp_build_int32_vec4_type()
2009-12-16 12:33:11 -07:00
Brian Paul
2297bc9233
llvmpipe: refactor lp_build_cmp() to use lp_build_compare()
2009-12-16 12:32:45 -07:00
Ian Romanick
aeea8a07b8
mesa: set version string to 7.6.1-rc4
2009-12-16 10:13:41 -08:00
Brian Paul
8a09e6e2ad
mesa: add missing semicolon
...
See bug 25663.
2009-12-16 10:39:26 -07: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
Brian Paul
138d639ec9
mesa: test for __blrts for CPU_TO_LE32()
...
See bug 25663.
2009-12-16 08:04:25 -07:00
Brian Paul
a43fc39585
mesa: no dlopen on BlueGene
...
See bug 25663.
2009-12-16 08:02:56 -07:00
Brian Paul
6f202b53b0
mesa: remove //-style comments
2009-12-16 07:58:54 -07:00
Brian Paul
ddfc2e7439
st/mesa: remove //-style comments
2009-12-16 07:58:54 -07: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