summaryrefslogtreecommitdiff
path: root/src/mesa
AgeCommit message (Collapse)Author
2010-01-15Merge branch 'gallium-noconstbuf'Roland Scheidegger
Conflicts: src/gallium/drivers/softpipe/sp_draw_arrays.c src/mesa/state_tracker/st_draw_feedback.c
2010-01-15st/mesa: Initialise vertex element instance divisor to 0.Michal Krol
2010-01-14Merge branch 'mesa_7_7_branch'Jakob Bornecrantz
Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
2010-01-13st/mesa: Remove unnecessary header from st_program.c.Vinson Lee
2010-01-13st/mesa: Remove unnecessary header from st_texture.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_accum.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_atifragshader.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_bitmap.c.Vinson Lee
2010-01-13swrast: Remove unnecessary headers from s_copypix.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_depth.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_drawpix.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_feedback.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_fragprog.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header in s_lines.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_points.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_readpix.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_texcombine.c.Vinson Lee
2010-01-12tnl: Remove unnecessary header from t_context.c.Vinson Lee
2010-01-12tnl: Remove unnecessary headers from t_draw.c.Vinson Lee
2010-01-12tnl: Remove unnecessary header from t_pipeline.c.Vinson Lee
2010-01-12tnl: Remove unnecessary header from t_rasterpos.c.Vinson Lee
2010-01-12tnl: Remove unnecessary header from t_vb_program.c.Vinson Lee
2010-01-12vbo: Remove unnecessary headers from vbo_exec.c.Vinson Lee
2010-01-12vbo: Remove unnecessary header from vbo_exec_array.c.Vinson Lee
2010-01-12vbo: Remove unnecessary header from vbo_exec_draw.c.Vinson Lee
2010-01-12vbo: Remove unnecessary headers from vbo_save.c.Vinson Lee
2010-01-11vbo: Remove unnecessary header from vbo_save_loopback.c.Vinson Lee
2010-01-11vbo: Remove unnecessary header from vbo_split_copy.c.Vinson Lee
2010-01-11x86: Remove unnecessary header from x86_xform.c.Vinson Lee
2010-01-11st/mesa: removed unused varBrian Paul
2010-01-11st/mesa: comments, whitespaceBrian Paul
2010-01-12mesa/es: Update sources.mk.Chia-I Wu
Add/remove files that are unused/used to the omit list. Finally, they should all be features that can be omitted. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12mesa/es: Fix build issue after merge.Chia-I Wu
In cd6b8dd9e82fedc55d033131fbc0f8ee950567c8, color read/type fields are moved; Based on 068596c9a7e8d330ffdff8ad8700bd6093b5bdea and cc020425e929110613ddb405d3e82313d27a35ed, GLSL builtin library is autogenerated and GLSL libraries are built and used. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12Merge branch 'master' into opengl-es-v2Chia-I Wu
Conflicts: src/mesa/main/dd.h
2010-01-12st/mesa: Remove st_api.c.Chia-I Wu
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 <olvaffe@gmail.com>
2010-01-11Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesaJesse Barnes
Conflicts due to DRI1 removal: src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_screen.c
2010-01-11st: Mark functions in st_public.h and vg_tracker.h as public.Chia-I Wu
These functions are the API of Gallium state tracker, and are used by EGL. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-11Fix compressed texture loads for non-minimal pitchesLuca Barbieri
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 <keithw@vmware.com> Tweaks for C90 compilation.
2010-01-11radeon: fix prediction for r100 inline vert/elt emits.Dave Airlie
On r100 we emit the indices inline so we need to account for that in the emission size.
2010-01-11radeon: fix bug in realloc code.Dave Airlie
This bug was fixed in libdrm ages ago, port to non-kms
2010-01-11st/dri: update dri2 drawables when viewport is changedBen Skeggs
Fixes gnome-shell on nouveau, as well as window resize with various other applications. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2010-01-09r300: minor accelerated blit fixesMaciej Cencora
2010-01-09r300: fallback on depth buffer blitsMaciej Cencora
Depth buffer accelerated blits aren't implemented yet.
2010-01-08intel/DRI2: add DRI2flushExtension support with invalidate hookKristian Høgsberg
Needed to support the SwapBuffers code properly. Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2010-01-08DRI2/GLX: add INTEL_swap_event supportJesse Barnes
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 <jbarnes@virtuousgeek.org>
2010-01-08DRI2: add SwapBuffers supportJesse Barnes
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 <jbarnes@virtuousgeek.org>
2010-01-08Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
2010-01-08mesa: Ensure libmesagallium.a is finished building before descendingDan Nicholson
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-01-08r300: Move initial declaration outside for loop.Vinson Lee
2010-01-07intel: Remove leftover symlinks from DRI1 removal.Eric Anholt