Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix in t_vp_build: Missed necessary updates sometimes | Nicolai Haehnle | 2007-04-02 | 1 | -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 ↵ | Brian | 2007-04-02 | 1 | -0/+1 |
| | | | | _glapi_Context global gets cleared properly. | ||||
* | use _mesa_reference_renderbuffer() in a few more places | Brian | 2007-04-02 | 2 | -13/+3 |
| | |||||
* | updated debug printf | Brian | 2007-04-02 | 1 | -2/+2 |
| | |||||
* | Fix some bugs/issues related to alpha channel support. See bug 10483. | Brian | 2007-04-01 | 1 | -31/+23 |
| | |||||
* | If using PF_8A8B8G8R, be sure alpha is correctly handled. | Brian | 2007-04-01 | 2 | -23/+40 |
| | |||||
* | re-order tokens, fix comments | Brian | 2007-04-01 | 1 | -4/+4 |
| | |||||
* | always emit BGN/ENDSUB, for now anyway | Brian | 2007-03-31 | 1 | -4/+1 |
| | |||||
* | fix scoping mistake in previous commit that checked for writable LHSs | Brian | 2007-03-31 | 1 | -1/+1 |
| | |||||
* | check that LHS of assignment is writable | Brian | 2007-03-30 | 1 | -1/+22 |
| | |||||
* | Merge branch 'origin' | Eric Anholt | 2007-03-30 | 7 | -47/+27 |
|\ | |||||
| * | call DRI_VALIDATE_DRAWABLE_INFO(), bug 10477 | Gustavo Pichorim Boiko | 2007-03-30 | 1 | -1/+2 |
| | | |||||
| * | Clean and update XMesa/XFree86 interface. | George Sapountzis | 2007-03-30 | 6 | -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 Anholt | 2007-03-30 | 2 | -0/+4 |
|\ \ | |/ |/| | |||||
| * | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-26 | 12 | -368/+327 |
| |\ | |||||
| * \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-25 | 9 | -197/+164 |
| |\ \ | |||||
| * \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-24 | 5 | -113/+151 |
| |\ \ \ | |||||
| * \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-23 | 3 | -13/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-22 | 7 | -6/+21 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-21 | 12 | -92/+73 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-20 | 10 | -464/+911 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-19 | 23 | -152/+168 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-18 | 2 | -2/+20 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-17 | 13 | -305/+228 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-16 | 17 | -141/+172 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-15 | 7 | -398/+297 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-14 | 15 | -32/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-13 | 14 | -62/+167 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-12 | 33 | -421/+975 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-07 | 38 | -113/+146 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-06 | 4 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-02 | 9 | -231/+224 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-03-01 | 9 | -41/+67 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-02-27 | 12 | -149/+199 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2007-02-25 | 335 | -25987/+12599 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Add Intel 965GM chipset info | Wang Zhenyu | 2007-02-02 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Revert origin crestline pci id patch | Wang Zhenyu | 2007-02-02 | 2 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix bug #155 | Zou Nan hai | 2007-01-18 | 3 | -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 crestline | Keith Packard | 2007-01-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'origin' into crestline | Keith Packard | 2007-01-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into crestline | Keith Packard | 2007-01-06 | 6 | -10/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into crestline | Wang Zhenyu | 2007-01-06 | 103 | -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-qa | Nian Wu | 2006-12-26 | 3 | -4/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support linear format in i965. | Haihao Xiang | 2006-12-26 | 3 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #117 #118 | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'crestline' into crestline-qa | Nian Wu | 2006-12-17 | 23 | -786/+349 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline | Nian Wu | 2006-12-13 | 48 | -855/+761 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug #93, i965 driver not thread safe. | Zou Nan hai | 2006-12-13 | 3 | -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 hai | 2006-12-13 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prim_count overflow when there is more than 1 cliprect (cherry picked from 84b958d66fe7d3fe03ed12b493e3f3197f656531 commit) |