Christoph Bumiller [Fri, 8 Jan 2010 16:15:52 +0000 (17:15 +0100)]
nv50: try to honor sprite coord mode
Brian Paul [Fri, 8 Jan 2010 15:21:12 +0000 (08:21 -0700)]
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_emit.c
Dan Nicholson [Fri, 8 Jan 2010 13:59:55 +0000 (05:59 -0800)]
mesa: Ensure libmesagallium.a is finished building before descending
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Dan Nicholson [Fri, 8 Jan 2010 01:11:37 +0000 (17:11 -0800)]
mklib: Extract archives into temporary directories
When static libraries are created from other archives, objects are
extracted and then deleted when the static library is done. This can
race when there are multiple static libraries being created from the
same archives as with libmesa.a and libmesagallium.a.
Should fix this issue with parallel jobs:
make[5]: *** No rule to make target
> `../../../../../../src/mesa/libmesagallium.a', needed by
> `radeon_dri.so'. Stop
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reported-and-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Michal Krol [Fri, 8 Jan 2010 11:02:41 +0000 (12:02 +0100)]
tgsi: Cleanup dot-product opcodes in interpreter.
Vinson Lee [Fri, 8 Jan 2010 09:13:46 +0000 (01:13 -0800)]
r300: Move initial declaration outside for loop.
Francisco Jerez [Fri, 8 Jan 2010 03:42:28 +0000 (04:42 +0100)]
nv20: Fix build for the latest nouveau_class.h changes.
José Fonseca [Fri, 8 Jan 2010 01:25:27 +0000 (01:25 +0000)]
scons: Don't build xlib when dri is enabled.
Hopefully adddresses fdo 25828.
José Fonseca [Fri, 8 Jan 2010 01:15:17 +0000 (01:15 +0000)]
lvmpipe: Initialize all coordinates.
Fixes assertion failure with fp-incomplete-tex (fdo 24298).
José Fonseca [Fri, 8 Jan 2010 00:50:09 +0000 (00:50 +0000)]
scons: Output a meaningful message when xlib libGL.so can't be built.
José Fonseca [Fri, 8 Jan 2010 00:33:58 +0000 (00:33 +0000)]
scons: Use static glew library on Unices to avoid binary compatability issues
Fixes bug 25926.
Keith Whitwell [Thu, 26 Nov 2009 23:56:48 +0000 (23:56 +0000)]
st/xorg: remove unused xorg_exa_get_pixmap_handle function
Brian Paul [Thu, 7 Jan 2010 21:55:27 +0000 (14:55 -0700)]
docs: document Gallium SSE codegen for XPD bug fix
Brian Paul [Thu, 7 Jan 2010 21:49:12 +0000 (14:49 -0700)]
tgsi: fix SSE code emit for XPD
Rearrange things so that the writes to the dest registers happen
after we've fetched/used all src registers.
The problematic instruction was: XPD TEMP[2].xyz, TEMP[0], TEMP[2];
Note that the dst reg is also a src reg.
This fixes bad shading with progs/glsl/bump.c since Eric's changes to the
Mesa program optimizer in commit
d6690ce15fb8c7c6abf1bc0d847c1d2da2c33904.
The optimizer rearranges some registers so we occasionally wind up with
something like the above.
Christoph Bumiller [Thu, 7 Jan 2010 20:17:13 +0000 (21:17 +0100)]
nv50: preallocate TEMPs written first time in a subroutine
Otherwise we risk overwriting them with temporary GPRs if
they're not used immediately after the CALL.
Christoph Bumiller [Thu, 7 Jan 2010 17:23:04 +0000 (18:23 +0100)]
nv50: handle TGSI_OPCODE_SAD,UADD
Christoph Bumiller [Thu, 7 Jan 2010 16:59:58 +0000 (17:59 +0100)]
nv50: handle TGSI_OPCODE_IMAX,IMIN,UMAX,UMIN
Christoph Bumiller [Thu, 7 Jan 2010 18:48:50 +0000 (19:48 +0100)]
nv50: handle integer SET operations
Christoph Bumiller [Thu, 7 Jan 2010 16:48:41 +0000 (17:48 +0100)]
nv50: handle TGSI_OPCODE_SHL,ISHR,USHR
Christoph Bumiller [Thu, 7 Jan 2010 18:45:44 +0000 (19:45 +0100)]
nv50: handle TGSI_OPCODE_F2I,F2U,I2F,U2F plus src mods
Eric Anholt [Tue, 5 Jan 2010 20:01:13 +0000 (12:01 -0800)]
intel: Remove leftover symlinks from DRI1 removal.
Brian Paul [Thu, 7 Jan 2010 18:18:04 +0000 (11:18 -0700)]
tgsi: add assertion to verify legal register file
This assertion fails with piglit glsl-vs-mov-after-deref test
because we're double freeing the memory. It seems there's some
confusion between what's placed in the hash table and what isn't.
Brian Paul [Thu, 7 Jan 2010 17:57:33 +0000 (10:57 -0700)]
tgsi: fix incorrectly placed braces, add more braces to be clear
Brian Paul [Thu, 7 Jan 2010 17:54:56 +0000 (10:54 -0700)]
tgsi: move register checking code before check_register_usage()
check_register_usage() frees the scan_register *reg data so we were
reading from freed memory. This fixes a valgrind error found with
piglit's glsl-vs-mov-after-deref test.
Brian Paul [Thu, 7 Jan 2010 16:43:08 +0000 (09:43 -0700)]
swrast: fix color masking for glAccum(GL_RETURN)
Should fix fdo bug 25837.
Brian Paul [Thu, 7 Jan 2010 16:40:08 +0000 (09:40 -0700)]
i810: use ColorMask[0]
Brian Paul [Thu, 7 Jan 2010 16:10:53 +0000 (09:10 -0700)]
progs/fp: increase buffer size to read larger shaders
Brian Paul [Thu, 7 Jan 2010 15:49:33 +0000 (08:49 -0700)]
gallium/util: remove useless assertions
Brian Paul [Thu, 7 Jan 2010 15:49:05 +0000 (08:49 -0700)]
gallium/util: update comment: s/src_pitch/src_stride
Brian Paul [Thu, 7 Jan 2010 15:48:25 +0000 (08:48 -0700)]
gallium/util: make src_y unsigned like the other x/y params
José Fonseca [Thu, 7 Jan 2010 16:16:45 +0000 (16:16 +0000)]
llvmpipe: Remove TGSI sampler pointers from JIT context too.
José Fonseca [Thu, 7 Jan 2010 15:59:41 +0000 (15:59 +0000)]
llvmpipe: Remove more loose ends of TGSI exec sampling.
Kristian Høgsberg [Thu, 7 Jan 2010 15:29:29 +0000 (10:29 -0500)]
configure: Fix matching for dri driver to actually work
The shell case statement obviously only evaluates the first matching
block. Thanks to Julien Cristau for spotting the bug.
Brian Paul [Thu, 7 Jan 2010 15:42:43 +0000 (08:42 -0700)]
makefile: added src/glsl/Makefile.template to tarball list
Keith Whitwell [Thu, 7 Jan 2010 11:19:38 +0000 (11:19 +0000)]
i965g: updates for draw retval
José Fonseca [Thu, 7 Jan 2010 15:34:52 +0000 (15:34 +0000)]
llvmpipe: Axe texture sampling code inherited from softpipe.
Was used only as a reference, since texture sampling is now code generated.
Already axed in the lp-binning branch too.
This fixes the llvmpipe build after recent sampling changes.
Brian Paul [Thu, 7 Jan 2010 15:22:37 +0000 (08:22 -0700)]
progs/fp: remove invalid tri-inv.c test
INV is not a valid instruction.
Michal Krol [Thu, 7 Jan 2010 12:48:41 +0000 (13:48 +0100)]
gallium: Fix texture sampling with explicit LOD in softpipe.
Michal Krol [Thu, 7 Jan 2010 11:48:10 +0000 (12:48 +0100)]
gallium: Pass per-element (not per-quad) LOD bias values down to texture sampler.
Michal Krol [Thu, 7 Jan 2010 10:10:24 +0000 (11:10 +0100)]
tgsi: Cleanup exec_tex().
Michal Krol [Wed, 6 Jan 2010 17:36:45 +0000 (18:36 +0100)]
svga: Fix fs key size computation and key comparison.
This also allows us to have texture_target
back as a bitfield and save us a few bytes.
Vinson Lee [Thu, 7 Jan 2010 05:39:44 +0000 (21:39 -0800)]
progs/demos: Assert that input to malloc is valid.
Vinson Lee [Thu, 7 Jan 2010 02:18:49 +0000 (18:18 -0800)]
progs/xdemos: Check for string overflow.
Vinson Lee [Thu, 7 Jan 2010 02:08:17 +0000 (18:08 -0800)]
progs/xdemos: Check for string overflow.
Vinson Lee [Thu, 7 Jan 2010 01:51:08 +0000 (17:51 -0800)]
svga: Silence uninitialized variable warning.
Brian Paul [Thu, 7 Jan 2010 01:22:05 +0000 (18:22 -0700)]
meta: remove F suffix from _mesa_Ortho() params
_mesa_Ortho() takes GLdoubles.
Brian Paul [Thu, 7 Jan 2010 01:19:42 +0000 (18:19 -0700)]
docs: document a mipmap generation bug fix
Brian Paul [Thu, 7 Jan 2010 01:18:04 +0000 (18:18 -0700)]
meta: move destination vertex/projection setup out of _mesa_meta_GenerateMipmap
Based on a patch submitted by Pierre Willenbrock <pierre@pirsoft.de>
Brian Paul [Thu, 7 Jan 2010 01:12:42 +0000 (18:12 -0700)]
meta: set viewport and projection matrix in _mesa_meta_GenerateMipmap
This fixes mipmap levels being clipped to the last viewport.
Based on a patch submitted by Pierre Willenbrock <pierre@pirsoft.de>
Andre Maasikas [Tue, 22 Dec 2009 12:50:10 +0000 (14:50 +0200)]
r600: adjust after radeon mipmap changes in
7118db8700
R600_OUT_BATCH_RELOC doesn't really use offset so set it
in TEX_RESOURCE2
+ typo fix
Brian Paul [Thu, 7 Jan 2010 00:42:53 +0000 (17:42 -0700)]
tnl: set FOGC result to (f,0,0,1)
Fixed FDO bug 23397.
Vinson Lee [Wed, 6 Jan 2010 23:35:18 +0000 (15:35 -0800)]
progs/xdemos: Remove comma at end of enumerator list.
Vinson Lee [Wed, 6 Jan 2010 23:33:13 +0000 (15:33 -0800)]
progs/xdemos: Use temporary variables.
This was missed from the previous commit to glxheads.c.
Vinson Lee [Wed, 6 Jan 2010 23:25:42 +0000 (15:25 -0800)]
progs/glsl: Prevent possible string overflow.
Vinson Lee [Wed, 6 Jan 2010 22:55:02 +0000 (14:55 -0800)]
progs/xdemos: Prevent possible string overflow.
Marek Olšák [Sat, 19 Dec 2009 22:55:34 +0000 (23:55 +0100)]
r300g: add back-face color VS outputs
Required for two-sided lighting. BTW we are approaching softpipe-level
quality. ;)
Marek Olšák [Fri, 25 Dec 2009 16:09:21 +0000 (17:09 +0100)]
r300g: fix SWTCL stream locations of texture coordinates
It might have caused hardlocks when TCL was bypassed, not sure.
Marek Olšák [Thu, 24 Dec 2009 13:23:57 +0000 (14:23 +0100)]
r300g: if no DS buffer is set, disable reading from and writing to it
It fixes another "Bad CS" issue.
Marek Olšák [Thu, 24 Dec 2009 15:05:44 +0000 (16:05 +0100)]
r300g: disable the rasterization of WPOS if it's unused by the FS
Marek Olšák [Thu, 24 Dec 2009 02:10:33 +0000 (03:10 +0100)]
r300g: add WPOS
Marek Olšák [Thu, 24 Dec 2009 12:31:27 +0000 (13:31 +0100)]
r300/compiler: add full viewport transformation support in WPOS codegen
Marek Olšák [Mon, 21 Dec 2009 01:10:34 +0000 (02:10 +0100)]
r300g: consolidate params
Marek Olšák [Thu, 24 Dec 2009 16:40:53 +0000 (17:40 +0100)]
r300g: fix outputting depth in the FS
Marek Olšák [Mon, 21 Dec 2009 00:38:45 +0000 (01:38 +0100)]
r300g: optimize blending by conditionally disabling reads from the colorbuffer
Marek Olšák [Sun, 20 Dec 2009 17:19:03 +0000 (18:19 +0100)]
r300g: optimize blending by discarding pixels that don't change the colorbuffer
Let's get some performance out of the blender.
Marek Olšák [Sun, 20 Dec 2009 03:28:30 +0000 (04:28 +0100)]
r300g: fix blending when SRC_ALPHA_SATURATE is used
Marek Olšák [Wed, 23 Dec 2009 08:59:30 +0000 (09:59 +0100)]
util/blitter: allow NULL CSOs to be saved
Keith Whitwell [Wed, 6 Jan 2010 18:05:08 +0000 (18:05 +0000)]
softpipe: fix draw return value
Pierre Ossman [Wed, 6 Jan 2010 17:42:49 +0000 (12:42 -0500)]
r600: float texture component ordering
The ordering of texture components was
backwards for the floating point textures.
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Brian Paul [Wed, 6 Jan 2010 17:36:51 +0000 (10:36 -0700)]
r300g: add missing is_anistropic param
Brian Paul [Wed, 6 Jan 2010 16:54:34 +0000 (09:54 -0700)]
svga: make texture_target a ubyte, not a bitfield
gcc won't let us take the address of a bitfield in the svga_fs_key_size()
function.
Roel Kluin [Wed, 6 Jan 2010 16:27:42 +0000 (08:27 -0800)]
mesa: test index bounds before array element
Check whether the index is within bounds before accessing the array.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Roel Kluin [Wed, 6 Jan 2010 16:20:28 +0000 (08:20 -0800)]
win32_menu: add missing parentheses in mapMenu()
`|' has higher precedence than `?'.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Roel Kluin [Wed, 6 Jan 2010 16:07:00 +0000 (08:07 -0800)]
nv50: add missing parentheses in nv50_query_result()
NOUVEAU_BO_RD is defined (1 << 2), and `|' has higher precedence than `?'
so the second argument of nouveau_bo_map was always 0.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Brian Paul [Wed, 6 Jan 2010 16:42:53 +0000 (09:42 -0700)]
gallium/docs: finish up description of pipe_rasterizer_state fields
Brian Paul [Wed, 6 Jan 2010 15:13:56 +0000 (08:13 -0700)]
configs: set INTEL_LIBS, INTEL_CFLAGS, etc
Michal Krol [Wed, 6 Jan 2010 15:07:49 +0000 (16:07 +0100)]
util: Fix format descriptor table entries.
Michal Krol [Wed, 6 Jan 2010 13:12:10 +0000 (14:12 +0100)]
pipe_sampler_state::compare_mode is not a boolean enable flag.
It's a 1-bit enum.
Michal Krol [Wed, 6 Jan 2010 13:07:12 +0000 (14:07 +0100)]
util: Handle the remaining format cases in pipe_tile_raw_to_rgba().
Michal Krol [Wed, 6 Jan 2010 10:23:43 +0000 (11:23 +0100)]
Make sure we use only signed/unsigned ints with bitfields.
Seems to be the only way to stay fully portable.
Brian Paul [Wed, 6 Jan 2010 14:17:13 +0000 (07:17 -0700)]
i965: fix invalid assertion in emit_xpd(), again
Brian Paul [Wed, 6 Jan 2010 14:17:48 +0000 (07:17 -0700)]
i965g: fix invalid assertion in emit_xpd(), again
José Fonseca [Wed, 6 Jan 2010 13:52:22 +0000 (13:52 +0000)]
Merge remote branch 'origin/mesa_7_7_branch'
Conflicts:
configs/default
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/mesa/main/version.h
José Fonseca [Sun, 3 Jan 2010 21:30:02 +0000 (21:30 +0000)]
glew: Update to version 1.5.2.
José Fonseca [Tue, 5 Jan 2010 20:41:29 +0000 (20:41 +0000)]
pipebuffer: Multi-threading fixes for fencing.
I had this patch on my hard drive for long time. It doesn't fully
address SVGA multi-threading issues, but causes no regressions, so decided
to commit while it still applies cleanly.
Attention: merging this into master will cause issues due to recent
changes in reference counting to fix strict aliasing rules violation.
Luca Barbieri [Wed, 6 Jan 2010 10:35:47 +0000 (10:35 +0000)]
gallium: remove PIPE_TEX_FILTER_ANISO
This patch removes PIPE_TEX_FILTER_ANISO.
Anisotropic filtering is enabled if and only if max_anisotropy > 1.0.
Values between 0.0 and 1.0, inclusive, of max_anisotropy are to be
considered equivalent, and meaning to turn off anisotropic filtering.
This approach has the small drawback of eliminating the possibility of
enabling anisotropic filter on either minification or magnification
separately, which Radeon hardware seems to support, is currently
support by Gallium but not exposed to OpenGL. If this is actually
useful it could be handled by splitting max_anisotropy in two values
and adding an appropriate OpenGL extension.
NOTE: some fiddling & reformatting by keithw to get this patch to
apply. Hopefully nothing broken in the process.
Brian Paul [Wed, 6 Jan 2010 04:25:56 +0000 (21:25 -0700)]
docs: added more GL3 items
Brian Paul [Wed, 6 Jan 2010 04:24:48 +0000 (21:24 -0700)]
mesa: added GL_MAJOR_VERSION and GL_MINOR_VERSION queries
New in GL 3.0.
Brian Paul [Wed, 6 Jan 2010 04:23:59 +0000 (21:23 -0700)]
mesa: call _mesa_compute_version() to set context's version info
Brian Paul [Wed, 6 Jan 2010 04:23:16 +0000 (21:23 -0700)]
mesa: added version.c to build
Brian Paul [Wed, 6 Jan 2010 04:23:01 +0000 (21:23 -0700)]
mesa: added _mesa_compute_version() in new version.c file
Brian Paul [Wed, 6 Jan 2010 04:17:55 +0000 (21:17 -0700)]
mesa: added version fields to GLcontext
Brian Paul [Wed, 6 Jan 2010 00:07:44 +0000 (17:07 -0700)]
gallium/util: replace 8 with PIPE_MAX_COLOR_BUFS
Brian Paul [Tue, 5 Jan 2010 23:55:35 +0000 (16:55 -0700)]
gallium/util: comments and whitespace fixes
Brian Paul [Tue, 5 Jan 2010 23:03:11 +0000 (16:03 -0700)]
docs: added link to wiki page about missing Mesa features
Brian Paul [Tue, 5 Jan 2010 22:53:46 +0000 (15:53 -0700)]
i965g: fix invalid assertion in emit_xpd()
Invalid assertion found by Roel Kluin <roel.kluin@gmail.com>
Brian Paul [Tue, 5 Jan 2010 22:53:01 +0000 (15:53 -0700)]
i965: fix invalid assertion in emit_xpd()
Invalid assertion found by Roel Kluin <roel.kluin@gmail.com>
Roel Kluin [Tue, 5 Jan 2010 21:40:40 +0000 (13:40 -0800)]
tdfx: condition always evaluates to false in SetupDoubleTexEnvVoodoo3()
This can never be true.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Eric Anholt [Tue, 5 Jan 2010 19:07:54 +0000 (11:07 -0800)]
i965: Fix build after blind merge of mesa 7.7 by Brian.
Brian Paul [Tue, 5 Jan 2010 18:40:24 +0000 (11:40 -0700)]
st/mesa: fix broken translation of negative register indexes
A src register's index can be negative if we're doing indirect
addressing into the constant buffer. Ex: MOV OUT[1], CONST[ADDR[0].x-3]
This fixes the piglit vp-arl-neg-array.vpfp test.
Before this change we were going out of bounds of the t->constants[]
array and getting garbage that later triggered an assertion.