Commit graph

33577 commits

Author SHA1 Message Date
Vinson Lee
11913e9798 draw llvm: Remove unnecessary header. 2010-04-19 23:58:23 -07:00
Dan Nicholson
a69ef34640 egl: Fix demos to build with user specified Xlib
Commit 88be2171e7 fixed the egl demos on the stable branch, but now
they're spread out across multiple subdirectories.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-04-19 20:25:17 -07:00
Dan Nicholson
02224ec4e0 Merge branch '7.8'
Conflicts:
	progs/egl/Makefile

progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.
2010-04-19 20:22:48 -07:00
Dan Nicholson
88be2171e7 egl: Pass flags to locate Xlib headers and libraries
eglplatform.h pulls in Xlib.h on X11 platforms. Likewise, the egl glx
driver and egl programs needs to link to libX11. Make sure we use the
locations the user told us about.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-04-19 20:21:57 -07:00
Dan Nicholson
8e5effefc7 progs: Fix linking of Xlib demos for non-autoconf builds
The Xlib demos were fixed to use $(X11_LIBS) so that configure could
detect the proper directory to link the library from, but this broke
the non-autoconf builds. Give X11_LIBS a default value to fallback on.
(cherry picked from commit e40fce13e1)
2010-04-19 20:21:57 -07:00
Dan Nicholson
4e7a4bed37 Change libX11 variables to not conflict with AC_PATH_XTRA
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir
parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars
for linking with Xlib to avoid the conflict.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit e725ef171b)
2010-04-19 20:21:57 -07:00
Dan Nicholson
4f8bf353bd gallium: Respect user's CFLAGS for including X headers
This can break on systems that don't have a system X installation.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit de4ee20578)

Conflicts:

	src/gallium/winsys/xlib/Makefile
2010-04-19 20:21:57 -07:00
Jeff Smith
3b693fd93f Use X_LIBS from pkg-config, instead of libdir, for locating libX11
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
(cherry picked from commit 8d86d395dc)
2010-04-19 20:21:57 -07:00
Brian Paul
35e60aed0b glapi: GL 3.x xml file
Some of the entrypoints defined in other .xml files will need to
be removed in favor of these...
2010-04-19 20:43:00 -06:00
Brian Paul
4c93cd13ba llvmpipe: remove dead code 2010-04-19 17:16:15 -06:00
Brian Paul
bd329d42e8 llvmpipe: use llvmpipe_resource_stride() 2010-04-19 17:15:25 -06:00
Brian Paul
079081222a gallivm: pass 3D texture stride as an array
This should have been included with the previous commit.
2010-04-19 17:14:57 -06:00
Brian Paul
f4071e55db llvmpipe: get 3D texture image stride from an array rather than computing it
This fixes broken 3D texture indexing when the height of the 3D texture
was less than 64 (the tile size).  It's simpler to pass this as an array
(as we do with the row stride) than to compute it on the fly.
2010-04-19 17:07:25 -06:00
Brian Paul
2cad62475b llvmpipe: consolidate some code in llvmpipe_set_texture_image_layout() 2010-04-19 17:07:25 -06:00
Brian Paul
202ff7db49 llvmpipe: fix rendering to 3D textures
Treat cube faces and 3D texture slices in the same manner (they're layed
out out continuously in memory).  Additional clean-ups and improvements
coming.
2010-04-19 17:07:25 -06:00
Brian Paul
ee7cf9d80f llvmpipe: checkpoint: fixes for render to 3D texture 2010-04-19 17:07:25 -06:00
Brian Paul
254dd0c23f llvmpipe: another fix for surface memory allocation
The previous patch broke cube maps.
The logic is a bit clearer now.
2010-04-19 17:07:25 -06:00
Marek Olšák
f189caeed0 r300g: add is_rv350 flag 2010-04-20 00:50:39 +02:00
Jesse Barnes
35489ef285 Merge branch '7.8' 2010-04-19 14:20:58 -07:00
Jesse Barnes
0a18cdb0ed DRI2: check for swapAvailable before using swap interval protocol
This should have been part of the last change...
2010-04-19 14:20:21 -07:00
Zack Rusin
7dfde3aadc draw llvm: make sure use_llvm isn't used when not defined 2010-04-19 13:33:49 -04:00
Zack Rusin
e3e5faba89 draw llvm: fix typo (boolean, not bool) 2010-04-19 13:30:36 -04:00
Brian Paul
05bf77a2da llvmpipe: fix surface memory allocation bug
We weren't always allocating the right amount of memory for image tiles
for some formats (those < 32bpp).

Fixes fd.o bug 27712.
2010-04-19 11:18:51 -06:00
Jesse Barnes
64644ec3b2 Merge branch '7.8' 2010-04-19 09:56:49 -07:00
Jesse Barnes
385e2896eb DRI2: synchronize swap interval with server at startup time
In the direct rendered case, we need to tell the server our initial swap
interval.  If we don't, the local and server values will be out of sync,
since the server and client defaults may be different (as they were
before this patch).
2010-04-19 09:56:32 -07:00
Zack Rusin
4df3e76949 draw llvm: allow runtime switching of pipelines (yes/no to llvm)
use DRAW_USE_LLVM to disable or enable (default) llvm
2010-04-19 12:53:27 -04:00
Zack Rusin
7c4208c3a0 draw llvm: fix constructor mess
use just one constructor to figure out whether to use llvm.
2010-04-19 12:53:27 -04:00
Zack Rusin
deee152363 llvmpipe: enable draw llvm by default 2010-04-19 12:53:27 -04:00
Brian Paul
653c681ce8 gallium/util: specify binding type for blit src texture
Fixes fd.o bug 27711.
2010-04-19 10:32:25 -06:00
Brian Paul
96b0807253 mesa: unmap the immediate mode VB before destroying it
Fixes failed assertion from fd.o bug 27713.

The assertion was added with the new resource/transfer changes.
This patch could apply to the 7.8 branch but it's not essential.
2010-04-19 10:27:57 -06:00
Brian Paul
c060265bdb st/mesa: invert scissor rect depending on FB orientation
Fixes fd.o bug 27715
2010-04-19 10:10:47 -06:00
Matthieu Herrb
cf7d08b443 mesa: Fix build with gcc 3.3.
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-04-19 09:33:53 -06:00
Matthieu Herrb
f4553d99c6 radeon: Let this build with gcc 3.3
Declaring the loop index inside for () is not supported by this version.

Signed-off-by: Brian Paul <brianp@vmware.com>
2010-04-19 09:33:53 -06:00
Owain Ainsworth
c39ab02ae9 radeon: Fix command type for DRM_RADEON_IRQ_EMIT ioctl.
This should be drmCommandWriteRead to avoid an EINVAL error on systems
that strictly check ioctl args. This command has been r/w for ever.
Discussion with airlied agreed that this was the correct course.

Signed-off-by: Brian Paul <brianp@vmware.com>
2010-04-19 09:33:50 -06:00
Matthieu Herrb
7f1ae3a94d mesa: Use __OpenBSD__ to check for OpenBSD.
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-04-19 09:33:42 -06:00
Brian Paul
a59771fb53 llvmpipe: triangle function comments 2010-04-19 08:53:13 -06:00
Brian Paul
62c9587385 gallium/draw: use a local var to simplify some code 2010-04-19 08:53:13 -06:00
Brian Paul
44519e18a4 softpipe: add option to do polygon stipple in softpipe vs. draw module
For debugging purposes.
2010-04-19 08:51:07 -06:00
Brian Paul
8f3bdeaad6 Merge branch '7.8'
Conflicts:

	src/gallium/auxiliary/draw/draw_context.c
	src/gallium/auxiliary/draw/draw_pipe_aaline.c
	src/gallium/drivers/llvmpipe/lp_context.c
2010-04-19 08:45:20 -06:00
Brian Paul
e3a34cc7f6 gallium/draw: use correct rasterization state for wide/AA points/lines
When points or lines are decomposed into triangles, we need to be sure
to disable polygon culling, stippling, "un-filled" modes, etc.

This patch sets the rasterization state to disable those things prior to
drawing points/lines with triangles, then restores the previous state
afterward.

The new piglit point-no-line-cull test checks this problem & solution.
2010-04-19 08:35:53 -06:00
Dave Airlie
f7c2d4fee3 r300c/r300g: add 3155 rv380 pci id 2010-04-19 19:23:19 +10:00
Vinson Lee
7f8676c0b0 gallivm: Remove redundant initialization of dst_vec_type.
dec_vec_type is already initialized to lp_build_vec_type(dst_type) at
its declaration.
2010-04-19 00:35:02 -07:00
Vinson Lee
57e71b8502 nv50: Fix include recursion.
Don't include nv50_context.h and use a forward declaration instead.
nv50_context.h includes nv50_screen.h (itself).
2010-04-19 00:05:57 -07:00
Vinson Lee
11cea8196c nvfx: Fix include recursion.
Don't include nvfx_context.h and use a forward reference instead.
nvfx_context.h includes nvfx_screen.h (itself).
2010-04-18 23:44:24 -07:00
Vinson Lee
478f19ff49 auxiliary: Move loop variable declaration outside for loop.
Fixes MSVC build.
2010-04-18 23:21:07 -07:00
Vinson Lee
c628a2e0c7 nvfx: Add missing header and forward declaration. 2010-04-18 23:09:31 -07:00
Vinson Lee
b2fc623497 nouveau: Add missing header. 2010-04-18 23:00:45 -07:00
Vinson Lee
5b83e0ea04 r300g: Remove unnecessary headers. 2010-04-18 22:51:35 -07:00
Vinson Lee
c61db7d200 i915g: Remove unnecessary header. 2010-04-18 22:49:55 -07:00
Vinson Lee
aa5be94139 auxiliary: Initialize variable. 2010-04-18 22:45:18 -07:00