aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_zoom.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-4/+4
| | | | | | | | | | Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
* | mesa: allocate pixel zoom arrays on heap, not stackBrian Paul2008-06-161-10/+17
|/ | | | Fixes stack overflow on Windows.
* simplify INIT_SPAN codeBrian2007-06-291-1/+1
|
* Undo some prev glDraw/CopyPixel changes which fixed a bug in which colors ↵Brian2007-06-291-0/+1
| | | | | | | were overwritten by interpolating attributes. Now just set the span->arrayAttribs mask in glDraw/CopyPixels and be sure we don't overwrite the values in interpolate_active_attribs().
* fix rgba pointer bug hit on zoomed+fogged glDrawPixelsBrian2007-06-211-10/+7
|
* copy wpos attrib info into zoomed span (fixes fog perspective correction ↵Brian2007-06-201-2/+4
| | | | problem)
* Overhaul/simplify SWvertex and SWspan attribute handling.Brian2007-05-201-18/+14
| | | | | Instead of separate fog/specular/texcoord/varying code, just treat all of them as generic attributes. Simplifies the point/line/triangle functions.
* fix negative zoom factor bug (10636), more commentsBrian2007-04-141-3/+11
|
* fix references to non-existant sz4 fieldRichard Hughes2007-04-071-2/+2
|
* Merge branch 'origin' into glsl-compiler-1Brian2007-02-221-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c
| * silence C++ warningsBrian2007-01-231-8/+8
| |
* | New span attrStart/attrStepX/attrStepY fields to replace fog, specular, etc. ↵Brian2007-02-021-2/+3
| | | | | | | | fields. More to come.
* | New SWspanarrays attribs[] array.Brian2007-02-011-5/+5
|/ | | | | | | Replace texcoord[], varying[], etc. arrays with single attribs[] array, indexed by FRAG_ATTRIB_* values. Eliminates need to copy data into fragment program machine input registers. Will lead to future clean-ups.
* use GLvoid * for _swrast_write_zoomed_rgb/rgba_span() functionsBrian Paul2006-10-111-7/+5
|
* support for runtime renderbuffer depthsBrian Paul2006-10-111-24/+81
|
* New SWspan and SWspanarrays typedefs.Brian Paul2006-10-011-7/+7
|
* Initial work for supporting different renderbuffer color depths at runtime.Brian Paul2006-09-251-0/+12
|
* Use new gl_framebuffer _Depth/_StencilBuffer fields instead ofBrian Paul2005-11-161-2/+1
| | | | | Attachment[BUFFER_DEPTH/STENCIL].Renderbuffer. The former may be wrappers around combined depth/stencil renderbuffers attached at the later points.
* Rewrite much of the pixel zoom code.Brian Paul2005-09-291-271/+218
| | | | Zoomed DrawPixels of packed depth/stencil works now.
* Initial work for GL_EXT_packed_depth_stencil extension.Brian Paul2005-09-281-5/+30
| | | | glReadPixels done, glDrawPixels mostly done.
* replace GLdepth with GLuint and remove GLdepthBrian Paul2005-09-211-4/+3
|
* glDrawPixels(GL_DEPTH_COMPONENT) with glPixelZoom didn't workBrian Paul2003-08-231-15/+74
|
* Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.Ian Romanick2003-06-051-1/+0
|
* replace _mesa_ prefix with _swrast_, remove s_histogram.[ch]Brian Paul2003-03-251-10/+10
|
* Killed mmath.[ch]. Moved low-level functions/assembly code into imports.[ch]Brian Paul2003-03-011-2/+2
| | | | | Moved type conversion and interpolation macros into macros.h Updated all the files that used to include mmath.h
* casts to silence g++ warningsBrian Paul2003-02-251-5/+5
|
* fix zoom/clipping bug 689964Brian Paul2003-02-211-1/+6
|
* fixed bad zoomed.zStep assignment (bug 687811)Brian Paul2003-02-171-3/+3
|
* properly handle very wide imagesBrian Paul2002-12-051-22/+41
|
* Header file clean-up:Brian Paul2002-10-241-2/+2
| | | | | | | | 1. Remove all.h and PC_HEADER junk. 2. Rolled mem.c and mem.h into imports.c and imports.h 3. Include imports.h instead of mem.h Restore _mesa_create/initialize_context() to be like they were in 4.0.4 New wrappers for a few std C functions: _mesa_atoi(), _mesa_strstr(), etc.
* struct sw_span is again allocated on the stack, but the arrays of spanBrian Paul2002-08-071-20/+23
| | | | | | | data are broken out into a new struct span_arrays which is allocated per-context (to avoid huge stack allocations - a problem on Windows). This lets us use span.redStep instead of span->redStep (for example) to hopefully get slightly better performance in the triangle functions.
* Allocate a sw_span struct in the swrast context instead of allocating itBrian Paul2002-04-191-2/+2
| | | | | on the stack frame in the point/line/triangle functions. (Klaus Niederkrueger) This should solve the performance problem Karl found on Windows.
* casts to fix GLint/GLuint mismatchesBrian Paul2002-04-191-11/+12
|
* Klaus Niederkrueger's latest changes: use INIT_SPAN() to init span primitiveBrian Paul2002-04-121-4/+5
| | | | type, width, interp mask and array mask.
* sw_span can now hold x/y arrays of fragment positions - getting ready toBrian Paul2002-02-021-1/+4
| | | | | ditch the pb (pixel buffer) code. Converted point drawing, bitmaps and aa lines to use new span functions.
* Clean-up and optimize alpha test code.Brian Paul2002-01-311-345/+165
| | | | Major clean-up of pixel zoom code.
* More span improvements. Removed _mesa_write_monocolor_span().Brian Paul2002-01-281-9/+3
| | | | | Removed last of span.filled* flags and Klaus's macros. More simplification of triangle functions.
* More span clean-up, mostly texture-related.Brian Paul2002-01-281-4/+3
| | | | | _mesa_rasterize_span() is gone, replaced by new _mesa_write_textured_span(). Removed some unneeded triangle functions - more simplification possible.
* LOTS of changes, building upon Klaus's work.Brian Paul2002-01-271-66/+90
| | | | | struct sw_span is used throughout span/fragment processing. This is leading to less code and more chances for optimization.
* Klaus's latest patches and some clean-upBrian Paul2002-01-211-38/+86
|
* first checkpoint commit of Klaus's new span code (struct sw_span)Brian Paul2001-12-171-8/+8
|
* Apply antialiasing coverage factor to alpha after texture application,Brian Paul2001-05-151-5/+4
| | | | not before.
* interpolate fog valus as floats, not fixed - fixed the swrast fog problemBrian Paul2001-05-031-7/+7
|
* Consistent copyright info (version number, date) across all files.Gareth Hughes2001-03-121-9/+9
|
* lots of gl_*() to _mesa_*() namespace clean-upBrian Paul2001-03-031-19/+19
|
* Reorganized software rasterizer as a module which manages its own state,Keith Whitwell2000-11-051-1/+2
| | | | | | with tighter interfaces with the rest of the world. Proper documentation to come.
* Moved software rasterizer functionality to new directory.Keith Whitwell2000-10-311-0/+453