Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-25 | 3 | -5/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c | ||||
| * | x86: Do not build read_rgba_span_x86.S on Mac OS X. | Vinson Lee | 2010-01-23 | 1 | -2/+2 |
| | | | | | | | | | | read_rgba_span_x86.S uses the pseudo-ops .hidden and .type which are not recognized on Mac OS X. | ||||
| * | x86: Do not use .hidden pseudo-op on Mac OS X. | Vinson Lee | 2010-01-23 | 1 | -2/+2 |
| | | | | | | | | The .hidden directive is an unknown pseudo-op on Mac OS X. | ||||
| * | glapi: Do not use .type pseudo-op on Mac OS X. | Vinson Lee | 2010-01-23 | 1 | -1/+1 |
| | | | | | | | | The .type directive is an unknown pseudo-op on Mac OS X. | ||||
* | | Merge remote branch 'origin/opengl-es-v2' | Chia-I Wu | 2010-01-20 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into opengl-es-v2 | Chia-I Wu | 2010-01-12 | 3 | -36/+37 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h | ||||
| * | | | glapi: Include headers with directory prefixes. | Chia-I Wu | 2009-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This allows different sets of generated sources and headers to be used. Signed-off-by: Chia-I Wu <[email protected]> | ||||
* | | | | Merge branch 'mesa_7_7_branch' | Jakob Bornecrantz | 2010-01-14 | 1 | -1/+0 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c | ||||
| * | | x86: Remove unnecessary header from x86_xform.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-04 | 1 | -12/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c | ||||
| * | | x86: Silence printf format warnings. | Vinson Lee | 2010-01-01 | 1 | -12/+2 |
| | | | |||||
* | | | mesa: added dispatch for GL_NV_conditional_render extension | Brian Paul | 2009-12-31 | 1 | -13/+15 |
| | | | |||||
* | | | mesa: regenerate API files related to GL_EXT_draw_buffers2 | Brian Paul | 2009-12-29 | 1 | -13/+19 |
| | | | |||||
* | | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-21 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c | ||||
| * | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-15 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c | ||||
| | * | | x86: ifdef out unused function cptr. | Vinson Lee | 2009-12-15 | 1 | -0/+2 |
| | | | | |||||
* | | | | tnl: Replace deprecated FogCoordPtr with AttribPtr[_TNL_ATTRIB_FOG] | Eric Anholt | 2009-11-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | tnl: Replace deprecated ColorPtr[] with AttribPtr or new BackfaceColorPtr. | Eric Anholt | 2009-11-19 | 1 | -2/+2 |
| | | | | |||||
* | | | | tnl: Replace deprecated IndexPtr[] with AttribPtr[] or new BackfaceIndexPtr | Eric Anholt | 2009-11-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | tnl: Replace deprecated ObjPtr with AttribPtr[_TNL_ATTRIB_POS] | Eric Anholt | 2009-11-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | tnl: Replace deprecated TexCoordPtr with AttribPtr[_TNL_ATTRIB_TEX*] | Eric Anholt | 2009-11-19 | 1 | -4/+4 |
| | | | | |||||
* | | | | tnl: Replace NormalPtr with AttribPtr[_TNL_ATTRIB_NORMAL] | Eric Anholt | 2009-11-19 | 1 | -1/+1 |
|/ / / | |||||
* | / | ARB_fbo: Regenerate files from previous commits. | Ian Romanick | 2009-11-17 | 1 | -0/+1 |
| |/ |/| | |||||
* | | x86: Fix the test for negative pixel count in optimized rgb565 spans. | Eric Anholt | 2009-10-30 | 1 | -1/+1 |
| | | | | | | | | | | There's a bunch of bogus looking stuff the count handling in this code, but this fixes the testcases we have. | ||||
* | | glapi: regenerated files | Brian Paul | 2009-09-19 | 1 | -0/+1 |
| | | |||||
* | | glapi: Add ARB_draw_elements_base_vertex | Eric Anholt | 2009-09-08 | 1 | -67/+70 |
| | | |||||
* | | mesa: Add support for ARB_depth_clamp. | Eric Anholt | 2009-09-08 | 1 | -3/+6 |
|/ | | | | | This currently doesn't include fixing up the cliptests in the assembly paths to support ARB_depth_clamp, so enabling depth_clamp forces the C path. | ||||
* | ARB sync: Regenerate files from previous commit | Ian Romanick | 2009-09-03 | 1 | -74/+81 |
| | |||||
* | mesa: fix 32bit cross compilation on a 64bit machine | Marc Dietrich | 2009-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | When cross compiling on a 64bit machine, gen_matypes.c is build for the host machine (64bit) but must generates code for the target machine (32bit). This causes wrong offsets all over the place and crashes googleearth on my machine. Solution is to add -m32 when cross compiling. Attached patch is compatible with linux-x86-32 and autoconf based builds. | ||||
* | Regenerate files for GL_APPLE_flush_buffer_range | Ian Romanick | 2009-08-14 | 1 | -9/+17 |
| | |||||
* | glapi: regenerated GL API assembly files | RALOVICH, Kristóf | 2009-07-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-30 | 2 | -0/+2 |
|\ | | | | | | | | | | | Conflicts: src/mesa/vbo/vbo_exec_draw.c | ||||
| * | mesa: fix transform_points_3d_no_rot using undefined values in %xmm0 | Arthur HUILLET | 2009-06-30 | 2 | -0/+2 |
| | | | | | | | | Signed-off-by: Arthur HUILLET <[email protected]> | ||||
* | | mesa: regenerated files related to GL_ARB_vertex_array_object | Brian Paul | 2009-06-19 | 1 | -58/+60 |
| | | |||||
* | | Merge branch 'ext-provoking-vertex' | Brian Paul | 2009-06-19 | 1 | -7/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes-7.6.html progs/tests/Makefile src/gallium/drivers/softpipe/sp_prim_vbuf.c src/glx/x11/indirect.c src/mesa/glapi/Makefile src/mesa/glapi/dispatch.h src/mesa/glapi/glapioffsets.h src/mesa/glapi/glapitable.h src/mesa/glapi/glapitemp.h src/mesa/glapi/glprocs.h src/mesa/main/dlist.c src/mesa/main/enums.c src/mesa/sparc/glapi_sparc.S src/mesa/x86-64/glapi_x86-64.S src/mesa/x86/glapi_x86.S | ||||
| * | | mesa: regenerated API files for GL_EXT_provoking_vertex | Brian Paul | 2009-05-28 | 1 | -7/+8 |
| |/ | |||||
* | | mesa: regenerated files for GL_ARB_map_buffer_range | Brian Paul | 2009-06-08 | 1 | -58/+60 |
| | | |||||
* | | glapi: regenerated files for GL_ARB_copy_buffer | Brian Paul | 2009-06-02 | 1 | -54/+55 |
|/ | |||||
* | mesa: rename some gl_light fields to be clearer | Brian Paul | 2009-04-03 | 1 | -2/+2 |
| | | | | | EyeDirection -> SpotDirection _NormDirection -> _NormSpotDirection | ||||
* | regenerate glapi | Roland Scheidegger | 2009-03-12 | 1 | -25/+29 |
| | |||||
* | mesa: silence warning | Brian Paul | 2009-03-07 | 1 | -2/+2 |
| | |||||
* | mesa: _mesa_get_x86_features() only needs to do its thing once | Brian Paul | 2009-03-04 | 1 | -0/+8 |
| | |||||
* | mesa: move sse.h and 3dnow.h #includes | Brian Paul | 2009-03-04 | 3 | -44/+9 |
| | |||||
* | mesa: remove unneeded x86.h header | Brian Paul | 2009-03-04 | 2 | -2/+0 |
| | |||||
* | mesa: make _mesa_init_x86_transform_asm() static | Brian Paul | 2009-03-04 | 2 | -2/+2 |
| | |||||
* | mesa: rename common_x86_macros.h -> x86_xform.h | Brian Paul | 2009-03-04 | 4 | -5/+5 |
| | |||||
* | mesa: rename x86.c -> x86_xform.c | Brian Paul | 2009-03-04 | 1 | -0/+0 |
| | |||||
* | mesa: refactor x86 code | Brian Paul | 2009-03-04 | 3 | -52/+77 |
| | | | | | | Move _mesa_init_all_x86_transform_asm() into x86.c so that common_x86.c has no dependencies on the vertex transformation code. Plus some comments and clean-ups. | ||||
* | mesa: fixes for building on Haiku | Tomas Wilhelmsson | 2009-02-23 | 1 | -2/+2 |
| | |||||
* | mesa: merge gallium-0.2 into gallium-master-merge | Brian Paul | 2009-02-09 | 2 | -2/+9 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c |