Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-30 | 4 | -9/+24 |
|\ | | | | | | | | | | | 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: Set FLUSH_EXPLICIT_BIT flags when calling FlushMappedBufferRange. | José Fonseca | 2009-06-30 | 2 | -9/+22 |
| | | | | | | | | As prescribed by ARB_map_buffer_range. | ||||
* | | intel: Enable EXT_gpu_program_parameters. | Eric Anholt | 2009-06-29 | 1 | -0/+2 |
| | | | | | | | | | | There doesn't appear to be any driver impact for enabling this, and tests/prog_parameter passes. | ||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-29 | 1 | -1/+1 |
|\| | |||||
| * | intel: added null ptr check | Brian Paul | 2009-06-29 | 1 | -1/+1 |
| | | | | | | | | This fixes a segfault seen with piglit's fdo20701 test. | ||||
* | | st/mesa: enable GL_ARB_framebuffer_object | Brian Paul | 2009-06-29 | 1 | -0/+6 |
| | | | | | | | | | | All gallium drivers should be able to support mixed-size color/depth/stencil buffers. If not, we'll need a new PIPE_CAP_ query. | ||||
* | | mesa: check for ARB_framebuffer_object for GL_TEXTURE_STENCIL_SIZE_EXT query | Brian Paul | 2009-06-29 | 1 | -1/+2 |
| | | |||||
* | | mesa: alphabetize lines | Brian Paul | 2009-06-29 | 1 | -1/+1 |
| | | |||||
* | | Revert "intel: Remove unneded pthread mutex in LOCK_HARDWARE." | Eric Anholt | 2009-06-29 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit de447afff26706e3bf8bdcd5cfb8b1daf49b4b21 but puts the lock under DRI1-only. From keithw: > It's there because the DRI1 code doesn't actually achieve the mutexing > which it looks as if it should. For multi-threaded applications it was > always possible to get two threads inside locked regions -- I have no > idea how, but it certainly was and presumably still is possible. | ||||
* | | intel: Move note_unlock() implementation to the one place it's needed. | Eric Anholt | 2009-06-29 | 6 | -26/+2 |
| | | |||||
* | | intel: Remove unneded pthread mutex in LOCK_HARDWARE. | Eric Anholt | 2009-06-29 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This would cause LOCK_HARDWARE to mutex all contexts in this process on both DRI1 and DRI2. On DRI1, LOCK_HARDWARE already does it for all processes on the system. On DRI2, LOCK_HARDWARE doesn't, but there shouldn't be any state outside the context that needs any additional protection. Notably, the bufmgr is protected by its own mutex and not LOCK_HARDWARE. This code was originally introduced with the i915tex code dump, so it's not clear what it was there for. | ||||
* | | intel: Make LOCK_HARDWARE recursive to avoid hand-rolling recursiveness. | Eric Anholt | 2009-06-29 | 5 | -47/+19 |
| | | |||||
* | | Revert "r200: make use of DMA buffers for Elts a lot better." | Dave Airlie | 2009-06-29 | 3 | -19/+16 |
| | | | | | | | | | | | | This reverts commit 0952645fe04a27968565ea4d913500c23b1b11e3. Need to revisit where this is going wrong | ||||
* | | radeon: Always initialize front and back renderbuffers if present | Nicolai Hähnle | 2009-06-27 | 1 | -2/+1 |
| | | | | | | | | | | | | This fixes an assertion in glReadPixels from the front buffer. Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | radeon: Update .gitignore | Nicolai Hähnle | 2009-06-27 | 2 | -2/+25 |
| | | | | | | | | | | | | | | Add all source files that are symlink'ed from common radeon code to the ignore list. Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | Merge branch 'arb_vertex_array_object' | Brian Paul | 2009-06-26 | 24 | -2646/+2935 |
|\ \ | |||||
| * | | intel: enable GL_ARB_vertex_array_object extension | Brian Paul | 2009-06-22 | 1 | -0/+2 |
| | | | |||||
| * | | mesa: plug in glBindVertexArray, glGenVertexArrays functions | Brian Paul | 2009-06-22 | 1 | -0/+4 |
| | | | |||||
| * | | st/mesa: alphabetize lines | Brian Paul | 2009-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | st/mesa: enable GL_ARB_vertex_array_object | Brian Paul | 2009-06-22 | 1 | -0/+1 |
| | | | |||||
| * | | mesa: enforce the rule that arrays live in VBOs for GL_ARB_vertex_array_object | Brian Paul | 2009-06-22 | 1 | -25/+52 |
| | | | |||||
| * | | mesa: added extension flag for ARB_vertex_array_object | Brian Paul | 2009-06-22 | 2 | -0/+3 |
| | | | |||||
| * | | mesa: implement _mesa_GenVertexArrays() for GL_ARB_vertex_array_object | Brian Paul | 2009-06-19 | 3 | -4/+32 |
| | | | | | | | | | | | | | | | | | | This also involves adding a gl_array_object::VBOonly field. For the ARB extension, all arrays in the object must reside in a VBO. This flag keeps track of that requirement. | ||||
| * | | mesa: implement _mesa_BindVertexArray() | Brian Paul | 2009-06-19 | 2 | -12/+46 |
| | | | |||||
| * | | mesa: move vertex array objects from shared state to per-context | Brian Paul | 2009-06-19 | 6 | -41/+42 |
| | | | | | | | | | | | | | | | The ARB version requires VAOs to be per-context while the Apple extension was ambiguous. | ||||
| * | | mesa: regenerated files related to GL_ARB_vertex_array_object | Brian Paul | 2009-06-19 | 10 | -2564/+2716 |
| | | | |||||
| * | | glapi: add new information for GL_ARB_vertex_array_object | Brian Paul | 2009-06-19 | 3 | -0/+37 |
| | | | |||||
* | | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-26 | 11 | -274/+1184 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h | ||||
| * | | glsl: check number of varying variables against the limit | Brian Paul | 2009-06-26 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | Link fails if too many varying vars. (cherry picked from master, commit cc58fbcf2c5c88f406818db60910f537e03610d6) | ||||
| * | | mesa: raise MAX_VARYING (number of shader varying vars) to 16 | Brian Paul | 2009-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | 16 is the limit for now because of various 32-bit bitfields. (cherry picked from master, commit 4e762395ef7e8c332c16fd0c11025cfa52763a45) | ||||
| * | | intel / DRI2: Additional flush of fake front-buffer to real front-buffer | Ian Romanick | 2009-06-26 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To maintain correctness, the server will copy the real front-buffer to a newly allocated fake front-buffer in DRI2GetBuffersWithFormat. However, if the DRI2GetBuffersWithFormat is triggered by glViewport, this will copy stale data into the new buffer. Fix this by flushing the current fake front-buffer to the real front-buffer in intel_viewport. Fixes bug #22288. | ||||
| * | | mesa: bump version to 7.5-rc4 | Brian Paul | 2009-06-26 | 1 | -1/+1 |
| | | | |||||
| * | | glsl: move/simplify error checking for 'return' statements | Brian Paul | 2009-06-26 | 1 | -22/+14 |
| | | | |||||
| * | | glsl: overhaul 'return' statement handling | Brian Paul | 2009-06-26 | 3 | -215/+212 |
| | | | | | | | | | | | | | | | | | | | | | A new node type (SLANG_OPER_RETURN_INLINED) is used to denote 'return' statements inside inlined functions which need special handling. All glean glsl1 tests pass for EmitContReturn=FALSE and TRUE. | ||||
| * | | glsl: predicate assignments according to __returnFlag | Brian Paul | 2009-06-26 | 1 | -4/+29 |
| | | | | | | | | | | | | Fixes glean "function with early return (3)" case (when EmitContReturn=FALSE). | ||||
| * | | glsl: added slang_variable::is_global field | Brian Paul | 2009-06-26 | 1 | -0/+1 |
| | | | |||||
| * | | glsl: silence a problem warning | Brian Paul | 2009-06-26 | 1 | -1/+2 |
| | | | |||||
| * | | glsl: code refactoring for return statements | Brian Paul | 2009-06-26 | 1 | -70/+88 |
| | | | |||||
| * | | glsl: fix assorted regressions related to early-return-removal | Brian Paul | 2009-06-26 | 2 | -14/+35 |
| | | | |||||
| * | | glsl: comments, field reordering | Brian Paul | 2009-06-26 | 1 | -1/+4 |
| | | | |||||
| * | | glsl: rework loop nesting code | Brian Paul | 2009-06-26 | 2 | -41/+87 |
| | | | |||||
| * | | glsl: remove test for loop unrolling when we hit conditional cont/break | Brian Paul | 2009-06-26 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | This is no longer needed since we added the new _slang_loop_contains_continue_or_break() function/test. | ||||
| * | | glsl: checkpoint: predicate __retVal = expr with __returnFlag | Brian Paul | 2009-06-26 | 1 | -26/+60 |
| | | | | | | | | | | | | The glean "function with early return (1)" test passes now. | ||||
| * | | glsl: use new helper functions in _slang_gen_logical_and/or() | Brian Paul | 2009-06-26 | 1 | -15/+9 |
| | | | |||||
| * | | glsl: add comments | Brian Paul | 2009-06-26 | 1 | -0/+3 |
| | | | |||||
| * | | glsl: checkpoint: replace 'return' with __returnFlag=true; | Brian Paul | 2009-06-26 | 1 | -7/+68 |
| | | | | | | | | | | | | Needed for "remove early returns" transformation. | ||||
| * | | glsl: fix up scoping for parent/children in slang_operation_copy() | Brian Paul | 2009-06-26 | 1 | -0/+9 |
| | | | | | | | | | | | | This will need more testing, but no regressions seen so far. | ||||
| * | | glsl: fix uninitialized var in _slang_gen_for_without_continue() | Brian Paul | 2009-06-26 | 1 | -1/+1 |
| | | | |||||
| * | | glsl: added slang_operation_free_children() | Brian Paul | 2009-06-26 | 2 | -0/+17 |
| | | |