Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-09-18 | 21 | -186/+218 |
|\ | | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c | ||||
| * | mesa: fix bug in previous changes to _slang_resolve_attributes() | Brian Paul | 2008-09-17 | 1 | -1/+3 |
| | | |||||
| * | intel: Destroy bufmgr in screen destroy, not context. | Eric Anholt | 2008-09-16 | 2 | -2/+1 |
| | | | | | | | | | | | | | | Caused server crashes on second context creation since 7e0bbdcf033981282978554c2e68ce48b55aa291. Bug #17600. | ||||
| * | mesa: rework GLSL vertex attribute binding | Brian Paul | 2008-09-16 | 4 | -103/+110 |
| | | | | | | | | | | | | | | Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings. | ||||
| * | mesa: fix display list regression (check if save->prim_count > 0 in ↵ | Brian Paul | 2008-09-16 | 1 | -5/+7 |
| | | | | | | | | vbo_save_EndList()) | ||||
| * | mesa: fix MSAA enable state in update_multisample() | Brian Paul | 2008-09-15 | 1 | -4/+4 |
| | | |||||
| * | mesa: remove some assertions that are invalid during context tear-down | Brian Paul | 2008-09-15 | 1 | -1/+4 |
| | | |||||
| * | mesa: get another class of degenerate dlists working | Keith Whitwell | 2008-09-15 | 2 | -2/+29 |
| | | | | | | | | Primitive begin in one dlist, end in another. | ||||
| * | tdfx: fix crash and lack of visuals bug | Jakub Bogusz | 2008-09-13 | 1 | -52/+25 |
| | | |||||
| * | i915: fix himask constant init for 64-bit build | Guillaume Melquiond | 2008-09-13 | 1 | -1/+1 |
| | | |||||
| * | mesa: return after _mesa_problem() calls | Guillaume Melquiond | 2008-09-13 | 2 | -0/+3 |
| | | |||||
| * | mesa: #include <stdio.h> | Guillaume Melquiond | 2008-09-13 | 1 | -0/+1 |
| | | |||||
| * | intel: Add a width field to regions, and use it for making miptrees in TFP. | Eric Anholt | 2008-09-12 | 6 | -15/+25 |
| | | | | | | | | | | Otherwise, we would use the pitch as width of the texture, and compiz would render the pitch padding on the right hand side. | ||||
| * | intel: Don't segfault on TFP from a bad drawable. | Eric Anholt | 2008-09-12 | 2 | -0/+9 |
| | | |||||
| * | intel: Remove dead allow_batchbuffer param. | Eric Anholt | 2008-09-12 | 2 | -6/+0 |
| | | |||||
| * | i965: Add support for G41 chipset which is another 4 series. | Xiang, Haihao | 2008-09-12 | 2 | -1/+6 |
| | | |||||
* | | mesa: bring sources into line with sources.mak, but omit gallium code | Keith Whitwell | 2008-09-18 | 1 | -14/+17 |
| | | |||||
* | | i965: Add support for G41 chipset which is another 4 series. | Xiang, Haihao | 2008-09-18 | 2 | -1/+6 |
| | | |||||
* | | st: hash-warning not recognised on Windows. | Michal Krol | 2008-09-16 | 1 | -0/+2 |
| | | |||||
* | | mesa: bump gallium version string to 0.2 | Brian Paul | 2008-09-12 | 1 | -1/+1 |
| | | |||||
* | | i915simple: A step closer to compiling | Jakob Bornecrantz | 2008-09-12 | 1 | -70/+1 |
| | | |||||
* | | mesa: regenerate shader files | Keith Whitwell | 2008-09-12 | 1 | -70/+76 |
| | | |||||
* | | mesa: get fixed-function program generation working again | Keith Whitwell | 2008-09-12 | 2 | -20/+45 |
| | | |||||
* | | st: adapt to new framebuffer struct, with one FIXME outstanding | Keith Whitwell | 2008-09-11 | 2 | -14/+17 |
| | | |||||
* | | mesa: update PointParameter usage | Keith Whitwell | 2008-09-11 | 1 | -2/+2 |
| | | |||||
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-09-11 | 22 | -113/+450 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c | ||||
| * | | gallium: document that clear color is intentionally always ↵ | Brian Paul | 2008-09-05 | 1 | -0/+3 |
| | | | | | | | | | | | | PIPE_FORMAT_A8R8G8B8_UNORM | ||||
| * | | mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib() | Brian Paul | 2008-09-05 | 1 | -1/+1 |
| | | | |||||
| * | | mesa: _mesa_program_state_string() returns char *, not const char *. | Michal Krol | 2008-09-05 | 4 | -6/+6 |
| | | | |||||
| * | | mesa: improved gl_buffer_object reference counting | Brian Paul | 2008-09-04 | 10 | -186/+241 |
| | | | | | | | | | | | | | | | Use new _mesa_reference_buffer_object() function wherever possible. Fixes buffer object/display list crash reported in ParaView. | ||||
| * | | mesa: fix minor mem leak | Brian Paul | 2008-09-04 | 1 | -1/+3 |
| | | | |||||
| * | | gallium: remove the copyHeight hack for compresssed formats | Brian Paul | 2008-09-04 | 1 | -4/+1 |
| | | | |||||
| * | | mesa: Silence compiler warnings on Windows. | Michal Krol | 2008-09-04 | 1 | -1/+1 |
| | | | |||||
| * | | mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24 | Xiang, Haihao | 2008-09-04 | 1 | -2/+2 |
| | | | | | | | | | | | | Cherry-picked from master | ||||
| * | | mesa: Remove unused var. | José Fonseca | 2008-09-04 | 1 | -1/+0 |
| | | | |||||
| * | | gallium: Have pipe_buffer_* receive a pipe_screen instead of a pipe_context. | José Fonseca | 2008-09-03 | 8 | -50/+50 |
| | | | | | | | | | | | | | | | We want to use the pipe_buffer_* inlines everywhere, but a pipe context is not always available nor is it needed. | ||||
| * | | fix BUFFER_DEPTH/BUFFER_ACCUM mix-up | Brian Paul | 2008-09-02 | 1 | -6/+6 |
| | | | |||||
| * | | mesa: use CALLOC instead of MALLOC to fix valgrind warning | Brian Paul | 2008-09-01 | 1 | -1/+1 |
| | | | |||||
| * | | gallium: added st_bind/release_teximage() functions | Brian Paul | 2008-09-01 | 3 | -0/+109 |
| | | | |||||
| * | | gallium: move st_texture_image() cast wrapper to header file | Brian Paul | 2008-09-01 | 2 | -7/+6 |
| | | | |||||
| * | | mesa: remove debug code | Brian Paul | 2008-08-28 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: dynamically grow the fixed function vertex program as needed | Brian Paul | 2008-08-28 | 1 | -10/+46 |
| | | | | | | | | | | | | | | | Don't use a fixed-size array. Saves memory in most cases and avoids potential overflow for long programs. | ||||
| * | | gallium: change the conditional which tests for combined Z+stencil buffers | Brian Paul | 2008-08-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | The caller might be requesting 16-bit Z + 8-bit stencil be placed in a PIPE_FORMAT_S8Z24 or PIPE_FORMAT_Z24S8 buffer. | ||||
| * | | mesa: bump MAX_INSN to 300 | Brian Paul | 2008-08-28 | 1 | -1/+1 |
| | | | |||||
| * | | gallium: better support for user-space interleaved arrays | Brian Paul | 2008-08-27 | 1 | -35/+100 |
| | | | | | | | | | | | | | | | Basically, set up one user-space wrapper for all arrays instead of the individual arrays. | ||||
| * | | gallium: in st_draw_vbo() try to detect interleaved arrays in a single VBO. | Brian Paul | 2008-08-27 | 1 | -27/+149 |
| | | | |||||
| * | | gallium: remove old assertions | Brian Paul | 2008-08-27 | 1 | -5/+0 |
| | | | |||||
* | | | mesa: use sources.mak -- need to figure out how to support non-gallium ↵ | Keith Whitwell | 2008-09-11 | 2 | -2/+2 |
| | | | | | | | | | | | | builds also | ||||
* | | | tree builds | Alan Hourihane | 2008-09-11 | 4 | -906/+8 |
| | | | |||||
* | | | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵ | Alan Hourihane | 2008-09-11 | 69 | -1756/+1322 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c |