summaryrefslogtreecommitdiff
path: root/src/mesa/vbo
AgeCommit message (Collapse)Author
2009-07-03Merge branch 'mesa_7_5_branch'Jakob Bornecrantz
Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c
2009-07-02vbo: If MapBufferRange fails, try MapBuffer instead.Corbin Simpson
Fixes segfaults with radeon winsys. (Probably libdrm_radeon doing something that it shouldn't.)
2009-06-30mesa/vbo: fix compile and replay of nodes ending in a FALLBACKKeith Whitwell
Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in the case of a recursive CallList which is itself within a Begin/End pair, there two problems: 1) The display list node's primitive information was incorrect, stating the cut-off prim had zero vertices 2) On replay, we would get confused by a primitive that started in a node, but was terminated by individual opcodes. This change fixes the first problem by correctly terminating the last primitive on fallback, and the second by forcing the display list to use the Loopback path, converting all nodes into immediate-mode rendering. The loopback fix is a performance hit, but avoiding this would require a fairly large rework of this code.
2009-06-30Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuitKeith Whitwell
Need this to pick up fixes for per-vertex materials.
2009-06-30Merge branch 'mesa_7_5_branch'Brian Paul
Conflicts: src/mesa/vbo/vbo_exec_draw.c
2009-06-30mesa: Set FLUSH_EXPLICIT_BIT flags when calling FlushMappedBufferRange.José Fonseca
As prescribed by ARB_map_buffer_range.
2009-06-30mesa/vbo: use _lookup_prim_by_nr for debuggingKeith Whitwell
Switch over to specialized enum lookup for primitives
2009-06-22mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBSBrian Paul
Be clearer that this is the number of generic vertex program/shader attributes, not counting the legacy attributes (pos, normal, color, etc). (cherry picked from commit 4a95185c9f30c2de7a03bb1a0653f51b53b1111d)
2009-06-22vbo: return VP_NONE from get_program_mode() if running fixed-func vertex programBrian Paul
If we're running a vertex program to emulated fixed-function, we still need to treat vertex arrays/attributes as if we're in fixed-function mode. This should probably be back-ported to Mesa 7.5 after a bit more testing. (cherry picked from commit dda82137d28aba846dda73da230871c115e30aaf)
2009-06-19mesa: Make VBO dlist printing use the same path as other dlist printing.Eric Anholt
I was rather confused when mesa_print_display_list didn't show any of my glBegin()..glEnd(). Nothing but print_list appears to call this function, so matching its behavior seems like a good idea.
2009-06-15mesa: revert some recent VBO buffer object refcounting changesBrian Paul
Reverts part of commit d7ea9ddf5824556e47decac7ba200f37cf1e552f. We were calling _mesa_reference_buffer_object() on some heap-allocated memory that was uninitialized and could trigger an assertion. We can actually go back to "looser" ref counting of the Null/default buffer object in these cases.
2009-06-12mesa: use _mesa_reference_buffer_object() in a few placesBrian Paul
2009-06-11Merge branch 'mesa_7_5_branch'José Fonseca
2009-06-11vbo: fix assertion, #define IMM_BUFFER_NAMEBrian Paul
This was sometimes seen when Glean exited upon test failure when using Gallium.
2009-06-09Merge branch 'mesa_7_5_branch'Jakob Bornecrantz
Conflicts: Makefile src/mesa/main/version.h src/mesa/shader/slang/slang_preprocess.c src/mesa/state_tracker/st_cb_bufferobjects.c
2009-06-09vbo: more glDrawElements debug code (disabled)Brian Paul
2009-06-08mesa/vbo: drop all references to vbo on destroyKeith Whitwell
We were adding references to the input arrays, but failing to drop them on destruction. This could lead to a 64kb buffer being leaked each context destruction.
2009-06-03vbo: minor reformattingBrian Paul
2009-06-03vbo: move/refactor debug codeBrian Paul
2009-06-03vbo: added debug code to check array data validity (disabled)Brian Paul
2009-06-03vbo: new debug/dump code (disabled)Brian Paul
2009-06-03vbo: tweak out-of-bounds VBO access error messageBrian Paul
Subtract 1 from _MaxElement to be clearer.
2009-05-22mesa: fix warning message in vbo_exec_DrawRangeElements()Brian Paul
2009-05-22mesa: use Elements() for loop limitBrian Paul
2009-05-22mesa: use Elements() for loop limitBrian Paul
2009-05-22vbo: s/32/VERT_ATTRIB_MAX/Brian Paul
2009-05-22vbo: asst. reformatting, clean-upsBrian Paul
2009-05-22Merge branch 'mesa_7_5_branch'Brian Paul
2009-05-22vbo: fix crash in vbo_exec_bind_arrays()Brian Paul
When a vertex shader uses generic vertex attribute 0, but not gl_Vertex, we need to set attribute[16] to point to attribute[0]. We were setting the attribute size, but not the pointer. Fixes crash in glsl/multitex.c when using the VertCoord attribute instead of gl_Vertex.
2009-05-22mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBSBrian Paul
Be clearer that this is the number of generic vertex program/shader attributes, not counting the legacy attributes (pos, normal, color, etc).
2009-05-21vbo: fix build breakage...oopsBrian Paul
2009-05-21vbo: comments, whitespace clean-upsBrian Paul
2009-05-21Merge branch 'mesa_7_5_branch'Brian Paul
2009-05-21vbo: fix incorrect loop limit in bind_array_obj()Brian Paul
The generic_array[] is 16 elements in size, but the loop was doing 32 iterations. The out of bounds array write was clobbering the following inputs[] array but as luck would have it, that didn't matter.
2009-05-21mesa: use MAX_ values instead of literalsBrian Paul
2009-05-21mesa: added gl_array_object::Weight array fieldBrian Paul
We don't really implement vertex weights but in the VBO code this fixes and odd case for the legacy_array[] setup. Before, the vbo->draw_prims() call was always indicating that the vertex weight array was present/enabled when it really wasn't.
2009-05-21vbo: return VP_NONE from get_program_mode() if running fixed-func vertex programBrian Paul
If we're running a vertex program to emulated fixed-function, we still need to treat vertex arrays/attributes as if we're in fixed-function mode. This should probably be back-ported to Mesa 7.5 after a bit more testing.
2009-05-21vbo: move vp_mode enum to vbo_exec.h, use enum instead of GLuintBrian Paul
2009-05-21mesa: move gl_array_attrib::_MaxElement to gl_array_object::_MaxElementBrian Paul
This value is per array object.
2009-05-21vbo: s/8/MAX_TEXTURE_COORD_UNITS/Brian Paul
2009-05-07mesa: move the NullBufferObj from GLcontext to gl_shared_stateBrian Paul
Since shared array objects may point to the null/default buffer object, the null/default buffer object should be part of the shared state.
2009-05-07vbo: in glDraw[Range]Element() code, check for out of bounds indexesBrian Paul
No-op the bad drawing command rather than go out of bounds and render garbage. Print a warning to alert the developer to the bad drawing call.
2009-05-07mesa: use _mesa_sizeof_type() in vbo split codeBrian Paul
2009-05-07mesa: vbo code reformatting, clean-up, commentsBrian Paul
2009-05-07mesa: in vbo split code, map buffers read-only, not write-onlyBrian Paul
And use GL_ELEMENT_ARRAY_BUFFER where appropriate.
2009-04-16vbo: cache last dlist vertex in malloced memoryKeith Whitwell
Avoids repeated mapping of the VBO buffer on display list replay. We need access to the final vertex in order to update the GL current attrib values.
2009-03-15vbo: Silence integer-to-pointer warnings.Michal Krol
2009-03-09vbo: yet tighter still usage of FLUSH_NEED_CURRENTKeith Whitwell
Previous change broke redbook/polys and probably others. I'm fairly sure that drivers like r300 don't need to touch ctx->Driver.NeedVertices, but this code is incredibly fragile and I'm not confident about removing it from there. Hopefully this gets things working again.
2009-03-09vbo: stricter checks on Driver.NeedFlushKeith Whitwell
This variable is being used in the r300 driver to trigger a flush under circumstances unrelated to the use in the vbo module. Tighten up the checks in vbo so as to avoid conflict with r300. Reported by Maciej Cencora <m.cencora@gmail.com>
2009-03-07mesa: s/int/GLsizeiptr/ to silence warning with 64-bit buildBrian Paul