Younes Manton [Sat, 1 May 2010 00:42:30 +0000 (20:42 -0400)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/util/u_format.csv
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
src/gallium/drivers/identity/id_objects.c
src/gallium/drivers/identity/id_objects.h
src/gallium/drivers/identity/id_screen.c
src/gallium/drivers/nv40/Makefile
src/gallium/drivers/nv40/nv40_screen.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_texture.h
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/drivers/softpipe/sp_video_context.h
src/gallium/include/pipe/p_format.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/pipe/p_video_context.h
src/gallium/include/pipe/p_video_state.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/state_trackers/dri/common/dri_context.c
src/gallium/state_trackers/xorg/xvmc/attributes.c
src/gallium/state_trackers/xorg/xvmc/block.c
src/gallium/state_trackers/xorg/xvmc/context.c
src/gallium/state_trackers/xorg/xvmc/subpicture.c
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/state_trackers/xorg/xvmc/tests/.gitignore
src/gallium/state_trackers/xorg/xvmc/tests/Makefile
src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/g3dvl/vl_winsys.h
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
src/gallium/winsys/sw/Makefile
Younes Manton [Wed, 28 Apr 2010 23:51:10 +0000 (19:51 -0400)]
vl: WIP DRI2 support in the winsys.
Younes Manton [Sun, 25 Apr 2010 01:16:59 +0000 (21:16 -0400)]
st/xvmc: Mark exported funcs with PUBLIC.
Younes Manton [Sat, 24 Apr 2010 19:37:25 +0000 (15:37 -0400)]
vl: Adapt to dri changes.
Younes Manton [Sat, 24 Apr 2010 17:52:47 +0000 (13:52 -0400)]
vl: Get rid of pipe_video_surface on the nouveau side as well.
Younes Manton [Sat, 24 Apr 2010 17:52:23 +0000 (13:52 -0400)]
vl: Fix up configure.ac/Makefile
Jakob Bornecrantz [Mon, 19 Apr 2010 19:10:57 +0000 (20:10 +0100)]
svga: More don't recurse
Jakob Bornecrantz [Mon, 19 Apr 2010 19:09:38 +0000 (20:09 +0100)]
svga: Translate svga reloc flags to pb flags
Jakob Bornecrantz [Mon, 19 Apr 2010 18:12:49 +0000 (19:12 +0100)]
svga: Don't recurse
Brian Paul [Wed, 28 Apr 2010 21:27:08 +0000 (15:27 -0600)]
draw: remove extra semicolons
Brian Paul [Wed, 28 Apr 2010 21:23:03 +0000 (15:23 -0600)]
llvmpipe: free vertex buffer memory in lp_setup_vbuf_destroy()
Brian Paul [Wed, 28 Apr 2010 21:22:43 +0000 (15:22 -0600)]
llvmpipe: fix scene queue memory leak
Brian Paul [Wed, 28 Apr 2010 21:22:27 +0000 (15:22 -0600)]
llvmpipe: fix scene queue memory leak
Brian Paul [Wed, 28 Apr 2010 21:21:56 +0000 (15:21 -0600)]
llvmpipe: fix mem leak in llvmpipe_resource_destroy()
Brian Paul [Wed, 28 Apr 2010 21:14:58 +0000 (15:14 -0600)]
llvmpipe: fix surface memory leak during tear-down
Brian Paul [Wed, 28 Apr 2010 20:24:53 +0000 (14:24 -0600)]
llvmpipe: remove unused psize_slot field
Brian Paul [Wed, 28 Apr 2010 20:22:28 +0000 (14:22 -0600)]
llvmpipe: move/rename llvmpipe_init_surface_functions()
Brian Paul [Wed, 28 Apr 2010 20:19:15 +0000 (14:19 -0600)]
llvmpipe: make rasterizer-related functions static, clean-up initializations
Brian Paul [Wed, 28 Apr 2010 20:15:38 +0000 (14:15 -0600)]
llvmpipe: update comments, fix formatting
Brian Paul [Wed, 28 Apr 2010 20:14:37 +0000 (14:14 -0600)]
llvmpipe: remove old prototypes, fix-up formatting
Brian Paul [Wed, 28 Apr 2010 20:13:11 +0000 (14:13 -0600)]
llvmpipe: make shader-related functions static, clean-up initializations
Brian Paul [Wed, 28 Apr 2010 20:09:32 +0000 (14:09 -0600)]
llvmpipe: make clip-related functions static, clean-up initializations
Brian Paul [Wed, 28 Apr 2010 20:06:23 +0000 (14:06 -0600)]
llvmpipe: make draw-related functions static, clean-up initializations
Brian Paul [Wed, 28 Apr 2010 20:04:24 +0000 (14:04 -0600)]
llvmpipe: make vertex-related functions static, clean-up initializations
Brian Paul [Wed, 28 Apr 2010 20:01:04 +0000 (14:01 -0600)]
llvmpipe: make blend-related functions static, clean-up initializations
Brian Paul [Wed, 28 Apr 2010 19:57:03 +0000 (13:57 -0600)]
llvmpipe: make sampler-related functions static, clean-up initializations
Brian Paul [Wed, 28 Apr 2010 19:39:55 +0000 (13:39 -0600)]
llvmpipe: remove some unneeded shader structure fields
Brian Paul [Wed, 28 Apr 2010 19:18:51 +0000 (13:18 -0600)]
llvmpipe: dump shaders if LP_DEBUG=tgsi
Brian Paul [Wed, 28 Apr 2010 17:57:09 +0000 (11:57 -0600)]
draw: use a cast wrapper
Brian Paul [Wed, 28 Apr 2010 17:54:44 +0000 (11:54 -0600)]
draw: put 'create' in the vs varient create function names
Joakim Sindholt [Wed, 28 Apr 2010 19:09:30 +0000 (21:09 +0200)]
radeong: fix scons build
Brian Paul [Wed, 28 Apr 2010 17:43:54 +0000 (11:43 -0600)]
draw: add missing function parameter
Brian Paul [Wed, 28 Apr 2010 17:37:51 +0000 (11:37 -0600)]
softpipe: consolidate tex image offset code
Brian Paul [Tue, 27 Apr 2010 19:10:56 +0000 (13:10 -0600)]
llvmpipe: remove unused write_depth
Brian Paul [Wed, 28 Apr 2010 16:24:54 +0000 (10:24 -0600)]
st/mesa: move/improve Mesa GPU program debugging
Print the program (plus its parameters) before calling
st_translate_mesa_program() in case we die in that function.
Brian Paul [Wed, 28 Apr 2010 16:23:47 +0000 (10:23 -0600)]
st/mesa: add missing debug entry for DEBUG_CONSTANTS
Brian Paul [Wed, 28 Apr 2010 16:10:51 +0000 (10:10 -0600)]
Merge branch '7.8'
Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
Brian Paul [Wed, 28 Apr 2010 15:34:12 +0000 (09:34 -0600)]
softpipe: use consistant names for local vars
Brian Paul [Wed, 28 Apr 2010 15:02:09 +0000 (09:02 -0600)]
progs/demos: added code to test compressed mipmap generation (disabled)
Brian Paul [Tue, 27 Apr 2010 22:42:13 +0000 (16:42 -0600)]
gallium: remove trailing comma
Brian Paul [Tue, 27 Apr 2010 22:41:53 +0000 (16:41 -0600)]
gallium/util: convert //-style comments
Brian Paul [Tue, 27 Apr 2010 22:41:36 +0000 (16:41 -0600)]
gallium/util: convert //-style comments
Brian Paul [Wed, 28 Apr 2010 16:06:05 +0000 (10:06 -0600)]
st/mesa: fix incorrect RowStride computation
Fixes incorrect stride when getting a compressed tex image.
Brian Paul [Wed, 28 Apr 2010 16:05:00 +0000 (10:05 -0600)]
st/mesa: fill in stImage->level in st_generate_mipmap()
Before, this field was always zero for all the new mipmap levels.
Fixes problems with glGetTexImage() from a generated mipmap.
Jakob Bornecrantz [Wed, 28 Apr 2010 15:27:51 +0000 (16:27 +0100)]
Merge branch '7.8'
Jakob Bornecrantz [Wed, 28 Apr 2010 15:19:41 +0000 (16:19 +0100)]
glx: Fix build
Jakob Bornecrantz [Wed, 28 Apr 2010 15:19:41 +0000 (16:19 +0100)]
glx: Fix build
Jakob Bornecrantz [Wed, 28 Apr 2010 12:38:58 +0000 (13:38 +0100)]
configure.ac: Print some llvm info
Micah Fedke [Wed, 28 Apr 2010 13:25:58 +0000 (07:25 -0600)]
egl: dri2 driver error output
This patch amends the error output string for the case where the
dri2 egl driver could not open the dri dev node.
Signed-off-by: Brian Paul <brianp@vmware.com>
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
projects / mesa.git / log