summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/context.c
Commit message (Collapse)AuthorAgeFilesLines
* Free shader-related context state: _mesa_free_shader_state()Brian2007-03-241-0/+1
|
* Merge branch 'origin' into glsl-compiler-1Brian2007-03-091-6/+17
|\ | | | | | | | | | | Conflicts: src/mesa/main/context.c
| * Fix/improve framebuffer object reference counting.Brian2007-03-061-12/+13
| | | | | | | | | | | | | | Use _mesa_reference_framebuffer() and _mesa_unreference_framebuffer() functions to be sure reference counting is done correctly. Additional assertions are done too. Note _mesa_dereference_framebuffer() renamed to "unreference" as that's more accurate.
| * Do proper framebuffer refcounting in _mesa_make_current().Brian2007-02-261-0/+14
| | | | | | | | | | | | Also, added DeletePending field to gl_framebuffer used when a window has been deleted, but there still may be rendering contexts attached to the gl_framebuffer object.
* | Merge branch 'origin' into glsl-compiler-1Brian2007-02-221-16/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c
| * Merge branch 'vbo-0.2'Keith Whitwell2007-02-021-3/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/texcompress_s3tc.c src/mesa/tnl/t_array_api.c
| | * Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵Keith Whitwell2007-01-161-1/+12
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vbo-0.2 Conflicts: src/mesa/array_cache/sources src/mesa/drivers/dri/i965/brw_context.c src/mesa/drivers/dri/i965/brw_draw.c src/mesa/drivers/dri/i965/brw_fallback.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/i965/brw_vs_tnl.c src/mesa/drivers/dri/mach64/mach64_context.c src/mesa/main/extensions.c src/mesa/main/getstring.c src/mesa/tnl/sources src/mesa/tnl/t_save_api.c src/mesa/tnl/t_save_playback.c src/mesa/tnl/t_vtx_api.c src/mesa/tnl/t_vtx_exec.c src/mesa/vbo/vbo_attrib.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_api.c src/mesa/vbo/vbo_save_draw.c
| | * | Don't special-case FOG attribute initialization.Keith Whitwell2007-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | Initial fog value was being set to {0,0,0,0}. This results in vector size 4, but isn't necessary. The regular {0,0,0,1} works fine.
| | * | merge current trunk into vbo branchAlan Hourihane2006-11-021-0/+11
| | | |
| | * | Move edgeflag into the VERT_ATTRIB_SEVEN slot. This means that ourKeith Whitwell2006-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | NV_vertex_program implementation has slightly incorrect aliasing behaviour. I think this is reasonable given the simplification and the fact that the mainstream ARB_vp continues to have the correct behaviour.
| * | | Override Const.CheckArrayBounds for Xserver in XMesaCreateContext().George Sapountzis2007-01-261-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leaves one last XFree86Server ifdef in Mesa core. --- Bug 9285: misc glcore, xmesa cleanups ACKed by Ian Romanick.
| * | | Drop old (pre-AIGLX) GLcore interface.George Sapountzis2007-01-261-6/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The old GLcore interface was replaced in Xorg 7.1 with the addition of AIGLX, it is only used by DDX's which are known not to work with the new DIX glx code. --- Bug 9285: misc glcore, xmesa cleanups ACKed by Ian Romanick.
* | | Minor clean-ups, reformatting, comment changes.Brian2006-12-201-23/+24
| | |
* | | Fix shader object reference counting and hash table deallocation.Brian2006-12-201-10/+16
| | |
* | | Clean-up and re-org of the main GLSL object types.Brian2006-12-191-3/+0
| | | | | | | | | | | | | | | | | | | | | Use the gl_shader struct as it should be. Renamed gl_linked_program to gl_shader_program. Store both shaders and programs in the same hash table and use the Type field to distinguish them.
* | | Overhaul of GLSL API functions, dispatching, etc.Brian2006-12-191-8/+9
| | |
* | | Lots of assorted changes for new GLSL compiler backend.Brian2006-12-151-10/+51
|/ / | | | | | | New datatypes, constants, variables.
* | replace check for XFree86LOADER and IN_MODULE with XFree86Server (bug 9144)Brian Paul2006-11-271-1/+1
| |
* | delete shader objects when destroying shared context stateBrian Paul2006-11-181-0/+11
| |
* | Merge texmem-0-3-branch.Keith Whitwell2006-11-011-0/+4
| |
* | Added a few new ctx->Const. fields for shader-related limits.Brian Paul2006-11-011-0/+7
|/
* check if ctx->Driver.GetBufferSize==NULL and no-opBrian Paul2006-10-171-5/+6
|
* Added #if / #else / #endif around code related to framebuffer initializationBrian Paul2006-10-151-0/+20
| | | | to describe what should be changed in the drivers.
* resize buffers in MakeCurrentKeith Whitwell2006-09-221-0/+2
|
* Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492.Michal Krol2006-08-011-0/+6
|
* Some structure renaming. Prefix vertex/fragment-related structs withBrian Paul2006-07-201-1/+1
| | | | "gl_" to match other structs.
* free array objects properly (bug 7493)Brian Paul2006-07-111-0/+14
|
* free GL2Objects unconditionallyTilman Sauerbeck2006-07-111-2/+0
|
* free the ArrayObjects hash tableTilman Sauerbeck2006-07-111-0/+5
|
* only access ss->BufferObjects if it's declaredTilman Sauerbeck2006-07-111-2/+5
|
* In free_shared_state(), use new _mesa_HashDeleteAll() function to deleteBrian Paul2006-06-301-79/+82
| | | | textures, display lists, programs, VBOs, etc. Less code and more efficient.
* destroy left-over VBOs on shutdownTilman Sauerbeck2006-06-291-0/+14
|
* Add support for GL_APPLE_vertex_array_object. Several test programsIan Romanick2006-06-121-0/+1
| | | | | | | 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 a check_context_limits() function that checks that the ctx->Const.*Brian Paul2006-05-151-0/+30
| | | | | fields are legal. May catch some driver development bugs. Called the first time a context is bound.
* Put color index attribute into the 6th attribute slot.Brian Paul2006-04-251-4/+4
| | | | | | Update a lot of loops, conditionals to use the _TNL_FIRST/LAST_* values instead of specific vertex attributes. Remove the EdgeFlagv function from the GLvertexformat struct.
* Fix comment about MaxTextureUnits, needs to be min of coord and image units.Brian Paul2006-04-131-2/+7
| | | | | | | | See bug 5994. Also add a few assertions. Use MaxTextureUnits in get.c code. There's probably other places where we need to clean-up the usage of the MaxTexture[Coord/Image]Units constants.
* minor clean-upBrian Paul2006-03-291-4/+2
|
* fix some buffer binding tests in _mesa_make_current()Brian Paul2006-03-201-3/+9
|
* Moved _glapi_check_multithread() call into drivers, instead of inBrian Paul2006-03-161-8/+1
| | | | | _mesa_make_current(). This removes an ugly #if !defined(IN_DRI_DRIVER) from core Mesa.
* just a comment for check_compatible()Brian Paul2006-03-071-0/+5
|
* disable double-buffer test in check_compatible(), fixes pbuffer/visual problemBrian Paul2006-03-071-2/+11
|
* display list clean-upsBrian Paul2006-02-261-3/+1
|
* fix broken _mesa_copy_context() for GL_LIGHTING_BITBrian Paul2006-02-241-2/+2
|
* properly free ATI fragment shaders (Tilman Sauerbeck)Brian Paul2006-01-161-3/+21
|
* properly notify driver on scissor change in MakeCurrentKeith Whitwell2005-12-301-2/+4
|
* Split _MaintainTexEnvProgram into two flags _Maintain and _Use. ThisKeith Whitwell2005-12-121-0/+4
| | | | | restores the ability to run the software driver with program TNL but tradtional swrast.
* No longer derive 'ati_fragment_shader' from 'program' class. Only theBrian Paul2005-11-191-3/+5
| | | | | program->Id and program->RefCount fields were used and ATI fragment shaders didn't have too much in common with ARB/NV vertex/fragment programs anyway.
* Added OSMesaColorClamp(), bug 4917Brian Paul2005-11-121-6/+0
|
* Re-org and clean-up of vertx/fragment program limits (instructions,Brian Paul2005-11-011-16/+42
| | | | | | | temporaries, parameters, etc). glGetProgramivARB() now returns all the right things. Updated i915 and r300 code to initialize program native limits and current program's native instruction/temporary/etc counts.
* Remove ACCUM_BITS.Brian Paul2005-09-211-12/+4
|