summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/context.c
Commit message (Collapse)AuthorAgeFilesLines
* mesa: fix/simplify initialization of vertex/fragment program limitsBrian Paul2008-09-261-27/+26
| | | | | | Defaults for program length, num ALU instructions, num indirections, etc. basically indicate no limit for software rendering. Driver should override as needed.
* mesa: add missing FEATURE_attrib_stack aroundAlan Hourihane2008-09-191-0/+2
| | | | call to _mesa_free_attrib_data()
* Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-15/+91
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * mesa: allow for extra per-context initBrian Paul2008-08-191-0/+4
| |
| * mesa: fix some feature testsBrian Paul2008-08-081-6/+0
| |
| * added null ptr check (fix bug 16959)Brian Paul2008-08-031-1/+2
| |
| * mesa: Implement mutex/locking around texture object reference counting.Brian Paul2008-07-041-11/+3
| | | | | | | | | | | | | | | | Use new _mesa_reference_texobj() function for referencing/unreferencing textures. Add new assertions/tests to try to detect invalid usage of deleted textures. cherry-picked from master (9e01b915f1243a3f551cb795b7124bd1e52ca15f)
| * mesa: fix problem freeing framebuffer/renderbuffer objectsBrian Paul2008-07-031-0/+34
| | | | | | | | Basically, set up no-op Delete() methods for the DummyFrame/Renderbuffer obj
| * mesa: init ctx->RenderModeBrian Paul2008-06-201-0/+2
| |
| * mesa: fix some FEATURE_x testsBrian Paul2008-06-201-6/+1
| |
| * mesa: test for FEATURE_ATI_fragment_shaderBrian Paul2008-06-201-0/+2
| |
| * mesa: fix ReadBuffer initializationBrian Paul2008-06-181-0/+2
| |
| * mesa: FEATURE_dispatch to control dispatch table usageBrian Paul2008-06-181-0/+2
| |
| * mesa: move some glapi bits aroundBrian Paul2008-06-131-0/+1
| | | | | | | | | | | | Move _glapi_proc typedef from glapitable.h to glapi.h Also, don't include glapitable.h from glapi.h Before we were including the huge glapitable.h file in every .c file.
| * mesa: remove some temp debug codeBrian Paul2008-06-131-1/+0
| |
| * mesa: check FEATURE_ARB_occlusion_queryBrian Paul2008-06-131-0/+7
| |
| * mesa: add some #if FEATURE_x testsBrian Paul2008-06-121-2/+2
| |
| * mesa: refactor: move #define FEATURE flags into new mfeatures.h fileBrian Paul2008-06-101-2/+48
| | | | | | | | Also, check the FEATURE flags in many places.
| * mesa: refactor: move multisample-related functions into new multisample.c fileBrian Paul2008-06-091-0/+1
| |
| * mesa: refactor: move scissor functions into new scissor.c fileBrian Paul2008-06-091-0/+1
| |
| * mesa: refactor: move _mesa_init_exec_table() into new api_exec.c fileBrian Paul2008-06-091-0/+1
| |
| * mesa: refactor: new _mesa_init_pixelstore() functionBrian Paul2008-06-091-0/+2
| |
| * mesa: chmod a-x context.cBrian Paul2008-06-091-0/+0
| |
| * mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca2008-05-311-1/+1
| |
| * Fix program refcounting assertion failure during context tear-downBrian Paul2008-05-191-22/+24
| | | | | | | | | | | | | | | | | | | | When purging the program hash table, the refcount _should_ be one since the program is referenced by the hash table. Need to explicitly set to zero before calling delete(). Also, purge high-level shader hash tables before low-level program hash tabl cherry-picked from master
| * mesa: free shader program data before deleting shader objects.Brian2008-05-061-0/+16
| | | | | | | | | | Picked from master. Fixes mem corruption seen when glean/api2 test exits.
| * gallium: implement full reference counting for vertex/fragment programsBrian2008-05-061-10/+16
| | | | | | | | | | | | Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test. Another memory bug involving shaders yet to be fixed...
| * Fix build problem with MSVCAlan Hourihane2008-05-011-3/+7
| |
| * delete default programs with ctx->Driver.DeleteProgram()Brian2008-03-221-2/+2
| |
| * free Default1D/2DArray objectsBrian2008-01-011-2/+10
| |
| * disable the driverContext assertionsBrian2007-11-011-2/+2
| |
| * call Driver.Flush() in _mesa_notifySwapBuffers()Brian2007-10-191-2/+4
| |
* | added null ptr check (fix bug 16959)Brian Paul2008-08-031-1/+2
| |
* | mesa: fix problem freeing framebuffer/renderbuffer objectsBrian Paul2008-07-031-0/+1
| | | | | | | | Basically, set up no-op Delete() methods for the DummyFrame/Renderbuffer objects.
* | Fix program refcounting assertion failure during context tear-downBrian Paul2008-05-191-6/+8
| | | | | | | | | | | | | | | | When purging the program hash table, the refcount _should_ be one since the program is referenced by the hash table. Need to explicitly set to zero before calling delete(). Also, purge high-level shader hash tables before low-level program hash tables.
* | implement full reference counting for vertex/fragment programsBrian2008-05-061-10/+16
| | | | | | | | | | Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test.
* | drop stray includes of glapiGeorge Sapountzis2008-04-231-1/+0
| |
* | mesa: Free all shader program data before deleting allXiang, Haihao2008-03-311-0/+16
| | | | | | | | shader/shader program objects to avoid memory access error.
* | Revert "mesa: separate shader program object from shader object." (bug#15244)Xiang, Haihao2008-03-311-16/+8
| | | | | | | | This reverts commit 3ffd11f71d021f672b9bc15b3c39c155a0e2fecb.
* | delete default programs with ctx->Driver.DeleteProgram()Brian2008-03-221-2/+2
| |
* | init vertex weight attrib to (1,0,0,0)Markus Amsler2008-03-091-1/+1
| |
* | mesa: separate shader program object from shader object.Xiang, Haihao2008-02-281-8/+16
| | | | | | | | | | | | | | | | | | Currently a callback delete_shader_cb is used for deleting shader and shader program objects. Mesa detaches all attached shaders in _mesa_free_shader_program_data when deleting shader program objects. However it is likely that these shaders have been freed in _mesa_free_shader, which will result in unexpected behaviour. This fix uses a single callback for shader program objects and deletes shader program objects before shader objects.
* | check if fb->Delete is null (bugs 13507,14293)Brian2008-01-301-1/+6
| |
* | remove unneeded conditionalBrian2008-01-011-2/+3
| |
* | fix broken two-sided stencilBrian2007-11-301-1/+0
| |
* | In _mesa_make_current(), don't unbind FBOs from the old context.Brian2007-09-111-9/+0
| | | | | | | | | | | | This fixes the X server crash reported by KeithP on Aug 29. The old context's FBOs will be unreferenced during context destruction so there's no memleak with this change.
* | For _mesa_share_state(), update the context's references to the new share ↵Brian2007-08-231-4/+32
| | | | | | | | group's objects (Shane Blackett)
* | remove dead code left over after fixing GL_READ/DRAW_BUFFER state issuesBrian2007-08-181-14/+0
| |
* | Rework the GL_READ_BUFFER, GL_DRAW_BUFFER state repairs that Roland ↵Brian2007-08-161-0/+7
| | | | | | | | | | | | | | | | | | previously did. Basically, in update_framebuffer() (which should be called after an FBO is bound with MakeCurrent or BindFramebuffer) we check if the FBO is a window-system FBO. If it is, update the FBO's GL_READ/DRAW_BUFFER state according to the context state. Old code still in place but disabled with #if 0 / #endif.
* | Bring over the texobj refcounting changes from mesa_7_0_branchBrian2007-08-161-2/+3
| |