Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into lp-binning | José Fonseca | 2010-01-16 | 63 | -152/+2012 |
|\ | | | | | | | | | | | Conflicts: src/gallium/drivers/llvmpipe/lp_quad.h src/gallium/drivers/llvmpipe/lp_setup.c | ||||
| * | r600: remove stray END_BATCH in blit code | Alex Deucher | 2010-01-16 | 1 | -1/+0 |
| | | |||||
| * | r600: improve blit support | Alex Deucher | 2010-01-15 | 2 | -247/+1074 |
| | | | | | | | | | | | | | | | | | | | | - fill in more src/dst formats - disable depth copies for now - set proper data formats in render target regs - fill in additional default state The swizzles on some of the less used mesa formats are probably wrong. | ||||
| * | r600: add initial blit support | Andre Maasikas | 2010-01-15 | 7 | -323/+701 |
| | | |||||
| * | r600: add r600_blit.c | Alex Deucher | 2010-01-15 | 1 | -0/+609 |
| | | | | | | | | Unfinished. | ||||
| * | Merge branch 'gallium-noconstbuf' | Roland Scheidegger | 2010-01-15 | 4 | -12/+12 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_draw_arrays.c src/mesa/state_tracker/st_draw_feedback.c | ||||
| | * | gallium: adapt state trackers etc. to pipe_constant_buffer removal | Roland Scheidegger | 2009-12-23 | 4 | -12/+12 |
| | | | |||||
| * | | st/mesa: Initialise vertex element instance divisor to 0. | Michal Krol | 2010-01-15 | 2 | -0/+3 |
| | | | |||||
| * | | Merge branch 'mesa_7_7_branch' | Jakob Bornecrantz | 2010-01-14 | 26 | -35/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c | ||||
| | * | | st/mesa: Remove unnecessary header from st_program.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | st/mesa: Remove unnecessary header from st_texture.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_accum.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_atifragshader.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_bitmap.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary headers from s_copypix.c. | Vinson Lee | 2010-01-13 | 1 | -2/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_depth.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_drawpix.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_feedback.c. | Vinson Lee | 2010-01-13 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_fragprog.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header in s_lines.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_points.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_readpix.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | swrast: Remove unnecessary header from s_texcombine.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | tnl: Remove unnecessary header from t_context.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | tnl: Remove unnecessary headers from t_draw.c. | Vinson Lee | 2010-01-12 | 1 | -4/+0 |
| | | | | |||||
| | * | | tnl: Remove unnecessary header from t_pipeline.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | tnl: Remove unnecessary header from t_rasterpos.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | tnl: Remove unnecessary header from t_vb_program.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | vbo: Remove unnecessary headers from vbo_exec.c. | Vinson Lee | 2010-01-12 | 1 | -3/+0 |
| | | | | |||||
| | * | | vbo: Remove unnecessary header from vbo_exec_array.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | vbo: Remove unnecessary header from vbo_exec_draw.c. | Vinson Lee | 2010-01-12 | 1 | -1/+0 |
| | | | | |||||
| | * | | vbo: Remove unnecessary headers from vbo_save.c. | Vinson Lee | 2010-01-12 | 1 | -2/+0 |
| | | | | |||||
| | * | | vbo: Remove unnecessary header from vbo_save_loopback.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | |||||
| | * | | vbo: Remove unnecessary header from vbo_split_copy.c. | Vinson Lee | 2010-01-11 | 1 | -3/+0 |
| | | | | |||||
| | * | | x86: Remove unnecessary header from x86_xform.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | | |||||
| | * | | radeon: fix prediction for r100 inline vert/elt emits. | Dave Airlie | 2010-01-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | On r100 we emit the indices inline so we need to account for that in the emission size. | ||||
| | * | | radeon: fix bug in realloc code. | Dave Airlie | 2010-01-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This bug was fixed in libdrm ages ago, port to non-kms | ||||
| * | | | st/mesa: removed unused var | Brian Paul | 2010-01-11 | 1 | -2/+0 |
| | | | | |||||
| * | | | st/mesa: comments, whitespace | Brian Paul | 2010-01-11 | 1 | -8/+15 |
| | | | | |||||
| * | | | st/mesa: Remove st_api.c. | Chia-I Wu | 2010-01-12 | 2 | -34/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | st_api.c is supposed to define st_api_OpenGL to advertise OpenGL support. However, the linker discards the symbol because it has no user. It is better to leave this to other state trackers that link to libmesagallium.a. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa | Jesse Barnes | 2010-01-11 | 8 | -8/+43 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts due to DRI1 removal: src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_screen.c | ||||
| | * | | | intel/DRI2: add DRI2flushExtension support with invalidate hook | Kristian Høgsberg | 2010-01-08 | 5 | -17/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to support the SwapBuffers code properly. Signed-off-by: Kristian Høgsberg <[email protected]> | ||||
| | * | | | DRI2/GLX: add INTEL_swap_event support | Jesse Barnes | 2010-01-08 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add event support for the GLX swap buffers event, along with DRI2 protocol support for generating GLX swap buffers events in the direct rendered case. Signed-off-by: Jesse Barnes <[email protected]> | ||||
| | * | | | DRI2: add SwapBuffers support | Jesse Barnes | 2010-01-08 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the new DRI2 protocol request, DRI2SwapBuffers, in both direct and indirect rendering context. This request allows the display server to optimize back->front swaps (e.g. through page flipping) and allows us to more easily support other GLX features like swap interval and the OML sync extension in DRI2. Signed-off-by: Jesse Barnes <[email protected]> | ||||
| * | | | | st: Mark functions in st_public.h and vg_tracker.h as public. | Chia-I Wu | 2010-01-11 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are the API of Gallium state tracker, and are used by EGL. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | | Fix compressed texture loads for non-minimal pitches | Luca Barbieri | 2010-01-11 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current glCompressedTexImage support in the state tracker assumes that compressed textures have minimal pitch. However, in some cases this is not true, such as for mipmaps of non-POT compressed textures on nVidia hardware. This patch adds a check and does a memcpy for each line instead of the whole image in that case. Signed-off-by: Keith Whitwell <[email protected]> Tweaks for C90 compilation. | ||||
| * | | | | radeon: fix prediction for r100 inline vert/elt emits. | Dave Airlie | 2010-01-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | On r100 we emit the indices inline so we need to account for that in the emission size. | ||||
| * | | | | radeon: fix bug in realloc code. | Dave Airlie | 2010-01-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This bug was fixed in libdrm ages ago, port to non-kms | ||||
| * | | | | st/dri: update dri2 drawables when viewport is changed | Ben Skeggs | 2010-01-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gnome-shell on nouveau, as well as window resize with various other applications. Signed-off-by: Ben Skeggs <[email protected]> | ||||
| * | | | | r300: minor accelerated blit fixes | Maciej Cencora | 2010-01-09 | 1 | -1/+14 |
| | | | | |