summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/bufferobj.c
Commit message (Collapse)AuthorAgeFilesLines
* mesa: set bufObj->Pointer = NULL after unmappingBrian Paul2009-02-271-4/+3
| | | | Also, ctx->Driver.UnmapBuffer can never be null, so remove conditional.
* mesa: if a buffer object is mapped when glDeleteBuffers() is called, unmap itBrian Paul2009-02-271-0/+5
|
* mesa: updated commentsBrian Paul2009-02-271-24/+18
|
* mesa: fix incorrect error handling in glBufferDataARB()Brian Paul2009-02-271-2/+4
| | | | | | If glBufferDataARB() is called while a buffer object is currently mapped we're supposed to unmap the current buffer, then replace it. Don't generate an error.
* Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-021-1/+1
|\ | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| * mesa: increase max texture image units and GLSL samplers to 16Brian Paul2008-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The max texture coord units is still 8. All the fixed-function paths are still limited to 8 too. But GLSL shaders can use more samplers now. Note that some texcoord-related data structures are declared to be 16 elements in size rather than 8. This just simplifies the code in a few places; the extra elements aren't accessible to the user. These changes haven't been extensively tested yet, but sanity checking has been done. It should be possible to increase the max image units/samplers to 32 without doing anything special. Beyond that we'll need longer bitfields in a few places.
* | mesa: fix default buffer object access valueBrian Paul2008-09-261-2/+9
| |
* | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-181-1/+4
|\| | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
| * mesa: remove some assertions that are invalid during context tear-downBrian Paul2008-09-151-1/+4
| |
* | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-111-96/+92
|\| | | | | | | | | | | | | | | | | | | | | 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-041-96/+92
| | | | | | | | | | 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-111-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * gallium: fix typo s/_mesa_unmap_drapix_pbo/_mesa_unmap_drawpix_pbo/Brian Paul2008-04-251-2/+2
| |
| * Refactor PBO validate/map code.Brian2008-03-211-61/+15
| | | | | | | | | | | | We always need to do PBO validation, so do that in core Mesa before calling driv er routine. cherry-picked from Mesa/master.
| * add a number of PBO validate/map/unmap functionsBrian Paul2008-03-211-2/+185
| | | | | | | | | | Helper functions for (some) drivers, including swrast. cherry-picked from Mesa/master
* | Refactor PBO validate/map code.Brian2008-03-211-61/+15
| | | | | | | | We always need to do PBO validation, so do that in core Mesa before calling driver routine.
* | add a number of PBO validate/map/unmap functionsBrian2008-03-211-2/+185
| | | | | | | | Helper functions for (some) drivers, including swrast.
* | For _mesa_share_state(), update the context's references to the new share ↵Brian2007-08-231-71/+99
|/ | | | group's objects (Shane Blackett)
* silence C++ warningsBrian2007-01-231-2/+2
|
* move a conditional into an assertionBrian Paul2006-09-211-3/+6
|
* Error detection/reporting was broken in several places.Brian Paul2006-08-251-45/+70
|
* Added _mesa_lookup_program() and _mesa_lookup_bufferobj() functions to avoidBrian Paul2006-08-231-5/+5
| | | | | | a lot of casting elsewhere. Use _mesa_lookup_texture() in tdfx driver, use _mesa_lookup_bufferobj() in r300 driver.
* remove unused varBrian Paul2006-06-121-2/+0
|
* Add support for GL_APPLE_vertex_array_object. Several test programsIan Romanick2006-06-121-43/+37
| | | | | | | and demos are also added. Adding basic support to drivers should be as easy as just enabling the extension, though thorough test would also be required.
* Added simple lookup_bufferobj() function to wrap the _mesa_HashLookup() callBrian Paul2006-06-031-79/+86
| | | | and cast. Simplifies the code a little bit elsewhere.
* minor clean-upsBrian Paul2006-06-021-20/+21
|
* try removing need for the uintptr_t castsBrian Paul2005-12-011-2/+5
|
* Port Mesa to build on a P64 platform (e.g., Win64). P64 platformsKarl Schultz2005-05-051-2/+2
| | | | | | | | use 64-bit pointers and 32-bit longs. So, operations like casting pointers to unsigned long and back to pointer won't work. glheader.h now includes files to define uintptr_t, which should instead be used for this sort of operation. It is an integer type that is the same size as a pointer.
* Major check-in of changes for GL_EXT_framebuffer_object extension.Brian Paul2005-05-041-1/+1
| | | | | | | Main driver impacts: - new code for creating the Mesa GLframebuffer - new span/pixel read/write code Some drivers not yet updated/tested.
* change gl_buffer_object's Size field to GLsizeiptrARB typeBrian Paul2005-03-031-1/+1
|
* unlock mutex upon error return (Jeff Muizelaar)Brian Paul2005-02-121-0/+1
|
* mesa-main-0-NULL.patch from Jeff MuizelaarKeith Whitwell2005-02-111-1/+1
|
* Update glDeletePrograms/Buffers() so that the ID is freed immediately, likeBrian Paul2005-01-201-12/+6
| | | | texture objects.
* Don't allow queries/etc of buffer object 0 - it's invisible to users.Brian Paul2004-11-221-23/+21
| | | | Misc clean-ups.
* GL_(UN)PACK_SKIP_IMAGES should only be applied to 3D texture pack/unpackingBrian Paul2004-11-101-3/+4
| | | | | | | and ignored for 1D and 2D images. Need to pass in image dimensions (1,2,3) to the _mesa_image_address() function. This change gets propogated to some other routines. Also added new _mesa_image_address[123]d() convenience functions.
* Remove redundant error checking.Brian Paul2004-10-311-22/+48
| | | | | Added _mesa_buffer_unmap(). Minor clean-ups.
* VBO RefCount fix (David Reveman)Brian Paul2004-09-271-0/+9
|
* also fix possible delete bugs with buffer objects and vertex/fragment programsBrian Paul2004-09-141-3/+6
|
* Update the doxygen configuration file.Jose Fonseca2004-09-091-2/+1
| | | | Minor updates/fixes to the source documentation.
* Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch ↵Brian Paul2004-08-251-1/+13
| | | | 1015696)
* Implementation of GL_EXT_pixel_buffer_object extension.Brian Paul2004-03-131-0/+76
| | | | | Note: extension may not be finalized yet - subject to change! Note: implementation not fully suitable for h/w implementation yet.
* yet another take on VBO deleting and reference countingBrian Paul2004-03-041-1/+53
|
* more changes to VBO reference counting and deletionBrian Paul2004-03-031-36/+7
|
* set buffer object default Usage and AccessBrian Paul2004-02-131-2/+4
|
* Do more bookkeeping of vertex buffer object reference counts.Brian Paul2004-02-111-0/+6
| | | | Incr/decr counts when doing glPush/PopClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT).
* Before calling _mesa_create_context(), initialize a dd_function_table structBrian Paul2004-01-201-12/+0
| | | | | | | | | | by calling _mesa_init_driver_functions() and then plugging in the driver- specific functions. In particular, make sure ctx->Driver.NewTextureObject points to the appropriate driver function so that _all_ texture objects are augmented with the driver-specific data. Put in a bunch of assertions in the texture-related driver functions that texObj->DriverData is valid. Remove old dead code in near future.
* Added GLAPIENTRY decorations for all first level OpenGL API function entryKendall Bennett2003-10-211-11/+11
| | | | | points so that the calling conventions will work correctly with the assembler stubs with the Open Watcom compiler.
* fix an error messageBrian Paul2003-10-211-1/+1
|
* Move initialization of default ctx->Driver.buffer-object-functions intoBrian Paul2003-10-191-0/+12
| | | | bufferobj.c so all the drivers don't have to worry about them.
* minor tweaksBrian Paul2003-10-151-2/+2
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 16:01:30 +0000