OSDN Git Service
Brian Paul [Wed, 28 Apr 2010 13:21:25 +0000 (07:21 -0600)]
Merge branch '7.8'
Conflicts:
src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
Vinson Lee [Wed, 28 Apr 2010 07:14:39 +0000 (00:14 -0700)]
llvmpipe: Remove unnecessary header.
Pierre Willenbrock [Tue, 27 Apr 2010 21:16:49 +0000 (23:16 +0200)]
Disable scissor when begining meta operations
Signed-off-by: Eric Anholt <eric@anholt.net>
Pierre Willenbrock [Tue, 27 Apr 2010 21:16:48 +0000 (23:16 +0200)]
Don't set srcLevel on GL_TEXTURE_RECTANGLE_ARB targets
Signed-off-by: Eric Anholt <eric@anholt.net>
Pierre Willenbrock [Tue, 27 Apr 2010 21:16:47 +0000 (23:16 +0200)]
Fill the padding between entrys in the sampler key
This struct is used to generate a hash, ignoring the entry boundaries.
Signed-off-by: Eric Anholt <eric@anholt.net>
Pierre Willenbrock [Tue, 27 Apr 2010 21:16:46 +0000 (23:16 +0200)]
Initialize have_back.
There is a user somewhere that tests it before its initial set.
Signed-off-by: Eric Anholt <eric@anholt.net>
Eric Anholt [Mon, 26 Apr 2010 16:18:23 +0000 (09:18 -0700)]
i915: Add debugging for just prorgam compile under INTEL_DEBUG=wm
Eric Anholt [Mon, 26 Apr 2010 16:04:16 +0000 (09:04 -0700)]
i915: Provide counts in the error messages for program limits.
Brian Paul [Tue, 27 Apr 2010 23:06:17 +0000 (17:06 -0600)]
osmesa: update SRC_DIRS to fix build
Brian Paul [Tue, 27 Apr 2010 23:05:56 +0000 (17:05 -0600)]
osdemos: replace assertion with error handler
Marek Olšák [Sun, 18 Apr 2010 03:10:43 +0000 (05:10 +0200)]
r300g: move ZTOP to separate file
Ideally, HiZ should go in r300_hyperz.c next to ZTOP.
Brian Paul [Tue, 27 Apr 2010 22:57:42 +0000 (16:57 -0600)]
osmesa: don't need to link with -lGL
The gl entrypoints are in libOSMesa.so
Marek Olšák [Tue, 27 Apr 2010 22:38:27 +0000 (00:38 +0200)]
radeon: fix warnings
Pierre Willenbrock [Tue, 27 Apr 2010 21:16:49 +0000 (14:16 -0700)]
mesa: Disable scissor when begining meta operations
Signed-off-by: Brian Paul <brianp@vmware.com>
Ian Romanick [Tue, 27 Apr 2010 21:54:32 +0000 (14:54 -0700)]
Add missing _ in extension category name
Pierre Willenbrock [Tue, 27 Apr 2010 21:16:48 +0000 (14:16 -0700)]
mesa: Don't set srcLevel on GL_TEXTURE_RECTANGLE_ARB targets
Signed-off-by: Brian Paul <brianp@vmware.com>
Pierre Willenbrok [Tue, 27 Apr 2010 21:53:28 +0000 (15:53 -0600)]
glx: Initialize have_back.
Signed-off-by: Brian Paul <brianp@vmware.com>
José Fonseca [Tue, 27 Apr 2010 20:49:32 +0000 (21:49 +0100)]
gallium: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
Arcane DX9 opcodes that never were emitted by Mesa and have no DX10
counterpart. Slated for removal for quite some time now.
José Fonseca [Tue, 27 Apr 2010 20:18:31 +0000 (21:18 +0100)]
gallium/docs: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
José Fonseca [Tue, 27 Apr 2010 20:18:01 +0000 (21:18 +0100)]
tgsi: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
José Fonseca [Tue, 27 Apr 2010 20:17:08 +0000 (21:17 +0100)]
r300: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
José Fonseca [Tue, 27 Apr 2010 20:16:45 +0000 (21:16 +0100)]
cell: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
José Fonseca [Tue, 27 Apr 2010 20:16:35 +0000 (21:16 +0100)]
svga: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
José Fonseca [Tue, 27 Apr 2010 20:16:10 +0000 (21:16 +0100)]
gallivm: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
Jeremy Huddleston [Tue, 13 Apr 2010 01:37:47 +0000 (18:37 -0700)]
Buildfixes to work around issues in OpenGL.framework
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Tue, 13 Apr 2010 01:26:40 +0000 (18:26 -0700)]
Update OpenGL specs
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Sat, 2 Jan 2010 05:03:53 +0000 (00:03 -0500)]
apple: Use mesa gl.h rather than generating one.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Jeremy Huddleston [Fri, 2 Apr 2010 07:57:38 +0000 (00:57 -0700)]
apple: Integrate our libGL into the existing build system better
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Fri, 2 Apr 2010 07:54:57 +0000 (00:54 -0700)]
darwin: Use clientattrib
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Fri, 2 Apr 2010 08:35:19 +0000 (01:35 -0700)]
apple: Change ifdefs for DRI to be DRI && !APPLE
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston [Thu, 24 Dec 2009 17:51:17 +0000 (09:51 -0800)]
apple: Remove duplicate headers that already exist in mesa.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Jeremy Huddleston [Thu, 1 Apr 2010 18:01:31 +0000 (11:01 -0700)]
apple: Initial import of libGL for OSX from AppleSGLX svn repository.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Brian Paul [Tue, 27 Apr 2010 17:50:23 +0000 (11:50 -0600)]
llvmpipe: remove lp_scene_map_buffers(), lp_scene_unmap_buffers()
Brian Paul [Tue, 27 Apr 2010 17:44:33 +0000 (11:44 -0600)]
llvmpipe: implement max scene size
When the size of the scene (binned data plus referenced resources/textures)
exceeds LP_MAX_SCENE_SIZE flush/render the scene. This could be improved
in various ways but is a good start.
Fixes piglit streaming-texture-leak test.
Brian Paul [Tue, 27 Apr 2010 17:32:25 +0000 (11:32 -0600)]
llvmpipe: added llvmpipe_resource_size()
Brian Paul [Tue, 27 Apr 2010 17:31:45 +0000 (11:31 -0600)]
llvmpipe: comment-out unused field for now
Brian Paul [Tue, 27 Apr 2010 16:55:51 +0000 (10:55 -0600)]
llvmipe: update comments
Brian Paul [Tue, 27 Apr 2010 15:31:19 +0000 (09:31 -0600)]
mesa: move/rename is_depth_or_stencil_format()
Put it with other, similar functions.
Brian Paul [Tue, 27 Apr 2010 15:27:00 +0000 (09:27 -0600)]
st/mesa: rename var and update st_choose_format() comments
Chia-I Wu [Tue, 27 Apr 2010 15:19:27 +0000 (23:19 +0800)]
glapi: Fix loading of old DRI drivers.
The removal of _glapi_noop_enable_warnings and _glapi_set_warning_func
in
e4f168a6f4911a096be97d2e83ef8ad9c5862ec0 prevents DRI drivers built
before the commit from loading. Add stub versions of the functions to
make them load again.
Brian Paul [Tue, 27 Apr 2010 15:18:57 +0000 (09:18 -0600)]
st/mesa: call is_format_supported() for compressed formats
These compressed format switch cases shouldn't be hit if we don't
support the compressed texture extensions, but let's be safe and
ask the driver if they're supported as we do in other cases.
Brian Paul [Tue, 27 Apr 2010 15:14:32 +0000 (09:14 -0600)]
st/mesa: 80-column wrapping
Brian Paul [Tue, 27 Apr 2010 15:11:36 +0000 (09:11 -0600)]
st/mesa: try to get actual compressed format for GL_COMPRESSED_RGB[A] formats
Brian Paul [Tue, 27 Apr 2010 14:34:06 +0000 (08:34 -0600)]
Merge branch '7.8'
Conflicts:
src/gallium/drivers/nv30/nv30_context.c
src/gallium/drivers/nv40/nv40_context.c
src/gallium/drivers/nv40/nv40_state_emit.c
Brian Paul [Tue, 27 Apr 2010 14:28:53 +0000 (08:28 -0600)]
st/mesa: fix strides in (de)compress_image() functions
Mipmap generation for compressed textures works now.
Brian Paul [Tue, 27 Apr 2010 14:28:22 +0000 (08:28 -0600)]
util: fix assorted problems in the image packing functions
Pedro Maia [Tue, 27 Apr 2010 14:21:49 +0000 (08:21 -0600)]
nv30/40g: fix calls to draw_create(), draw_set_rasterizer_state()
Signed-off-by: Brian Paul <brianp@vmware.com>
José Fonseca [Tue, 27 Apr 2010 13:27:24 +0000 (14:27 +0100)]
gallivm: Disable llvm.cos.v4f32 and llvm.sin.v4f32 instrinsics on Windows.
Runtime linking doesn't quite work.
Just comment then out for now to prevent crashes. These will go away in
the future because calling 4 times CRT's cosf()/sinf() is over-precise
and under-performing.
José Fonseca [Tue, 27 Apr 2010 12:20:12 +0000 (13:20 +0100)]
gallivm: Ensure all allocas are in the first block.
Refactor the code to make this easier.
Jakob Bornecrantz [Tue, 27 Apr 2010 11:01:14 +0000 (12:01 +0100)]
i965g: Fix scons build of winsys
Jakob Bornecrantz [Mon, 26 Apr 2010 23:56:25 +0000 (00:56 +0100)]
st/dri: Don't check for null when user ensures non-null
Jakob Bornecrantz [Mon, 26 Apr 2010 14:32:08 +0000 (15:32 +0100)]
dri_util: Assume error checking is done properly in glXMakeCurrent
In short what the code did before:
__DRIscreen *psp = NULL;
if (pcp)
psp = pcp->psb;
assert(psp);
if (psp->stuff)
other_stuff();
return psb->even_more(pcp);
Remove all that stupid checking which still segfaults/asserts later on and
just do what we do in driUnbindContext. Also limited testing show libGL never
call driUnbindContext or driBindContext with cPriv == NULL.
Jakob Bornecrantz [Mon, 26 Apr 2010 13:59:46 +0000 (14:59 +0100)]
st/dri: Use flush function of old context not new
Marek Olšák [Tue, 27 Apr 2010 10:22:23 +0000 (12:22 +0200)]
r300g: fix mipmapped texture3D size calculation
I accidentally inverted the condition. :(
Broken since the commit
2579fe4044012a552c8be222ffae76b48de13592.
FDO bug #27851.
Marek Olšák [Tue, 27 Apr 2010 09:42:08 +0000 (11:42 +0200)]
r300g: compensate for non-atomized emit_query_end in the CS
And reserve a little more space just in case.
Vinson Lee [Tue, 27 Apr 2010 08:22:26 +0000 (01:22 -0700)]
progs/tests: Remove meaningless const qualifier in arraytexture.c.
Vinson Lee [Tue, 27 Apr 2010 07:46:00 +0000 (00:46 -0700)]
nvfx: Move src/gallium/drivers to beginning of SCons include path.
libdrm-2.4.20 and earlier include the nouveau/nouveau_class.h header. A
later version of libdrm will not ship this header. Mesa also has this
header at src/gallium/drivers.
The symbol NV34TCL_VTXFMT_TYPE_HALF is needed by nvfx_vbo.c. This symbol
is not in the libdrm copy of the header but is in the Mesa copy of the
header. This patch moves src/gallium/drivers to the beginning of the
include paths such that when building on hosts with libdrm-2.4.20 or
ealier the build uses the copy in Mesa.
Chia-I Wu [Tue, 27 Apr 2010 06:13:13 +0000 (14:13 +0800)]
progs/egl: Add egl/eglut to PROGRAM_DIRS.
Make sure eglut is built before the demos. This should work more
reliably with make -j<N>.
Brian Paul [Tue, 27 Apr 2010 02:35:55 +0000 (20:35 -0600)]
docs: update some GL3 status
Brian Paul [Tue, 27 Apr 2010 02:35:19 +0000 (20:35 -0600)]
mesa: start adding GL 3.1 signed normalized texture formats
Brian Paul [Tue, 27 Apr 2010 02:32:24 +0000 (20:32 -0600)]
docs: document updated glext.h and glxext.h files
Brian Paul [Tue, 27 Apr 2010 02:32:02 +0000 (20:32 -0600)]
glxext.h: upgraded to 2010/02/10 version
Brian Paul [Tue, 27 Apr 2010 02:31:19 +0000 (20:31 -0600)]
glext: upgraded to version 61
Marek Olšák [Tue, 27 Apr 2010 00:42:57 +0000 (02:42 +0200)]
r300g: reserve CS space for index offset
This has caused CS overflow since the commit
671f1e1229877d459cfd76e2cf5ea89c8d881036.
TA3D works here again.
Vinson Lee [Mon, 26 Apr 2010 23:31:05 +0000 (16:31 -0700)]
llvmpipe: Remove unused variable.
Marek Olšák [Mon, 26 Apr 2010 22:09:21 +0000 (00:09 +0200)]
r300g: add support for more unaligned vertex formats
An aligned stride is still needed for it to work.
I am slowly approaching the Sauerbraten milestone!
Marek Olšák [Mon, 26 Apr 2010 22:06:07 +0000 (00:06 +0200)]
r300g: setup PSC first, then align vertex formats
This allows us to put correct swizzles for undefined components in PSC.
Marek Olšák [Mon, 26 Apr 2010 22:01:03 +0000 (00:01 +0200)]
r300g: set undefined vertex swizzles to (0,0,0,1) respectively
Zack Rusin [Mon, 26 Apr 2010 17:51:47 +0000 (13:51 -0400)]
draw/llvm: implement fetch elts paths
we were only running the llvm paths when the input elts were linear,
now we can handle abritrary fetch elts arrays. we do this by generating
two paths - linear and fetch_elts one and just selecting the right one
at run time.
Alex Deucher [Mon, 26 Apr 2010 19:00:28 +0000 (15:00 -0400)]
r600: add support for more rendering formats
Marek Olšák [Mon, 26 Apr 2010 18:53:17 +0000 (20:53 +0200)]
r300g: disable point sprites (again)
They cause lockups. The users doesn't seem to like them.
Marek Olšák [Mon, 26 Apr 2010 18:16:59 +0000 (20:16 +0200)]
r300g: fix warnings when printing uint64_t
Though not nice, this is the correct way.
Marek Olšák [Mon, 26 Apr 2010 18:16:44 +0000 (20:16 +0200)]
r300g: fix warnings by using the const qualifier
See also the libdrm commit
af98ccf4dd5dcb1b904ec32b9bd1521e6bf7dda5.
Matt Turner [Mon, 26 Apr 2010 17:23:53 +0000 (13:23 -0400)]
r300g: use CS_OUT_TABLE better
Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Alex Deucher [Mon, 26 Apr 2010 17:45:01 +0000 (13:45 -0400)]
r600: avoid setting invalid bit on r7xx for blits
Alan Hourihane [Mon, 26 Apr 2010 16:42:51 +0000 (17:42 +0100)]
gallivm: BGNFOR/ENDFOR fallthrough to BGNLOOP/ENDLOOP
José Fonseca [Mon, 26 Apr 2010 14:31:37 +0000 (15:31 +0100)]
draw: Always use the llvm middle end when available & enabled.
José Fonseca [Mon, 26 Apr 2010 13:55:45 +0000 (14:55 +0100)]
svga: Pass-through max_index to translate.
José Fonseca [Mon, 26 Apr 2010 13:55:16 +0000 (14:55 +0100)]
draw: Pass-through pipe_buffer::max_index to translate.
max_index must be observed to prevent crashes due to bad index data.
I've been using this patch for some time without regressions.
Some places, where we use internal vertex buffer, it is not entirely
clear what max_index should be, so passing just ~0 to avoid regressions
for now.
José Fonseca [Mon, 26 Apr 2010 13:49:42 +0000 (14:49 +0100)]
translate: Take and respect a max_index argument.
Corbin Simpson [Mon, 26 Apr 2010 14:13:15 +0000 (07:13 -0700)]
r300g: Rudimentary stats, printed on exit.
Whoo!
Corbin Simpson [Mon, 26 Apr 2010 14:01:27 +0000 (07:01 -0700)]
r300g: Add stats debug flag.
Andre Maasikas [Mon, 26 Apr 2010 10:18:04 +0000 (13:18 +0300)]
r600: enable VERT_RESULT_PSIZ - makes point size & attenuation work
doc additions: shader export ARRAY_BASE for EXPORT_POS: 60 is position,
61 is misc vec(VS_OUT_MISC_VEC - used here),
62, 63 are clip distance vectors(VS_OUT_CCDIST#)
sorry for formating - there seem to be so many different styles in r600
Andre Maasikas [Mon, 26 Apr 2010 09:36:39 +0000 (12:36 +0300)]
r600: adjust point sprites after
911fa4a4a1
there's no more vp results for point coords so we cannot iterate
over vp outputs. Use only Point.CoordReplace[i]
Vinson Lee [Mon, 26 Apr 2010 08:08:34 +0000 (01:08 -0700)]
scons: Include headers from the local include directory first.
Certain headers, such as GL/glew.h, are in both the Mesa include and the
default installed include directories. On recent distros the needed
symbols can be found in both places. On older distros the installed
headers could be lacking symbols, so for a header that exists in both
places, the local one should be found first.
Vinson Lee [Mon, 26 Apr 2010 07:25:30 +0000 (00:25 -0700)]
os: Check for spurious wakeups in pipe_barrier_wait.
The POSIX function pthread_cond_wait can have spurious wakeups when
waiting on a condition variable.
Add a 64-bit counter that is incremented whenever the barrier becomes
full. A woken thread checks the counter. If the counter has not changed
then it has been spuriously woken and goes back to sleep. If the counter
has changed then it was properly signaled and exits the barrier.
Tested on Mac OS X.
This patch was based on ideas from Luca Barbieri.
Corbin Simpson [Mon, 26 Apr 2010 07:23:16 +0000 (00:23 -0700)]
r300g: Use table CS writing when applicable.
I just broke the 2000 fps barrier on glxgears. Yay?
Corbin Simpson [Mon, 26 Apr 2010 07:08:46 +0000 (00:08 -0700)]
r300g: Add CS table writing.
Vinson Lee [Mon, 26 Apr 2010 07:19:14 +0000 (00:19 -0700)]
et/egl: Remove dead code.
proc_name cannot be NULL after the switch statement. proc_name is
assigned a value or the function has already returned.
Vinson Lee [Mon, 26 Apr 2010 05:50:23 +0000 (22:50 -0700)]
nvfx: Add include path to SCons build.
Marek Olšák [Mon, 26 Apr 2010 05:08:59 +0000 (07:08 +0200)]
r300g: support index bias on r500 and DRM 2.3.0
Marek Olšák [Mon, 26 Apr 2010 04:35:21 +0000 (06:35 +0200)]
r300g: support rendering more than 65535 vertices in one batch on r500
and disable batch splitting on these chipsets.
Marek Olšák [Mon, 26 Apr 2010 04:29:10 +0000 (06:29 +0200)]
r300g: emit MSPOS regs
Marek Olšák [Mon, 26 Apr 2010 03:04:07 +0000 (05:04 +0200)]
r300g: force prefetch for non-indexed vertices
Marek Olšák [Mon, 26 Apr 2010 02:52:28 +0000 (04:52 +0200)]
r300g: use the dummy FS shader for shaders with zero instructions
Marek Olšák [Sun, 25 Apr 2010 23:58:07 +0000 (01:58 +0200)]
r300g: allow unaligned vertex formats if the stride is dword-aligned
Marek Olšák [Mon, 26 Apr 2010 00:27:03 +0000 (02:27 +0200)]
r300g: abort on unsupported vertex formats
Marek Olšák [Mon, 22 Mar 2010 01:18:51 +0000 (02:18 +0100)]
r300g: abort if a vertex buffer offset is not dword-aligned
Vinson Lee [Mon, 26 Apr 2010 04:42:19 +0000 (21:42 -0700)]
st/wgl: s/st_manager_create_api/st_gl_api_create/
commit
0c572c6828b6a338b07a6860280b3a314a81662e replaced
st_manager_create_api with st_gl_api_create.
Fixes MSVC build.
Vinson Lee [Mon, 26 Apr 2010 04:22:40 +0000 (21:22 -0700)]
nvfx: Add missing header.