Jeremy Huddleston [Tue, 22 Dec 2009 01:48:35 +0000 (17:48 -0800)]
osmesa: Fix a copy/paste error in building libOSMesa
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Brian Paul [Tue, 22 Dec 2009 01:35:54 +0000 (18:35 -0700)]
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
Brian Paul [Tue, 22 Dec 2009 01:23:53 +0000 (18:23 -0700)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
configure.ac
progs/demos/morph3d.c
progs/demos/textures.c
progs/glsl/shtest.c
progs/glsl/texaaline.c
progs/tests/packedpixels.c
progs/xdemos/corender.c
src/mesa/main/version.h
Fabio Pedretti [Tue, 22 Dec 2009 00:43:35 +0000 (10:43 +1000)]
configure.ac: fix for libdrm_radeon API changes.
Fabio Pedretti [Tue, 22 Dec 2009 00:43:35 +0000 (10:43 +1000)]
configure.ac: fix for libdrm_radeon API changes.
Fabio Pedretti [Tue, 22 Dec 2009 00:43:35 +0000 (10:43 +1000)]
configure.ac: fix for libdrm_radeon API changes.
Dave Airlie [Thu, 17 Dec 2009 04:29:04 +0000 (14:29 +1000)]
radeon/r600: use new libdrm_radeon api
Dave Airlie [Thu, 17 Dec 2009 04:19:27 +0000 (14:19 +1000)]
radeon: drop assert accessing cref which is meant to be hidden
Dave Airlie [Thu, 17 Dec 2009 04:18:54 +0000 (14:18 +1000)]
radeon: drop unused members of radeon_state.
Dave Airlie [Thu, 17 Dec 2009 04:23:08 +0000 (14:23 +1000)]
r600: move structs for legacy cmdbuf into cmdbuf C file.
these really shouldn't be exposed here
Dave Airlie [Thu, 17 Dec 2009 04:29:04 +0000 (14:29 +1000)]
radeon/r600: use new libdrm_radeon api
Dave Airlie [Thu, 17 Dec 2009 04:19:27 +0000 (14:19 +1000)]
radeon: drop assert accessing cref which is meant to be hidden
Dave Airlie [Thu, 17 Dec 2009 04:18:54 +0000 (14:18 +1000)]
radeon: drop unused members of radeon_state.
Dave Airlie [Thu, 17 Dec 2009 04:23:08 +0000 (14:23 +1000)]
r600: move structs for legacy cmdbuf into cmdbuf C file.
these really shouldn't be exposed here
Vinson Lee [Mon, 21 Dec 2009 23:20:01 +0000 (15:20 -0800)]
progs/redbook: Silence compiler warnings.
Brian Paul [Mon, 21 Dec 2009 20:48:58 +0000 (13:48 -0700)]
progs/perf: added check for GL_ARB_framebuffer_object
Brian Paul [Fri, 11 Dec 2009 22:22:17 +0000 (15:22 -0700)]
progs/demos: report pixel rate in million pixels / sec
Brian Paul [Mon, 21 Dec 2009 20:37:49 +0000 (13:37 -0700)]
osmesa: added new GLSL libs
Brian Paul [Mon, 21 Dec 2009 20:37:11 +0000 (13:37 -0700)]
progs/osmes: add missing libGL dependency, remove unneeded lines
Christoph Bumiller [Mon, 21 Dec 2009 17:31:57 +0000 (18:31 +0100)]
util: draw cube mipmaps with TEX CUBE
Roland Scheidegger [Mon, 21 Dec 2009 17:20:31 +0000 (18:20 +0100)]
python: fix some pipe_format_simplify merge damage
Roland Scheidegger [Mon, 21 Dec 2009 17:20:01 +0000 (18:20 +0100)]
svga: fix typo
Dave Airlie [Mon, 21 Dec 2009 00:21:28 +0000 (10:21 +1000)]
r600: fix glFrontFace(GL_CW)
fd.o bug #25290
Suggested fix from Rafael Monica
Andre Maasikas [Mon, 21 Dec 2009 13:19:21 +0000 (15:19 +0200)]
r600: support more of arb_point_sprite and also sprite_coord_origin
Andre Maasikas [Mon, 21 Dec 2009 09:47:12 +0000 (11:47 +0200)]
r600: disallow negative offsets for relative addressing for now
otherwise for example const[ADDR-3] gets us 253 - ALU_SRC_LITERAL which
expects immediate floats to follow and hangs
Michal Krol [Mon, 21 Dec 2009 10:58:17 +0000 (11:58 +0100)]
vega: Add missing actual argument.
Younes Manton [Mon, 21 Dec 2009 01:11:55 +0000 (20:11 -0500)]
st/mesa: Check for single level mipmap trees.
The assert in util_gen_mipmap() caught it, although
it does the right thing anyway.
Jeremy Huddleston [Mon, 21 Dec 2009 05:34:27 +0000 (21:34 -0800)]
darwin: mklib: Use lipo rather than file to figure out architectures of object files
(cherry picked from commit
ad7f9d71e22fb7667c90dbbc0558939b89a45154)
Jeremy Huddleston [Mon, 21 Dec 2009 05:32:35 +0000 (21:32 -0800)]
darwin: Cleanup CPPFLAGS a bit
(cherry picked from commit
4a1e103858a1db0fb037891b8d4a9426eff32b98)
Jeremy Huddleston [Mon, 21 Dec 2009 05:34:27 +0000 (21:34 -0800)]
darwin: mklib: Use lipo rather than file to figure out architectures of object files
Jeremy Huddleston [Mon, 21 Dec 2009 05:32:35 +0000 (21:32 -0800)]
darwin: Cleanup CPPFLAGS a bit
Dave Airlie [Mon, 21 Dec 2009 00:21:28 +0000 (10:21 +1000)]
r600: fix glFrontFace(GL_CW)
fd.o bug #25290
Suggested fix from Rafael Monica
Corbin Simpson [Sun, 20 Dec 2009 22:00:34 +0000 (14:00 -0800)]
r300g: Add a few more params.
Dave Airlie [Sun, 20 Dec 2009 23:10:21 +0000 (09:10 +1000)]
glsl: make stack compile.
it would be nice if this stuff would be test built on mesa's primary
platform with mesa's primary build system.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie [Thu, 17 Dec 2009 04:29:04 +0000 (14:29 +1000)]
radeon/r600: use new libdrm_radeon api
Michal Krol [Sun, 20 Dec 2009 20:13:26 +0000 (21:13 +0100)]
glsl/apps: Update after glsl cl interface changes.
Michal Krol [Sun, 20 Dec 2009 20:11:58 +0000 (21:11 +0100)]
slang: Update after glsl cl interface changes.
Michal Krol [Sun, 20 Dec 2009 20:11:16 +0000 (21:11 +0100)]
glsl: Do syntax parsing inline with processing.
Michal Krol [Sun, 20 Dec 2009 12:59:14 +0000 (13:59 +0100)]
slang: Add gitignore for autogenerated files.
Michal Krol [Sun, 20 Dec 2009 12:53:53 +0000 (13:53 +0100)]
slang: Update after glsl pp changes.
Michal Krol [Sun, 20 Dec 2009 12:53:17 +0000 (13:53 +0100)]
glsl/apps: Update after glsl pp interface changes.
Michal Krol [Sun, 20 Dec 2009 12:52:43 +0000 (13:52 +0100)]
glsl/apps: Do not print number of eaten tokens in version.
This is due to the glsl pp interface changes.
Michal Krol [Sun, 20 Dec 2009 12:51:38 +0000 (13:51 +0100)]
glsl/apps: Print error line number in compile.
Michal Krol [Sun, 20 Dec 2009 12:50:16 +0000 (13:50 +0100)]
glsl/pp: Do processing inline with tokenisation.
Michal Krol [Sat, 19 Dec 2009 10:03:47 +0000 (11:03 +0100)]
glsl/pp: Remove outdated TODO.
Already implemented in mesa compiler using predefined symbols.
Michal Krol [Sat, 19 Dec 2009 08:55:27 +0000 (09:55 +0100)]
glsl/pp: Report correct error line for purify and tokeniser errors.
Christoph Bumiller [Sun, 20 Dec 2009 18:09:35 +0000 (19:09 +0100)]
util: util_format_get_blocksizebits() returns bits per block.
Christoph Bumiller [Sun, 20 Dec 2009 12:40:14 +0000 (13:40 +0100)]
nv50: make address reg allocation a little less hacky
Before I tried to distinguish int +0 and -0, and regs
relative to $a1 would have been considered reserved
for TGSI.
This would probably never occur, let it be fixed even so.
Christoph Bumiller [Sun, 20 Dec 2009 11:04:26 +0000 (12:04 +0100)]
nv50: use BREAKADDR and BREAK for loops
This is easier, we don't have to record all the BRK branches
to fill in the address at ENDLOOP - which wasn't done before
and thus made all but the last BRK branch jump to the start.
Also, we don't risk reactivting threads that already left
the loop if we join threads after a conditional with a BRK
(although it might be wiser to remove the join altogether
in such cases).
Christoph Bumiller [Sun, 20 Dec 2009 13:12:35 +0000 (14:12 +0100)]
nv50: handle TGSI_OPCODE_RET,KILP
Vinson Lee [Sun, 20 Dec 2009 09:01:00 +0000 (01:01 -0800)]
progs/tests: Silence compiler warnings.
Marek Olšák [Wed, 16 Dec 2009 05:07:39 +0000 (06:07 +0100)]
r300g: add texture compare modes
Maciej Cencora [Sat, 19 Dec 2009 13:25:53 +0000 (14:25 +0100)]
r300: minor blit rework
Use vert/tex coords instead of byte offsets for specyfing src/dst image offsets.
This will allow for blitting between tiled/untiled buffers.
Maciej Cencora [Tue, 15 Dec 2009 22:57:05 +0000 (23:57 +0100)]
r300: better fix for glCopyTexSubImage
Vinson Lee [Sat, 19 Dec 2009 08:28:01 +0000 (00:28 -0800)]
progs/trivial: Use C-style comments.
Vinson Lee [Sat, 19 Dec 2009 08:00:56 +0000 (00:00 -0800)]
progs/xdemos: Use C-style comment.
Vinson Lee [Sat, 19 Dec 2009 07:46:14 +0000 (23:46 -0800)]
progs/demos: Silence compiler warning in morph3d.c.
Vinson Lee [Sat, 19 Dec 2009 07:38:15 +0000 (23:38 -0800)]
progs/glsl: Use C-style comments.
Vinson Lee [Sat, 19 Dec 2009 07:34:28 +0000 (23:34 -0800)]
progs/demos: Use C-style comment.
Corbin Simpson [Sat, 19 Dec 2009 05:50:45 +0000 (21:50 -0800)]
r300g: Fix provoking vertex for non-quads.
Read the comments. In short, we can't possibly pass piglit's
glean/clipFlat without some help from Gallium and an API/spec change.
Corbin Simpson [Sat, 19 Dec 2009 03:42:02 +0000 (19:42 -0800)]
r300g: Respect provoking vertex for trifans.
Fixes part of piglit's clipFlat test; next up is to get quads right.
Corbin Simpson [Fri, 18 Dec 2009 22:05:40 +0000 (14:05 -0800)]
r300g: Eliminate a couple more asserts.
Corbin Simpson [Fri, 18 Dec 2009 21:40:24 +0000 (13:40 -0800)]
r300g: Nuke r300_vbo.
Brian Paul [Fri, 18 Dec 2009 15:12:55 +0000 (08:12 -0700)]
progs/demos: fix glut initialization calls
Remove glutInitWindowPosition() calls to play nicer with window managers.
Move glutInitWindowSize() calls before glutInit() so the the default window
size can be overridden by the -geometry cmd line option.
Brian Paul [Fri, 18 Dec 2009 18:57:15 +0000 (11:57 -0700)]
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.
Alex Deucher [Fri, 18 Dec 2009 15:57:37 +0000 (10:57 -0500)]
radeon: protect fbo allocation message with debug
fixes fdo bug 25708
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Michal Krol [Fri, 18 Dec 2009 13:15:21 +0000 (14:15 +0100)]
util: Add util_format_has_alpha(), enclose in extern C.
Michal Krol [Tue, 15 Dec 2009 18:48:31 +0000 (19:48 +0100)]
util/pack: Handle the remaining formats with generic u_format access functions.
Corbin Simpson [Fri, 18 Dec 2009 11:20:19 +0000 (03:20 -0800)]
util: Update blitter for u_format changes.
:T
Corbin Simpson [Fri, 18 Dec 2009 10:55:28 +0000 (02:55 -0800)]
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
417ce06306962a9355cbb35cefcdea1951b0ce85.
Conflicts:
src/gallium/winsys/drm/radeon/core/radeon_buffer.c
Michal Krol [Fri, 18 Dec 2009 08:08:26 +0000 (09:08 +0100)]
Merge branch 'pipe-format-simplify'
Richard Li [Fri, 18 Dec 2009 05:23:04 +0000 (00:23 -0500)]
r600 : enable gl2, set R600_ENABLE_GLSL_TEST by default.
Dave Airlie [Fri, 18 Dec 2009 04:35:03 +0000 (14:35 +1000)]
radeon: fix frontbuffer read/drawpixels
Bug 25699
The main problem was the optimising flush wasn't doing the front
rendering checks properly.
Dave Airlie [Thu, 17 Dec 2009 23:32:04 +0000 (09:32 +1000)]
r300g: store own copy of flush_cb and flush data.
don't go sneaking around inside the libdrm copy.
Michal Krol [Thu, 17 Dec 2009 22:41:57 +0000 (23:41 +0100)]
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.
Michal Krol [Thu, 17 Dec 2009 21:39:03 +0000 (22:39 +0100)]
util: Remove util_format_get_block().
Michal Krol [Thu, 17 Dec 2009 21:37:15 +0000 (22:37 +0100)]
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
Michal Krol [Thu, 17 Dec 2009 20:57:24 +0000 (21:57 +0100)]
util/format: Fix bogus assertion.
Michal Krol [Thu, 17 Dec 2009 20:25:47 +0000 (21:25 +0100)]
s/desc->type/desc->channel[0].type/
Sedat Dilek [Thu, 17 Dec 2009 18:17:23 +0000 (19:17 +0100)]
glsl/apps: Add dummy install target to fix 'make install'
Signed-off-by: Brian Paul <brianp@vmware.com>
Sedat Dilek [Thu, 17 Dec 2009 18:14:53 +0000 (19:14 +0100)]
configure.ac: Add glsl to SRC_DIRS
Signed-off-by: Brian Paul <brianp@vmware.com>
Michal Krol [Thu, 17 Dec 2009 16:00:46 +0000 (17:00 +0100)]
Merge branch 'glsl-pp-rework-2'
Dave Airlie [Thu, 17 Dec 2009 04:19:27 +0000 (14:19 +1000)]
radeon: drop assert accessing cref which is meant to be hidden
Dave Airlie [Thu, 17 Dec 2009 04:18:54 +0000 (14:18 +1000)]
radeon: drop unused members of radeon_state.
Dave Airlie [Thu, 17 Dec 2009 04:23:08 +0000 (14:23 +1000)]
r600: move structs for legacy cmdbuf into cmdbuf C file.
these really shouldn't be exposed here
Alex Deucher [Wed, 16 Dec 2009 21:18:22 +0000 (16:18 -0500)]
r600: Invert front face winding when rendering to FBO
fixes fdo bug 25679
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Ian Romanick [Wed, 16 Dec 2009 17:01:58 +0000 (09:01 -0800)]
mesa: set version string to 7.6.1-rc4
Brian Paul [Wed, 16 Dec 2009 17:39:17 +0000 (10:39 -0700)]
mesa: add missing semicolon
See bug 25663.
Richard Li [Wed, 16 Dec 2009 16:35:08 +0000 (11:35 -0500)]
r600 : clean a bit to prepare to enable gl2.
Brian Paul [Wed, 16 Dec 2009 15:17:43 +0000 (08:17 -0700)]
docs: document 7.6.1 BlueGene fixes
José Fonseca [Wed, 16 Dec 2009 15:06:02 +0000 (15:06 +0000)]
llvmpipe: add LP_DEBUG env var
Cherry-picked from
dec35d04aeb398eef159aaf8cde5e0d04622b811.
Brian Paul [Mon, 14 Dec 2009 22:27:35 +0000 (15:27 -0700)]
llvmpipe: fix broken TGSI_OPCODE_FRC codegen
Brian Paul [Mon, 14 Dec 2009 22:24:31 +0000 (15:24 -0700)]
llvmpipe: fix broken lp_build_abs()
Brian Paul [Wed, 16 Dec 2009 15:04:23 +0000 (08:04 -0700)]
mesa: test for __blrts for CPU_TO_LE32()
See bug 25663.
Brian Paul [Wed, 16 Dec 2009 15:02:52 +0000 (08:02 -0700)]
mesa: no dlopen on BlueGene
See bug 25663.
Brian Paul [Wed, 16 Dec 2009 14:58:42 +0000 (07:58 -0700)]
mesa: remove //-style comments
Brian Paul [Wed, 16 Dec 2009 14:58:31 +0000 (07:58 -0700)]
st/mesa: remove //-style comments
Marek Olšák [Tue, 15 Dec 2009 04:35:03 +0000 (05:35 +0100)]
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).
Marek Olšák [Mon, 14 Dec 2009 05:55:54 +0000 (06:55 +0100)]
r300g: clean up the invariant state
Marek Olšák [Mon, 14 Dec 2009 05:39:08 +0000 (06:39 +0100)]
r300g: clamp vertex indices to [min,max] everywhere
projects / mesa.git / log