summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
Commit message (Collapse)AuthorAgeFilesLines
* mesa/main: New feature FEATURE_queryobj.Chia-I Wu2009-09-301-4/+0
| | | | | It merges FEATURE_ARB_occlusion_query and FEATURE_EXT_timer_query, and follows the feature conventions.
* Merge branch 'mesa_7_6_branch'Brian Paul2009-09-241-3/+8
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/r600/r700_assembler.c src/mesa/drivers/dri/r600/r700_chip.c src/mesa/drivers/dri/r600/r700_render.c src/mesa/drivers/dri/r600/r700_vertprog.c src/mesa/drivers/dri/r600/r700_vertprog.h src/mesa/drivers/dri/radeon/radeon_span.c
| * Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-241-3/+8
| |\
| | * swrast: add lod bias when texture samplingBrian Paul2009-09-231-2/+7
| | | | | | | | | | | | | | | | | | Mostly fixes progs/demos/lodbias when MESA_TEX_PROG=1. But the LOD still seems off by -1 or so. May be an issue with the params passed to _swrast_compute_lambda()
| | * swrast: fix typo in partial derivatives parameter passingBrian Paul2009-09-231-1/+1
| | |
| * | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-211-2/+2
| |\|
| | * swrast: fix cube face selectionBrian Paul2009-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | If arx and ary are equal, we still want to choose from one of them, and not arz. This is the same as Michal's softpipe fix.
| | * swrast: fix selection/feedback regressionBrian Paul2009-08-311-1/+1
| | | | | | | | | | | | | | | This fixes a conform selection/feedback regression introduced by commit 8f4d66c5f893b49eb3973aa3b31a856314c045c7
| | * swrast: can't use deferred texture/shading if using KIL instructionBrian Paul2009-08-311-0/+3
| | | | | | | | | | | | | | | | | | If the fragment program uses KIL, we have to execute it before z/stencil testing. Otherwise, deferred texture/shading lets us skip shading for pixels that fail z/stencil testing.
* | | Merge branch 'softpipe-opt'Keith Whitwell2009-09-231-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c
| * | | mesa/swrast: use one fewer divide in swrast's choose_cube_face alsoKeith Whitwell2009-08-241-2/+6
| | | | | | | | | | | | | | | | Same change as for softpipe
* | | | swrast: fix cube face selectionBrian Paul2009-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If arx and ary are equal, we still want to choose from one of them, and not arz. This is the same as Michal's softpipe fix.
* | | | swrast: remove obsolete s_imaging.c fileBrian Paul2009-09-191-176/+0
| | | |
* | | | swrast: remove prototypes for obsolete functionsBrian Paul2009-09-191-21/+0
| | | |
* | | | mesa: move readbuffer testsBrian Paul2009-09-191-20/+0
| | | |
* | | | swrast: remove obsolete s_texstore.cBrian Paul2009-09-191-576/+0
| | | | | | | | | | | | | | | | Replaced by new, simpler meta functions.
* | | | swrast: remove prototypes for obsolete functionsBrian Paul2009-09-191-33/+0
| | | |
* | | | swrast: remove mipmap generation checks (done in core Mesa now)Brian Paul2009-09-161-25/+0
| | | |
* | | | mesa: Add support for ARB_depth_clamp.Eric Anholt2009-09-083-0/+32
| |/ / |/| | | | | | | | | | | This currently doesn't include fixing up the cliptests in the assembly paths to support ARB_depth_clamp, so enabling depth_clamp forces the C path.
* | | swrast: wrap comment to 80 columns, remove dead codeBrian Paul2009-09-031-57/+6
| | |
* | | mesa: consolidate PBO map/unmap helpersBrian Paul2009-09-033-6/+6
| | | | | | | | | | | | | | | | | | | | | Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source(). Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use _mesa_map_pbo_dest().
* | | swrast: fix selection/feedback regressionBrian Paul2009-08-311-1/+1
| | | | | | | | | | | | | | | This fixes a conform selection/feedback regression introduced by commit 8f4d66c5f893b49eb3973aa3b31a856314c045c7
* | | swrast: can't use deferred texture/shading if using KIL instructionBrian Paul2009-08-311-0/+3
| | | | | | | | | | | | | | | | | | If the fragment program uses KIL, we have to execute it before z/stencil testing. Otherwise, deferred texture/shading lets us skip shading for pixels that fail z/stencil testing.
* | | swrast: minor code consolidationBrian Paul2009-08-301-7/+2
| | |
* | | Merge branch 'mesa_7_5_branch'Brian Paul2009-08-272-7/+9
|\ \ \ | | |/ | |/|
| * | swrast: fix incorrect tri culling in selection/feedback mode.Brian Paul2009-08-272-7/+9
| | | | | | | | | | | | See bug 16866.
* | | Merge branch 'new-frag-attribs'Brian Paul2009-08-122-18/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these attributes were packed with the FOG attribute. That made things complicated elsewhere.
| * | | swrast: fix incorrect texcoord attribute testBrian Paul2009-07-311-3/+3
| | | |
| * | | mesa: add new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputsBrian Paul2009-07-292-17/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Previously, the FOGC attribute contained the fragment fog coord, front/back- face flag and the gl_PointCoord.xy values. Now each of those things are separate fragment program attributes. This simplifies quite a few things in Mesa and gallium. Need to test i965 driver and fix up point coord handling in the gallium/draw module...
* | | swrast: replace GLenum, GLint with GLbitfield for buffer varsBrian Paul2009-08-081-3/+3
| | |
* | | Merge branch 'mesa_7_5_branch'Brian Paul2009-08-051-180/+3
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: src/mesa/main/state.c
| * mesa: make _mesa_clip_blit() a shared functionBrian Paul2009-08-051-180/+3
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-161-1/+1
|\| | | | | | | | | | | Conflicts: src/mesa/main/api_validate.c
| * mesa: fix REMAINDER() macroBrian Paul2009-06-161-1/+1
| | | | | | | | | | The results were incorrect for some negative values of A. See bug 21872.
* | Merge branch 'mesa_7_5_branch'José Fonseca2009-06-111-0/+1
|\| | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_framebuffer.c
| * swrast: fix state validation bug for changing program constantsBrian Paul2009-06-101-0/+1
| | | | | | | | | | | | | | Add _NEW_PROGRAM_CONSTANTS to _SWRAST_NEW_DERIVED. This makes sure that we update the fragment shader's constants when state vars (such as point size) changes. Fixes the progs/glsl/points.c demo.
* | swrast: always do span clipping in _swrast_write_rgba_span()Brian Paul2009-06-031-14/+4
| | | | | | | | | | | | | | | | It's possible for mis-behaving vertex programs to produce vertex data with very large/NaN values. This doesn't get handled reliably by the clipper code so we may try to rasterize triangles that extend beyond the viewport/window. Always clip spans to avoid invalid memory accesses later.
* | swrast: update/restore the opt_sample_rgb/rgba_2d() functionsBrian Paul2009-05-121-15/+9
| |
* | mesa: move the NullBufferObj from GLcontext to gl_shared_stateBrian Paul2009-05-071-5/+5
|/ | | | | Since shared array objects may point to the null/default buffer object, the null/default buffer object should be part of the shared state.
* swrast: fix span clipping bugBrian Paul2009-05-072-22/+71
| | | | | If a horizontal span of pixels was located at x < 0 we could sometimes read/write outside of renderbuffer bounds.
* swrast: add missing break in clamp_rect_coord_linear()Brian Paul2009-04-281-0/+1
| | | | See bug 21461.
* swrast: simplify state update logic for fragment shader const buffersBrian Paul2009-04-211-25/+2
|
* swrast: fix pointer arithmetic error in get_texel_array()Brian Paul2009-04-201-2/+1
| | | | This came from commit 1b2ab023673261b4b942e1126c0b599d02fbd4a0
* swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT codeBrian Paul2009-04-091-7/+0
|
* swrast: fix point rendering function selectionBrian Paul2009-04-071-1/+4
| | | | | Need to clamp default point size to min/max range before checking if it's one. Fixes glean pointAtten test.
* swrast: restore !shader check around add_specular()Brian Paul2009-04-071-4/+6
| | | | Fixes a regression from commit 76ac75af8e5481b498981c133836efa2101be2dc.
* swrast: more texcombine clean-upsBrian Paul2009-04-061-21/+10
|
* swrast: asst. clean-ups in texcombine codeBrian Paul2009-04-061-26/+19
|
* swrast: fix secondary color add for glBitmapBrian Paul2009-04-063-11/+30
| | | | | Also, clean up the logic involved in choosing per-vertex vs. per-fragment primary+secondary color addition.
* swrast: fix incorrect arithmetic for GL_ADD_SIGNED/GL_COMBINE4_NV modeBrian Paul2009-04-061-6/+6
|