summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11
Commit message (Collapse)AuthorAgeFilesLines
* Replace gl_framebuffer's _ColorDrawBufferMask with _ColorDrawBufferIndexesBrian2008-01-062-5/+5
| | | | | | | Each array element is now a BUFFER_x token rather than a BUFFER_BIT_x bitmask. The number of active color buffers is specified by _NumColorDrawBuffers. This builds on the previous DrawBuffer changes and will help with drivers implementing GL_ARB_draw_buffers.
* Simplify ctx->_NumColorDrawBuffers, _ColorDrawBuffers and fix bug 13835.Brian2008-01-063-8/+8
| | | | | | | | | | | These fields are no longer indexed by shader output. Now, we just have a simple array of renderbuffer pointers. If the shader writes to gl_FragData[i], send those colors to the N _ColorDrawBuffers. Otherwise, replicate the single gl_FragColor (or the fixed-function color) to the N _ColorDrawBuffers. A few more changes and simplifications can follow from this...
* Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesajoukj2007-11-301-1/+1
|\
| * fix typoBrian2007-11-031-1/+1
| |
* | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesaJouk2007-10-311-7/+6
|\|
| * don't apply ColorMask to main gcBrian2007-10-221-7/+6
| |
* | Update of OpenVMS makefiles for the use of "new" include file conventionJouk2007-10-031-1/+4
| |
* | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesaJouk2007-07-252-3/+8
|\|
| * fix GLX_STEREO handling (bug 11705)Brian2007-07-231-1/+6
| |
| * fix GLX_USE_TLS breakage, fix a warningBrian2007-06-121-2/+2
| |
* | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesaJouk2007-06-087-37/+458
|\|
| * remove #include "GL/glxtokens.h"Brian2007-05-251-1/+0
| |
| * Fix xserver build after recent XMesa changes.Michel Dänzer2007-05-222-17/+10
| | | | | | | | Only build tested.
| * return True for GLX_Y_INVERTED_EXT queryBrian2007-05-211-1/+1
| |
| * Overhaul/simplify SWvertex and SWspan attribute handling.Brian2007-05-201-4/+4
| | | | | | | | | | Instead of separate fog/specular/texcoord/varying code, just treat all of them as generic attributes. Simplifies the point/line/triangle functions.
| * Implement GLX_EXT_texture_from_pixmap.Brian2007-05-195-25/+454
| | | | | | | | Could be done more efficiently... but works.
* | Updated OpenVMS makefilesJ.Jansen2007-05-101-3/+4
|/ | | | | | | | | | | | modified: src/mesa/descrip.mms modified: src/mesa/drivers/osmesa/descrip.mms modified: src/mesa/drivers/x11/descrip.mms modified: src/mesa/main/descrip.mms modified: src/mesa/shader/descrip.mms modified: src/mesa/shader/slang/descrip.mms modified: src/mesa/swrast/descrip.mms modified: src/mesa/swrast_setup/descrip.mms modified: src/mesa/tnl/descrip.mms
* fix some renderbuffer/wrapper bugsBrian2007-05-021-6/+6
|
* xmesa: call _glapi_set_dispatch() for all xserver DDXes.George Sapountzis2007-04-201-2/+0
| | | | | | This is to unify the xmesa code across xserver DDX'es. The call is intented for XGL, but it does not hurt to call for other DDX'es. In fact it was not guarded against XGL when it was first added in xserver.
* xmesa: minor cosmeticGeorge Sapountzis2007-04-201-29/+25
| | | | mainly drop 'client' argument from initialize_visual_and_buffer().
* xmesa: split FX functions to separate file, part 2.George Sapountzis2007-04-204-15/+32
|
* xmesa: split FX functions to separate file, part 1.George Sapountzis2007-04-204-240/+300
|
* xmesa: spilt FX code to separate functions.George Sapountzis2007-04-203-27/+34
|
* Revert "xmesa: drop glide (FX) backend."George Sapountzis2007-04-203-6/+284
| | | | This reverts commit 2a2f8d806f74619f0a7cf97fdc7f7b3ad1cad81b.
* xmesa: drop glide (FX) backend.George Sapountzis2007-04-193-284/+6
| | | | | | glide is no longer compiled with stand-alone libGL, so this will not link. There are still the glide config files. some code in demos and the GLX_MESA_set_3dfx_mode code which could be removed.
* use b->display instead of b->xm_visual->display to fix some problems ↵Brian2007-04-161-7/+7
| | | | detected w/ valgrind
* xmesa: drop unused XMesaPutImageHelper.George Sapountzis2007-04-132-24/+0
| | | | | | | | It could only be called from XMesaCopySubBuffer but this function is not used by XFree86. It seems that XMesaPutImageHelper would handle sub-images but never got finished. Proper sub-image helpers should be written if need be.
* xmesa: export xmesa functions used by xfree86.George Sapountzis2007-04-132-14/+15
| | | | | | | | | This uses xmesa.h as the GLcore interface and avoids adding an explicit GLcore inteface which would not be a proper interface anyway. It puts the declarations of the three functions specific for XMesa/XFree86 in xmesa.h, we can push them down to xmesa_xf86.h if hiding behind XFree86Server ifdef's is not enough.
* xmesa: use newly added xm_image.[hc]George Sapountzis2007-04-064-29/+13
| | | | | | | | | Keep external includes to glxheader.h and xmesa includes to xmesaP.h. Drop the following from xm_image.h: - dix-config.h (comes from glheader.h) - xfree86 includes (come from GL/xmesa_xf86.h) - ifdef __CYGWIN__ (leftover ? xm_api.c has something similar)
* xmesa: add xf86glx_util.[hc] from xserver as xm_image.[hc]George Sapountzis2007-04-062-0/+254
|
* remove debug printfBrian2007-04-041-1/+0
|
* 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
|
* Clean and update XMesa/XFree86 interface.George Sapountzis2007-03-305-46/+24
| | | | | | | | | | | | | | | | 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.
* Fix some renderbuffer reference counting issues. Also fixes a mem leak.Brian2007-03-251-12/+0
|
* Implement alpha buffer copy for SwapBuffers().Brian2007-03-232-5/+8
| | | | | | | | | | | | | Nicolai writes: When the pixmap pixel format has no alpha channel, the x11 driver (software rendering) adds a wrapped alpha channel on request. During SwapBuffers, this alpha channel is not copied from back to front, which means that the front buffer doesn't really contain the contents that the back buffer previously contained. A subsequent glReadPixels from the front buffer will return an incorrect result. The following patch attempts to fix this.
* Assorted fixes for dealing with zero-size frame/renderbuffers.Brian2007-03-162-22/+31
| | | | | | | | | | In xmesa_check_and_update_buffer_size() handle xmctx==NULL correctly: still call _mesa_resize_framebufer(). If we don't we can wind up in a situation where the framebuffer size is non-zero but an attached renderbuffer size is still initialized to zero. This inconsistancy can later cause problems. Check for zero-size renderbuffers in update_color_draw_buffers() and update_color_read_buffer(). See bug 7205.
* added null xmctx check to XMesaResizeBuffers(), bug 7205Mathias Hopf2007-03-161-0/+2
|
* clear the b->frontxrb->drawable field in xmesa_free_buffer(), see bug 7205Brian2007-03-141-0/+6
|
* move CLIENT_ID code in xmesa_delete_framebuffer(), see bug 7205Brian2007-03-141-6/+3
|
* fix renderbuffer mem leakBrian2007-03-061-0/+12
|
* formatting fixBrian2007-03-061-4/+2
|
* Fix/improve framebuffer object reference counting.Brian2007-03-061-2/+2
| | | | | | | 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.
* fix commentBrian2007-02-271-2/+1
|
* Rewrite code related to buffer destruction.Brian2007-02-263-74/+101
| | | | | Do proper reference counting so that we don't wind up with dangling references to deleted windows/framebuffers. Should help with bug 7205.
* Merge branch 'vbo-0.2'Keith Whitwell2007-02-022-5/+4
|\ | | | | | | | | | | | | 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-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | merge current trunk into vbo branchAlan Hourihane2006-11-021-9/+7
| | |
| * | switch several dri drivers overKeith Whitwell2006-10-302-1/+2
| | |