Commit graph

32704 commits

Author SHA1 Message Date
Brian Paul
c11d582411 st/mesa: plug in default for pipe_context::surface_copy() if needed
This lets us avoid conditionals and duplicated code in several places.
2010-03-17 10:31:59 -06:00
Brian Paul
a196a5d330 progs/samples: improve copy.c demo
If the test image was larger than the window, nothing was drawn because
of invalid raster position.  Use glWindowPos instead of glRasterPos.
Also, use integer src/dst coordinates to avoid grabbing black pixels
outside of the src image region.
2010-03-17 10:17:06 -06:00
Brian Paul
ef92fe85de Merge branch '7.8'
Conflicts:

	src/mesa/state_tracker/st_cb_drawpixels.c
2010-03-17 10:13:51 -06:00
Brian Paul
bf1974b37d progs/samples: silence warnings 2010-03-17 10:11:09 -06:00
Brian Paul
1bfc314596 st/mesa: fix glCopyPixels bugs/crashes when src region need clipping
Use the _mesa_clip_readpixels() function to clip the src region against
the buffer's bounds.  Neatly, the resulting pixel unpack object's
SkipPixels/SkipRows fields can be used to determine the position of the
region in the destination texture.

Fixes crash in progs/samples/copy.c and probably other cases.
2010-03-17 10:06:27 -06:00
Brian Paul
c492227683 mesa: rename params in prototype to match implementation 2010-03-17 09:04:26 -06:00
Brian Paul
59e743b8d3 glapi: fix assorted warnings
And replace some instances of GLuint with unsigned int to avoid pulling in
GL/gl.h
2010-03-17 08:44:54 -06:00
Brian Paul
3828910d0e swrast: remove unused compute_coveragei() function 2010-03-17 08:42:59 -06:00
Corbin Simpson
90fe8c39f1 st/mesa: Fix build breakage.
Nearly certain this is what was intended; it compiles, but I'm not sure
this path is ever hit in my tests.
2010-03-17 04:35:14 -07:00
Pauli Nieminen
f0f04cd12d Merge branch '7.8' into master
Conflicts:
	Makefile
	src/mesa/main/version.h
2010-03-17 11:26:48 +02:00
Brian Paul
e1ee3eaf6d cell: build identity driver too 2010-03-16 16:47:02 -06:00
Brian Paul
a9a1b52f95 cell: add missing semicolon 2010-03-16 16:47:02 -06:00
Christoph Bumiller
e548babb1f nv50: support more formats in surface_copy,fill
Fixes corrupted fonts in bzFlag, where we've been silently
failing to copy I8 mipmaps to a new miptree.

Print an error message on unsupported format now, since we
can't return failure.
2010-03-16 22:47:24 +01:00
Eric Anholt
5782b2a968 i965: Fix readpixels from ReadBuffer != DrawBuffer.
Fixes piglit fbo-readdrawpix.
2010-03-16 13:23:35 -07:00
Eric Anholt
a589da14de i965: Fix inversion for glCopyPixels to/from FBOs.
fixes piglit fbo-copypix.
2010-03-16 13:18:54 -07:00
Eric Anholt
800a4b202f intel: Remove more code for x8z24 visuals, since we only do s8z24. 2010-03-16 13:18:54 -07:00
Eric Anholt
25becb8a7a Revert "i965: Do VS SGT, SLT, and friends using CMP, SEL instead of CMP, MOV, MOV."
This reverts commit 8ef3b1834a.  Fixes
piglit glsl-vs-if.
2010-03-16 13:18:54 -07:00
Eric Anholt
ba208604ea Revert "i965: Do FS SLT, SGT, and friends using CMP, SEL instead of CMP, MOV, MOV."
This reverts commit 46450c1f3f.  I was
wrong about null reg behavior -- it reads undefined, not 0.  And
they're not kidding.
2010-03-16 13:18:54 -07:00
Eric Anholt
7cbb7051f4 meta: Fix up restoration of state if _mesa_map_pbo_source() fails. 2010-03-16 13:18:54 -07:00
Eric Anholt
541c9c08e5 meta: Properly refcount our saved programs and texobjs.
Found while debugging bug #24119.
2010-03-16 13:18:53 -07:00
Brian Paul
7c45710859 gallium: add target-helpers/wrap_screen.c to C_SOURCES
Was commented out before.
2010-03-16 13:31:46 -06:00
Eric Anholt
a29c7948d9 i965: Fix ENDLOOP to only patch up this loop's BREAK and CONT.
Corresponds to d225a25e21a24508aea3b877c78beb35502e942d and fixes
piglit glsl-fs-loop-nested.  Bug #25173.
(cherry picked from commit a81836ee2f)
2010-03-16 12:15:18 -07:00
Eric Anholt
42e0e86866 i965: Unalias all GLSL source regs from the destination regs used.
We were doing it ad-hoc before, as instructions with potential
aliasing problems were identified.  But thanks to swizzling basically
anything can have aliasing, so just do it generally at source reg
setup time.  This is somewhat inefficient, because sometimes an
operation doesn't need unaliasing protection if the swizzling is safe,
but the unaliasing before didn't cover those cases either.

Fixes piglit glsl-fs-loop.
(cherry picked from commit 6b194dab6b)
2010-03-16 12:15:12 -07:00
Eric Anholt
d24f59d008 i965: Fix nested loops in the VS.
We were patching up all the break and continues between the start of
our loop and the end of our loop, even if they were breaks/continues
for an inner loop.  Avoiding patching already patched breaks/continues
fixes piglit glsl-vs-loop-nested.
(cherry picked from commit f6f547d87e)
2010-03-16 12:15:02 -07:00
Eric Anholt
009392f50d i965: Fix up VP constbuf leak on program delete.
(cherry picked from commit 7f6d2754d5)
2010-03-16 12:14:57 -07:00
Eric Anholt
1254d3d315 i965: Fix up the handling of point sprite coordinate replacement.
The code was walking over the regs of pairs of attributes and checking
whether the attribute with a given reg index had point sprite enabled.
So the point sprite setup code was rarely even getting executed.
Instead, we need to determine which channels of a reg need point
sprite coordinate replacement.  In addition, it was multiplying the
attribute by 1/w, when it's supposed to cover (0, 1) in each direction
regardless of w, and it wasn't filling in the Z and W components of
the texcoord as specified.

Fixes piglit point-sprite and the spriteblast demo.  Bug #24431, #22245.
(cherry picked from commit bc632d0437)
2010-03-16 12:14:48 -07:00
Eric Anholt
837f003eeb i965: Add support for the CMP opcode in the GLSL path.
This would be triggered by use of sqrt() along with control flow.
Fixes piglit-fs-sqrt-branch and a bug in Yo Frankie!.
(cherry picked from commit 48dca99feb)
2010-03-16 12:14:18 -07:00
Eric Anholt
7ee4db50b1 i965: Fix the response len of masked sampler messages for 8-wide dispatch.
The bad response length would hang the GPU with a masked sample in a
shader using control flow.  For 8-wide, the response length is always
4, and masked slots are just not written to.  brw_wm_glsl.c already
allocates registers in the right locations.

Fixes piglit glsl-fs-bug25902 (fd.o bug #25902).
(cherry picked from commit f6d210c284)
(cherry picked from commit dc8c035944)
2010-03-16 11:56:21 -07:00
Michal Krol
40c3861e1e st/mesa: Invalidate sampler view when texture object changes. 2010-03-16 19:40:15 +01:00
Ian Romanick
c1c9fad293 Remove nonexistant files from tarballs rule of Makefile
The Makefile should eventually be fixed to stop building tarballs if
one of the individual calls to tar fails.
2010-03-16 10:21:37 -07:00
Ian Romanick
f0c3262927 mesa: set version string to 7.8-rc1 2010-03-16 10:21:37 -07:00
Matthew W. S. Bell
d320152b47 Correct GL_EQUIV code in r67/7xx.
From 247e121106e8d3e389f2e5a6edf13ea70ac18df7 Mon Sep 17 00:00:00 2001

These seem to be documented in
<http://www.svgopen.org/2003/papers/RasterOperationsUsingFilterElements/index.html>.
2010-03-16 11:39:53 -04:00
Roland Scheidegger
ac8662c29d st/xorg: fix up xorg state tracker to use cso changes
use cso_set_fragment_sampler_views instead of cso_set_sampler_textures
2010-03-16 16:24:27 +01:00
Pauli Nieminen
e9c2c4a764 radeon: Fix buffer object unmap to be called only once for dma buffers.
If flush happens inside radeonRefillCurrentMaRegion the last dma buffer would
be unmapped twice. Unmapping buffer when moving buffer to wait list fixes the
mapping error.
2010-03-16 17:00:14 +02:00
Brian Paul
e1a4bb2370 regenerate gl_mangle.h to get new EGLImage functions 2010-03-16 07:56:56 -06:00
José Fonseca
759c1c287c libgl-xlib: Use a simple GALLIUM_DRIVER env var to select the pipe driver.
GALLIUM_DRIVER is being used in many other places, and it easier to
memorizing and understand than all the GALLIUM_NO_XXX.
2010-03-16 13:48:09 +00:00
José Fonseca
d731190ec3 gallium: Silence warning. 2010-03-16 13:46:10 +00:00
Roland Scheidegger
8f55a95178 gallium: change remaining util functions to use cso sampler views
changes arguments of util_blit_pixels_tex and util_gen_mipmap to
struct pipe_sampler_view * instead of struct pipe_texture *.
2010-03-16 11:25:12 +01:00
Michal Krol
e4b8a307b2 gallium/docs: Create a separate section for Sampler Views. 2010-03-16 10:58:33 +01:00
Keith Whitwell
8cdfd1219a Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.

Conflicts:
	src/gallium/drivers/nv50/nv50_tex.c
2010-03-16 09:02:38 +00:00
Chia-I Wu
e0ce4a4a09 i965g: Fix use of an uninitialized variable. 2010-03-16 15:51:17 +08:00
Chia-I Wu
9d3a873f42 Merge remote branch 'origin/gallium-st-api' 2010-03-16 15:12:46 +08:00
Ben Skeggs
95d43bccde nv50: fix texturing from >=4GiB mark 2010-03-16 13:18:39 +10:00
Jakob Bornecrantz
b586774016 llvmpipe: Fix rebase typo 2010-03-16 01:17:33 +00:00
Jakob Bornecrantz
8b63f9b497 winsys/sw: Add a software winsys layered on a pipe 2010-03-16 01:06:46 +00:00
Jakob Bornecrantz
eaee22ac88 i965g: Fix after context transfers 2010-03-16 01:06:46 +00:00
Brian Paul
cb1b0b4bec gallivm: checkpoint: stencil test code 2010-03-15 18:19:04 -06:00
Brian Paul
185be3a87a gallivm/llvmpipe: rename some constant building functions 2010-03-15 18:16:56 -06:00
Brian Paul
c86a499769 gallivm: fix up some #includes 2010-03-15 18:16:56 -06:00
Brian Paul
0d71ba46e6 gallivm/llvmpipe: rename os_llvm.h to lp_bld.h
The llvm wrapper wasn't really an OS thing.

Use lp_bld.h for now but we eventually should rename/re-prefix all the
files/functions in the gallivm/ directory.
2010-03-15 18:16:56 -06:00