summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1147-132/+135
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * mesa: Prefix main includes with dir to avoid conflicts.José Fonseca2008-07-2447-131/+131
| | | | | | | | | | Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
| * mesa: fix issues around multisample enableRoland Scheidegger2008-07-021-1/+1
| | | | | | | | | | multisample enable is enabled by default, however gl mandates multisample rendering rules only apply if there's also a multisampled buffer.
| * mesa: refactor: move pixel map/scale/bias code into image.cBrian Paul2008-06-091-1/+1
| | | | | | | | pixel.c is just the API-related code now.
| * Consolidate texture fetch code and use partial derivatives when possible.Brian Paul2008-05-141-1/+1
| | | | | | | | picked from master
| * mesa: sync up swrast/s_fragprog.c with masterBrian Paul2008-05-141-16/+22
| |
| * gallium: fix typo s/_mesa_unmap_drapix_pbo/_mesa_unmap_drawpix_pbo/Brian Paul2008-04-251-1/+1
| |
| * Refactor PBO validate/map code.Brian2008-03-213-10/+5
| | | | | | | | | | | | We always need to do PBO validation, so do that in core Mesa before calling driv er routine. cherry-picked from Mesa/master.
| * add a number of PBO validate/map/unmap functionsBrian Paul2008-03-213-74/+18
| | | | | | | | | | Helper functions for (some) drivers, including swrast. cherry-picked from Mesa/master
| * Remove files of unsupported build systems.José Fonseca2008-02-251-80/+0
| |
| * Rename 'mms-config.' to 'mms.config'.Michal Krol2007-10-291-1/+1
| | | | | | | | | | It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
| * Re-implement GLSL texture sampler variables.Brian2007-10-261-0/+2
| | | | | | | | | | | | | | | | | | | | GLSL sampler variables indicate which texture unit to use for TEX instructions. Previously, this was baked into the fragment/vertex program and couldn't be readily changed once set. Now, SamplerUnits[] array indicates which texture unit is to be used for each sampler variable. These values are set with glUniform1i(). This is extra state that must be passed to the fragment/vertex program executor at runtime.
| * Implement gl_PointCoord attribute for GLSL fragment shaders.Brian2007-10-244-52/+69
| | | | | | | | Contains the normalized fragment position within a point sprite.
| * check for null swrast (pipe work-around)Brian2007-08-161-0/+3
| |
* | mesa: fix float blend bugMark Anderson2008-08-201-3/+4
| |
* | mesa: fix a swrast state validation bugBrian Paul2008-08-131-1/+9
| | | | | | | | Fixes progs/glsl/points.c
* | mesa: added comment about gl_PointCoordBrian Paul2008-08-111-0/+1
| |
* | added null texObj ptr check (bug 15567)Brian Paul2008-07-081-12/+16
| |
* | mesa: fix issues around multisample enableRoland Scheidegger2008-07-021-1/+1
| | | | | | | | | | multisample enable is enabled by default, however gl mandates multisample rendering rules only apply if there's also a multisampled buffer.
* | mesa: tweak mipmap level selection for cube mapsBrian Paul2008-06-191-1/+15
| | | | | | | | | | | | | | This is just a hack. After we convert the 3D texcoord into a face plus 2D texcoord we need to recompute the partial derivatives and mipmap LOD. But we don't have the info to do that. Adjusting the original mipmap level by -1 seems to give somewhat better results than before though.
* | mesa: allocate pixel zoom arrays on heap, not stackBrian Paul2008-06-163-10/+20
| | | | | | | | Fixes stack overflow on Windows.
* | Updated GLSL uniform/sampler handling from gallium-0.1 branchBrian Paul2008-05-142-6/+9
| | | | | | | | | | | | | | | | | | | | Previously, the shader linker combined the uniforms used by the vertex and fragment shaders into a combined set of uniforms. This made the implementation of glUniform*() simple, but was rather inefficient otherwise. Now each shader gets its own set of uniforms (no more modelview matrix showing up in the fragment shader uniforms, for example). cherry-picked by hand from gallium-0.1 branch
* | swrast/dri: switch over users of generate_mipmap to new interfaceDave Airlie2008-05-091-5/+5
| |
* | mesa: Call RENDER_FINISH on the zero pixel case.Xiang, Haihao2008-05-081-1/+3
| |
* | glcore: drop outdated sources files intented for xorgGeorge Sapountzis2008-04-231-65/+0
| |
* | fix multi-draw buffer regressionBrian2008-04-141-2/+1
| |
* | Refactor PBO validate/map code.Brian2008-03-213-12/+7
| | | | | | | | We always need to do PBO validation, so do that in core Mesa before calling driver routine.
* | add a number of PBO validate/map/unmap functionsBrian2008-03-213-79/+19
| | | | | | | | Helper functions for (some) drivers, including swrast.
* | mesa: The span array is only populated in single-pixelXiang, Haihao2008-03-201-2/+4
| | | | | | | | point drawing function.
* | fix botched test for clearing color buffers (should fix depth peeling ↵Brian2008-03-091-3/+4
| | | | | | | | regression)
* | Fix some issues with glDrawBuffer(GL_NONE), bug 14198Brian2008-01-223-7/+13
| | | | | | | | | | Set _ColorDrawBuffers[0] = NULL if no renderbuffers enabled. Check that _ColorDrawBuffers[0] is non-null before dereferencing in a few places.
* | Simplify ctx->_NumColorDrawBuffers, _ColorDrawBuffers and fix bug 13835.Brian2008-01-0610-148/+104
| | | | | | | | | | | | | | | | | | | | | | 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...
* | check if span length > 0 before calling _swrast_write_rgba_span()Brian2008-01-051-5/+7
| |
* | Fix mismatched map/unmap of buffers in swrast read/drawpixels error paths.Eric Anholt2007-12-182-9/+10
| |
* | fix polygon cull regressionBrian2007-12-141-7/+3
| |
* | fix span->facing computation and gl_FrontFacing initializationBrian2007-12-042-6/+5
| |
* | fix broken two-sided stencilBrian2007-11-3010-12/+48
| |
* | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesajoukj2007-11-305-77/+71
|\ \
| * | improve 24-bit Z to 32-bit Z conversionBrian2007-11-271-2/+3
| | |
| * | Consolidate texture fetch code and use partial derivatives when possible.Brian2007-11-231-11/+12
| | |
| * | need to check border width in sample_linear_2d() - fixes failed assertion in ↵Brian2007-11-231-1/+2
| | | | | | | | | | | | texwrap.c test
| * | Consolidate point size computation, clamping in get_size().Brian2007-11-221-36/+35
| | | | | | | | | | | | | | | Also, apply user-defined clamp limits to point size even when not using attentuation or program-computed size.
| * | clamp lambda to Min/MaxLodBrian2007-11-201-3/+6
| | |
| * | fix some texture format assertions, etcBrian2007-11-191-23/+11
| | |
| * | fix out-of-bounds array index (ix=-1)Brian2007-11-191-2/+3
| | |
* | | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesaJouk2007-10-315-65/+75
|\| |
| * | Implement gl_PointCoord attribute for GLSL fragment shaders.Brian2007-10-244-52/+69
| | | | | | | | | | | | Contains the normalized fragment position within a point sprite.
| * | Replace repeat_remainder() with a simpler macro that just casts args to ↵Brian2007-10-171-13/+6
| | | | | | | | | | | | unsigned.
* | | 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-10-025-13/+32
|\| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 22:31:09 +0000