Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pipe-video' of ↵ | Thomas Balling Sørensen | 2010-10-26 | 14 | -23/+171 |
|\ | | | | | | | | | | | | | | | | | | | | | | | git://anongit.freedesktop.org/~deathsimple/xvmc-r600 into pipe-video Conflicts: configure.ac src/gallium/auxiliary/vl/vl_compositor.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/softpipe/sp_video_context.c src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h | ||||
| * | Workaround for skipping vertex elements for r600g | Christian König | 2010-10-25 | 1 | -1/+2 |
| | | |||||
| * | Remove code copied over from r300 | Christian König | 2010-10-24 | 1 | -290/+0 |
| | | |||||
| * | First xvmc-r600 implementation | Christian König | 2010-10-23 | 9 | -2/+376 |
| | | |||||
| * | Fix uninitialized memory problems | Christian König | 2010-10-23 | 3 | -0/+7 |
| | | |||||
| * | Some more merge fixes | Christian König | 2010-10-23 | 1 | -16/+2 |
| | | |||||
| * | Fix problems created by Merge | Christian König | 2010-10-16 | 4 | -30/+44 |
| | | |||||
| * | Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video | Christian König | 2010-10-12 | 3686 | -1132105/+303377 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/nvfx/Makefile src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h src/gallium/include/state_tracker/dri1_api.h src/gallium/include/state_tracker/drm_api.h src/gallium/winsys/nouveau/drm/nouveau_drm_api.c | ||||
* | \ | Merge branch 'master' into pipe-video | Thomas Balling Sørensen | 2010-10-26 | 1138 | -30576/+36651 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: src/gallium/include/pipe/p_format.h | ||||
| * | | | egl_dri2: Fix a typo that make glFlush be called at wrong time. | Chia-I Wu | 2010-10-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | We want to call glFlush when there is a current context. That is, old_ctx. This is a regression introduced by d19afc57fe49816f3f3290410e0124d326577be2. | ||||
| * | | | r600g: add assembler support for all the kcache fields. | Dave Airlie | 2010-10-26 | 3 | -2/+17 |
| | | | | |||||
| * | | | mesa: additional teximage error checks for GL_EXT_texture_integer | Brian Paul | 2010-10-25 | 1 | -4/+38 |
| | | | | |||||
| * | | | mesa: additional switch cases for GL_EXT_texture_integer | Brian Paul | 2010-10-25 | 1 | -2/+87 |
| | | | | |||||
| * | | | mesa: additional glReadPixels error checks for GL_EXT_texture_integer | Brian Paul | 2010-10-25 | 1 | -0/+15 |
| | | | | |||||
| * | | | r600g: fix magic 0x1 ->flat shade ena | Dave Airlie | 2010-10-26 | 2 | -2/+2 |
| | | | | |||||
| * | | | glsl: Fix constant component count in vector constructor emitting. | Kenneth Graunke | 2010-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes freedesktop.org bug #31101 as well as piglit test cases assignment-type-mismatch.vert and constructor-28.vert. | ||||
| * | | | glsl: Fix ast-to-hir for ARB_fragment_coord_conventions | Chad Versace | 2010-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function ast_declarator_list::hir(), when processing keywords added by extension ARB_fragment_coord_conventions, made the mistake of checking only if the extension was __supported by the driver__. The correct behavior is to check if the extensi0n is __enabled in the parse state__. NOTE: this is a candidate for the 7.9 branch. Reviewed-by: Ian Romanick <[email protected]> | ||||
| * | | | translate: remove unused prototypes | Brian Paul | 2010-10-25 | 1 | -9/+0 |
| | | | | |||||
| * | | | translate: use function typedefs, casts to silence warnings | Brian Paul | 2010-10-25 | 2 | -27/+35 |
| | | | | |||||
| * | | | st/mesa: support RGBA16 and use it for RGBA12 as well | Marek Olšák | 2010-10-25 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Tested with r300g. Signed-off-by: Marek Olšák <[email protected]> | ||||
| * | | | rtasm: use pointer_to_func() to silence warning | Brian Paul | 2010-10-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | util: use pointer_to_func() to silence warning | Brian Paul | 2010-10-25 | 1 | -1/+2 |
| | | | | |||||
| * | | | xlib: silence unused var warning | Brian Paul | 2010-10-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | mesa: fix uninitialized var warning | Brian Paul | 2010-10-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | http://bugs.freedesktop.org/show_bug.cgi?id=31067 | ||||
| * | | | mesa: silence enum comparison warning | Brian Paul | 2010-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | http://bugs.freedesktop.org/show_bug.cgi?id=31069 | ||||
| * | | | r300g: fix texture border for 16-bits-per-channel formats | Marek Olšák | 2010-10-24 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | This is kinda hacky, but it's hard to come up with a generic solution for all formats when only a few are used in practice (I mostly get B8G8R8*8). | ||||
| * | | | mesa: allow FBO attachments of formats LUMINANCE, LUMINANCE_ALPHA, and INTENSITY | Marek Olšák | 2010-10-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | As per the GL_ARB_framebuffer_object specification. Signed-off-by: Marek Olšák <[email protected]> | ||||
| * | | | Ensure -L$(TOP)/$(LIB_DIR) appears in link line before any -L in $LDFLAGS | Jon TURNEY | 2010-10-24 | 2 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure -L$(TOP)/$(LIB_DIR) (the staging dir for build products), appears in the link line before any -L in $LDFLAGS, so that we link driver we are building with libEGL we have just built, and not an installed version [olv: make a similar change to targets/egl] Signed-off-by: Jon TURNEY <[email protected]> | ||||
| * | | | r600g: drop more common state handling code | Dave Airlie | 2010-10-24 | 4 | -151/+80 |
| | | | | |||||
| * | | | r600g: Also clear bc data when we're destroying a shader. | Tilman Sauerbeck | 2010-10-24 | 3 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [airlied: remove unused vars] Signed-off-by: Tilman Sauerbeck <[email protected]> Signed-off-by: Dave Airlie <[email protected]> | ||||
| * | | | r600g: Added r600_pipe_shader_destroy(). | Tilman Sauerbeck | 2010-10-24 | 3 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not yet complete. Signed-off-by: Tilman Sauerbeck <[email protected]> Signed-off-by: Dave Airlie <[email protected]> | ||||
| * | | | r600g: merge more of the common r600/evergreen state handling | Dave Airlie | 2010-10-24 | 4 | -172/+106 |
| | | | | |||||
| * | | | r600g: Fixed r600_vertex_element leak. | Tilman Sauerbeck | 2010-10-24 | 4 | -18/+10 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tilman Sauerbeck <[email protected]> Signed-off-by: Dave Airlie <[email protected]> | ||||
| * | | | softpipe: remove >32bpp color restriction | Brian Paul | 2010-10-23 | 2 | -8/+1 |
| | | | | | | | | | | | | | | | | The comment was out of date. The tile cache does handle >32-bit colors. | ||||
| * | | | st/mesa: be smarter choosing texture format for glDrawPixels() | Brian Paul | 2010-10-23 | 1 | -4/+46 |
| | | | | | | | | | | | | | | | | This lets us get an integer texture format for integer pixel formats. | ||||
| * | | | mesa: display list support for GL_EXT_texture_integer | Brian Paul | 2010-10-23 | 1 | -0/+144 |
| | | | | |||||
| * | | | mesa: plug in GL_EXT_texture_integer functions | Brian Paul | 2010-10-23 | 1 | -0/+7 |
| | | | | |||||
| * | | | mesa: regenerated API files for GL_EXT_texture_integer | Brian Paul | 2010-10-23 | 10 | -5701/+6237 |
| | | | | |||||
| * | | | glapi: include/build EXT_texture_integer.xml | Brian Paul | 2010-10-23 | 2 | -0/+3 |
| | | | | |||||
| * | | | glapi: GL_EXT_texture_integer API | Brian Paul | 2010-10-23 | 1 | -0/+98 |
| | | | | |||||
| * | | | mesa: simplify target_can_be_compressed() function | Brian Paul | 2010-10-23 | 1 | -8/+18 |
| | | | | |||||
| * | | | st/mesa: add format selection for signed/unsigned integer formats | Brian Paul | 2010-10-23 | 1 | -0/+120 |
| | | | | |||||
| * | | | mesa: added cases for GL_EXT_texture_integer | Brian Paul | 2010-10-23 | 1 | -0/+10 |
| | | | | |||||
| * | | | mesa: added cases for GL_EXT_texture_integer formats | Brian Paul | 2010-10-23 | 1 | -0/+20 |
| | | | | |||||
| * | | | mesa: compute _IntegerColor field in _mesa_test_framebuffer_completeness() | Brian Paul | 2010-10-23 | 1 | -0/+6 |
| | | | | |||||
| * | | | mesa: added glGet query for GL_RGBA_INTEGER_MODE_EXT | Brian Paul | 2010-10-23 | 1 | -0/+11 |
| | | | | |||||
| * | | | mesa: added new gl_framebuffer::_IntegerColor field | Brian Paul | 2010-10-23 | 1 | -0/+3 |
| | | | | |||||
| * | | | mesa: added new gl_extensions::EXT_gpu_shader4 field | Brian Paul | 2010-10-23 | 1 | -0/+1 |
| | | | | |||||
| * | | | softpipe: added some texture sample debug code (disabled) | Brian Paul | 2010-10-23 | 1 | -7/+50 |
| | | | | |||||
| * | | | mesa: new glDrawPixels error check for integer formats | Brian Paul | 2010-10-23 | 1 | -1/+11 |
| | | | |