summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix in t_vp_build: Missed necessary updates sometimesNicolai Haehnle2007-04-021-1/+2
| | | | | | | | | _mesa_update_state doesn't always reset VertexProgram._Current to NULL. This caused us to skip a necessary update of the fixed function vertex program sometimes. Change the logic such that we check for updates whenever the _Current program is either NULL or the program generated by t_vp_build.
* Call _glapi_set_context(NULL) in _glapi_check_multithread() to make sure the ↵Brian2007-04-021-0/+1
| | | | _glapi_Context global gets cleared properly.
* use _mesa_reference_renderbuffer() in a few more placesBrian2007-04-022-13/+3
|
* updated debug printfBrian2007-04-021-2/+2
|
* Fix some bugs/issues related to alpha channel support. See bug 10483.Brian2007-04-011-31/+23
|
* If using PF_8A8B8G8R, be sure alpha is correctly handled.Brian2007-04-012-23/+40
|
* re-order tokens, fix commentsBrian2007-04-011-4/+4
|
* always emit BGN/ENDSUB, for now anywayBrian2007-03-311-4/+1
|
* fix scoping mistake in previous commit that checked for writable LHSsBrian2007-03-311-1/+1
|
* check that LHS of assignment is writableBrian2007-03-301-1/+22
|
* Merge branch 'origin'Eric Anholt2007-03-307-47/+27
|\
| * call DRI_VALIDATE_DRAWABLE_INFO(), bug 10477Gustavo Pichorim Boiko2007-03-301-1/+2
| |
| * Clean and update XMesa/XFree86 interface.George Sapountzis2007-03-306-46/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop XMesaSetVisualDisplay(), XMesaReset(), no longer used. Add XMesaCopyContext() and move the GlxSetRenderTables() call for XGL within XMesaForceCurrent(). This is to make xserver/GL/mesa/X/xf86glx.c unaware of Mesa internals. Also, clean some ifdef's to make it clear that USE_XSHM and XFree86Server are mutually exclusive. Lastly, - move gcstruct.h from glxheader.h up to xmesa_xf86.h since it calls *gc->ops - drop GL/glxtokens.h from xm_api|dd.c, GLX tokens come from glcore.h and are used irrelevant of XFree86.
* | Merge branch 'crestline-qa', adding support for the 965GM chipset.Eric Anholt2007-03-302-0/+4
|\ \ | |/ |/|
| * Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-2612-368/+327
| |\
| * \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-259-197/+164
| |\ \
| * \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-245-113/+151
| |\ \ \
| * \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-233-13/+11
| |\ \ \ \
| * \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-227-6/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-2112-92/+73
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-2010-464/+911
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-1923-152/+168
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-182-2/+20
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-1713-305/+228
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-1617-141/+172
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-157-398/+297
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-1415-32/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-1314-62/+167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-1233-421/+975
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-0738-113/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-064-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-029-231/+224
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-03-019-41/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-02-2712-149/+199
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2007-02-25335-25987/+12599
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add Intel 965GM chipset infoWang Zhenyu2007-02-022-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Revert origin crestline pci id patchWang Zhenyu2007-02-022-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | 1. Fix bug #155Zou Nan hai2007-01-183-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. I notice multiple ARB_occlusion_query should be able to overlap according to spec. 3. Declaring extern variables in a .c file is evil, fix it.
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into crestlineKeith Packard2007-01-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'origin' into crestlineKeith Packard2007-01-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into crestlineKeith Packard2007-01-066-10/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into crestlineWang Zhenyu2007-01-06103-2239/+15144
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_tex_layout.c Michel Dänzer replaced the copy of the 945 mipmap layout code with that from the 945 driver directly.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'crestline' into crestline-qaNian Wu2006-12-263-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Support linear format in i965.Haihao Xiang2006-12-263-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #117 #118
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'crestline' into crestline-qaNian Wu2006-12-1723-786/+349
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestlineNian Wu2006-12-1348-855/+761
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #93, i965 driver not thread safe.Zou Nan hai2006-12-133-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am not confident of it is 100% thread safe now. bufmgr_fake.c need a total rewrite later (cherry picked from 606632ca27558ee1335be2f4a5906f2baa240a6a commit)
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix bug #99.Zou Nan hai2006-12-131-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prim_count overflow when there is more than 1 cliprect (cherry picked from 84b958d66fe7d3fe03ed12b493e3f3197f656531 commit)