summaryrefslogtreecommitdiffstats
path: root/src/mesa/vbo
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-10-104-33/+92
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/gallivm/instructionssoa.cpp src/gallium/auxiliary/gallivm/soabuiltins.c src/gallium/auxiliary/rtasm/rtasm_x86sse.c src/gallium/auxiliary/rtasm/rtasm_x86sse.h src/mesa/main/texenvprogram.c src/mesa/shader/arbprogparse.c src/mesa/shader/prog_statevars.c src/mesa/state_tracker/st_draw.c src/mesa/vbo/vbo_exec_draw.c
| * mesa: replace GLuint with GLbitfield to be clearer about usageBrian Paul2008-10-073-3/+3
| | | | | | | | Also, fix up some comments to be doxygen style.
| * mesa: update state after binding vertex list in dlist pathKeith Whitwell2008-10-071-0/+5
| |
| * mesa: avoid generating constant vertex attributes in fixedfunc programsKeith Whitwell2008-10-033-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | Keep track of enabled/active vertex attributes. Keep track of potential vertex program outputs. When generating fragment program, replace references to fragment attributes which are effectively non-varying and non-computed passthrough attributes with references to the new CURRENT_ATTRIB tracked state value. Only downside is slight ugliness in VBO code where we need to validate state twice in succession.
| * mesa: add new internal state for tracking current vertex attribsKeith Whitwell2008-10-032-26/+42
| |
* | Merge commit 'origin/master' into HEADKeith Whitwell2008-09-262-13/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/vbo/vbo.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_exec_draw.c
| * | mesa: fix some VBO buffer object issuesBrian Paul2008-09-252-11/+23
| | | | | | | | | | | | | | | | | | The VBO module may use a real VBO or a malloc'd buffer for vertex storage. Be careful not to accidentally replace the later with the former when drawing. Check if using a real VBO at destroy time to prevent a double-free.
| * | vbo: unmap and remap immediate vbo before/after each draw.Keith Whitwell2008-09-231-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use BufferData(NULL) to get fresh storage and avoid synchronous operation where we would have to flush and wait for the fence after each draw because of the map. This will chew through a whole load of buffer space on small draws, so it isn't a proper solution. Need to support a no-fence or append mapping mode to do this right, or use user buffers.
| * | added vbo_use_buffer_objects() to specify that immediate mode data should be ↵Brian2008-09-233-2/+51
| | | | | | | | | | | | put into bufferobjects
| * | vbo: seed initial max_element value with a more likely candidateKeith Whitwell2008-09-231-6/+6
| | | | | | | | | | | | (cherry picked from commit 026e7731e549e0777c010348460fd48b3d75a843)
| * | mesa: s/GL_POLYGON+1/PRIM_OUTSIDE_BEGIN_END/Brian Paul2008-09-232-6/+6
| | | | | | | | | | | | (cherry picked from commit 8a369b909a6648ae7a5a0c2dcb972a2f96f99a80)
| * | mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca2008-09-232-2/+2
| | |
| * | mesa: point size arraysBrian Paul2008-09-211-0/+4
| | |
| * | mesa: refactor: move #define FEATURE flags into new mfeatures.h fileKeith Whitwell2008-09-214-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, check the FEATURE flags in many places. (cherry picked from commit 40d1a40f294f1ed2dacfad6f5498322fc08cc2d1) Conflicts: src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c
| * | mesa: remove dead fileKeith Whitwell2008-09-211-1/+0
| | |
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-181-4/+6
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_link.c
| * | mesa: fix display list regression (check if save->prim_count > 0 in ↵Brian Paul2008-09-161-5/+7
| | | | | | | | | | | | vbo_save_EndList())
| * | mesa: protect against double-free in _vbo_DestroyContext()Brian Paul2008-09-161-4/+6
| | |
| * | mesa: get another class of degenerate dlists workingKeith Whitwell2008-09-151-0/+24
| | | | | | | | | | | | Primitive begin in one dlist, end in another.
* | | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-181-0/+26
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
| * | mesa: fix display list regression (check if save->prim_count > 0 in ↵Brian Paul2008-09-161-5/+7
| | | | | | | | | | | | vbo_save_EndList())
| * | mesa: get another class of degenerate dlists workingKeith Whitwell2008-09-151-0/+24
| | | | | | | | | | | | Primitive begin in one dlist, end in another.
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+13
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | mesa: improved gl_buffer_object reference countingBrian Paul2008-09-045-26/+69
| | | | | | | | | | | | | | | Use new _mesa_reference_buffer_object() function wherever possible. Fixes buffer object/display list crash reported in ParaView.
* | | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-115-38/+70
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | mesa: improved gl_buffer_object reference countingBrian Paul2008-09-045-26/+69
| | | | | | | | | | | | | | | Use new _mesa_reference_buffer_object() function wherever possible. Fixes buffer object/display list crash reported in ParaView.
* | | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-119-25/+203
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * vbo: seed initial max_element value with a more likely candidateKeith Whitwell2008-08-261-6/+6
| |
| * mesa: added GLAPIENTRY keywordsJonathan White2008-07-072-10/+10
| |
| * mesa: added _vbo_VertexAttrib4f()Brian Paul2008-07-032-0/+9
| |
| * mesa: point size arraysBrian Paul2008-06-251-0/+4
| |
| * mesa: added _vbo_Materialfv()Brian Paul2008-06-202-0/+8
| |
| * mesa: _vbo_Color4f, _vbo_Normal3f, _vbo_MultiTexCoord4f functionsBrian Paul2008-06-202-0/+31
| |
| * mesa: s/GL_POLYGON+1/PRIM_OUTSIDE_BEGIN_END/Brian Paul2008-06-182-6/+6
| |
| * mesa: refactor: move #define FEATURE flags into new mfeatures.h fileBrian Paul2008-06-104-3/+13
| | | | | | | | Also, check the FEATURE flags in many places.
| * mesa: remove unnecessary swrast, tnl includesBrian Paul2008-06-101-3/+0
| |
| * mesa: remove unused api_eval.h header fileBrian Paul2008-06-091-1/+0
| |
| * mesa: added _mesa_DrawArrays, DrawElements, DrawRangeElements() wrappers for ↵Brian Paul2008-06-051-0/+27
| | | | | | | | VBO funcs
| * mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca2008-05-312-2/+2
| |
| * Fix segfault in _save_OBE_DrawElements() when using VBO and display list ↵Brian Paul2008-05-301-0/+3
| | | | | | | | | | | | (bug 16156) This was previously fixed in master by commit 982dcb74fd19b88208d127b8019e2a2af979cac2 by Haihao Xiang.
| * fix an attr/src mix-up when setting-up/binding vertex arraysBrian Paul2008-05-162-5/+7
| | | | | | | | | | This fixes problems with incorrect material coefficients when glMaterial is called per-vertex.
| * mesa: Fix glBegin-time test for invalid programs/shaders.Brian Paul2008-04-113-8/+41
| | | | | | | | Cherry-picked from master.
| * mesa: revert fast-track glColor and similar calls when not immediate mode ↵Brian2008-03-141-9/+2
| | | | | | | | | | | | | | | | | | | | rendering Revert commit d08cd68d3f5456b69ad504ede2b090c0bb6474db This change caused some glean tests to fail. The alpha value of colors was always 1.0 instead of the value from glColor4fv(). The mesa color array found in st_draw() has size=3 instead of size=4.
| * mesa: fast-track glColor and similar calls when not immediate mode renderingKeith Whitwell2008-03-101-2/+9
| | | | | | | | | | | | Often these are mixed in with draw arrays calls, etc. Try not to get the whole immediate rendering state machine going when we receive one of these on their own.
| * Remove files of unsupported build systems.José Fonseca2008-02-251-60/+0
| |
| * fix vbo display list memleak upon context destructionBrian2008-01-012-0/+16
| |
| * vbo: unmap and remap immediate vbo before/after each draw.Keith Whitwell2007-12-181-0/+16
| | | | | | | | | | | | | | | | | | | | Also use BufferData(NULL) to get fresh storage and avoid synchronous operation where we would have to flush and wait for the fence after each draw because of the map. This will chew through a whole load of buffer space on small draws, so it isn't a proper solution. Need to support a no-fence or append mapping mode to do this right, or use user buffers.
| * New vbo_set_draw_func() to keep vbo context opaque to state tracker and tnl ↵Brian2007-12-072-0/+15
| | | | | | | | module.
| * Rename 'mms-config.' to 'mms.config'.Michal Krol2007-10-291-1/+1
| | | | | | | | | | It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
| * fix VBO clean-up in vbo_exec_vtx_destroy()Brian2007-08-201-4/+13
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 23:25:27 +0000