summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11/xm_dd.c
AgeCommit message (Collapse)Author
2008-09-11Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell
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
2008-02-16Fix potential glDrawPixels(GL_DEPTH_COMPONENT) crashes (bug 13915)Brian
Also, general clean-up of the Xlib-optimized glDraw/CopyPixels code.
2008-02-15Code reorganization: update build.José Fonseca
Update the Makefiles and includes for the new paths. Note that there hasn't been no separation of the Makefiles yet, and make is jumping all over the place. That will be taken care shortly. But for now, make should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm might require some minor tweaks.
2008-01-22Fix some issues with glDrawBuffer(GL_NONE), bug 14198Brian
Set _ColorDrawBuffers[0] = NULL if no renderbuffers enabled. Check that _ColorDrawBuffers[0] is non-null before dereferencing in a few places.
2008-01-06Simplify ctx->_NumColorDrawBuffers, _ColorDrawBuffers and fix bug 13835.Brian
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...
2007-10-30Set _NEW_BUFFERS in glRead/DrawBuffer().Brian
Previously, we set _NEW_PIXEL and _NEW_COLOR in these functions, respectively. That correponds to the GL attribute groups, but doesn't make much sense otherwise. This could improve validation efficiency in a few places too. It looks like all the drivers are already checking for _NEW_BUFFERS in the right places (since that's the bit for FBO state) so we can trim out _NEW_PIXEL and _NEW_COLOR at any time.
2007-10-22don't apply ColorMask to main gcBrian
2007-10-22don't apply ColorMask to main gcBrian
2007-09-17update begin/end_query() functionsBrian
2007-08-17fix buffer clearing problemsBrian
2007-08-10return (softpipe) in GL_RENDERER string - temporarilyBrian
2007-08-09asst changes to get softpipe rendering again (no zbuf support for now)Brian
2007-08-02pipe->clear() now takes a surface, rather than color/depth/stencil flags.Brian
pipe->clear() only used to clear whole buffers (no scissor) w/out masking. Draw a colored quadrilateral in all other cases.
2007-08-02get rid of accum paramBrian
2007-08-01rearrange things in xmesa_clear() a bitBrian
2007-08-01Checkpoint: glClear changes - working, bug very rough.Brian
2007-06-20actually use new glClear codeBrian
2007-06-14Rename directories again?!Keith Whitwell
Some git wierdness going on.
2007-05-24Use the x11 driver as a test harness for the softpipe/state_tracker code.Keith Whitwell
This has some limitations as we currently require a mapped framebuffer, so it only really works with double-buffered ximage rgba8888 windows.
2007-05-02fix some renderbuffer/wrapper bugsBrian
2007-03-30Clean and update XMesa/XFree86 interface.George Sapountzis
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.
2006-11-02merge current trunk into vbo branchAlan Hourihane
2006-10-30switch several dri drivers overKeith Whitwell
2006-10-29switch over to vbo moduleKeith Whitwell
2006-10-18Don't use x/y/w/h params given to Clear().Brian Paul
2006-10-17Remove get_buffer_size()Brian Paul
Always check window size in XMesaMakeCurrent() in case glViewport is not called.
2006-10-14Big re-org of buffer size management.Brian Paul
All buffer resizes now handled by xmesa_check_and_update_buffer_size() which uses the _mesa_resize_framebuffer() function. Moved all low-level XImage/Pixmap resizing into xm_buffers.c file. Also, update lots of comments for Doxygen.
2006-10-11In xmesa_DrawPixels_8R8G8B() check if drawing into a window system buffer,Brian Paul
not a user-created FBO.
2006-09-10don't use xmesa_DrawPixels_8R8G8B() if there's a software alpha channelBrian Paul
2006-04-27assorted clean-ups, fixesBrian Paul
2006-04-26minor clean-upBrian Paul
2006-03-28a little code movement so we don't make invalid casts from gl_renderbuffers ↵Brian Paul
to xmesa_renderbuffers
2006-02-24need to check for _NEW_BUFFERS in xmesa_update_state()Brian Paul
2006-01-26New comments, clean-up of fields related to point/line/triangle validation.Brian Paul
2006-01-09only call xmesa_set_renderbuffer_funcs() when really necessaryBrian Paul
2006-01-09check XGetGeometry() return valueBrian Paul
2005-12-07Updates for GL_EXT_timer_query:Brian Paul
New GLint64EXT and GLuint64EXT types (use C99's long long types). New glGetQueryObject[u]i64vEXT() functions.
2005-10-21fix GLX server resize/crash when resizing windowsBrian Paul
2005-09-28Initial work for GL_EXT_packed_depth_stencil extension.Brian Paul
glReadPixels done, glDrawPixels mostly done.
2005-09-26Added XMesaDrawable to xmesa_renderbuffer. Use it in a few places insteadBrian Paul
of the XMesaPixmap field to avoid some X server-side issues with casting.
2005-09-08 Committing in .Jouk Jansen
Define suseconds_t for OpenVMS Modified Files: Mesa/src/mesa/drivers/x11/xm_dd.c ----------------------------------------------------------------------
2005-09-07some clean-up and re-org for renderbuffersBrian Paul
2005-09-02Prototype implementation of new GL_EXT_timer_query extension (not finalized ↵Brian Paul
yet). Extends the query mechanism to query elapsed time while rendering.
2005-07-01Remove NEW_RENDERBUFFER stuff.Brian Paul
Now, OLD_RENDERBUFFER marks code that needs to eventually be removed when all the drivers are updated to no longer need the SetBuffer() function.
2005-06-23Remove the xmesa_set_buffer() function. No longer needed since theBrian Paul
span functions pass in a gl_renderbuffer to indicate which color buffer should be drawn into. Optimized line/triangle routines are smart enough to know which buffer to draw into as well. The swrast->SetBuffer() routine should eventually be removed from all drivers.
2005-05-06remove bad assertion, added new ones in clear_pixmap()Brian Paul
2005-05-04Major check-in of changes for GL_EXT_framebuffer_object extension.Brian Paul
Main driver impacts: - new code for creating the Mesa GLframebuffer - new span/pixel read/write code Some drivers not yet updated/tested.
2005-04-18comments and clean-upBrian Paul
2004-11-27Remove _mesa_ResizeBuffersMESA() call from _mesa_set_viewport().Brian Paul
Now, the driver's Viewport routine should call _mesa_ResizeBuffersMESA() if necessary. Cleaned up code related to GLframebuffer width/height initialization. Set initial viewport/scissor params in _mesa_make_current2(), instead of in the drivers' MakeCurrent functions.
2004-11-27Remove the redundant width, height fields in xmesa_buffer struct. Just useBrian Paul
the values in the contained GLframebuffer. Removed some other unneeded code.
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-03 17:07:29 +0000