Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Brian Paul | 2009-09-24 | 1 | -3/+8 |
|\ | |||||
| * | swrast: add lod bias when texture sampling | Brian Paul | 2009-09-23 | 1 | -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 passing | Brian Paul | 2009-09-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Brian Paul | 2009-09-21 | 1 | -2/+2 |
|\| | |||||
| * | swrast: fix cube face selection | Brian Paul | 2009-09-21 | 1 | -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 regression | Brian Paul | 2009-08-31 | 1 | -1/+1 |
| | | | | | | | | | | This fixes a conform selection/feedback regression introduced by commit 8f4d66c5f893b49eb3973aa3b31a856314c045c7 | ||||
| * | swrast: can't use deferred texture/shading if using KIL instruction | Brian Paul | 2009-08-31 | 1 | -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: wrap comment to 80 columns, remove dead code | Brian Paul | 2009-09-03 | 1 | -57/+6 |
| | | |||||
* | | mesa: consolidate PBO map/unmap helpers | Brian Paul | 2009-09-03 | 3 | -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 regression | Brian Paul | 2009-08-31 | 1 | -1/+1 |
| | | | | | | | | | | This fixes a conform selection/feedback regression introduced by commit 8f4d66c5f893b49eb3973aa3b31a856314c045c7 | ||||
* | | swrast: can't use deferred texture/shading if using KIL instruction | Brian Paul | 2009-08-31 | 1 | -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 consolidation | Brian Paul | 2009-08-30 | 1 | -7/+2 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-27 | 2 | -7/+9 |
|\| | |||||
| * | swrast: fix incorrect tri culling in selection/feedback mode. | Brian Paul | 2009-08-27 | 2 | -7/+9 |
| | | | | | | | | See bug 16866. | ||||
* | | Merge branch 'new-frag-attribs' | Brian Paul | 2009-08-12 | 2 | -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 test | Brian Paul | 2009-07-31 | 1 | -3/+3 |
| | | | |||||
| * | | mesa: add new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs | Brian Paul | 2009-07-29 | 2 | -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 vars | Brian Paul | 2009-08-08 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-05 | 1 | -180/+3 |
|\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: src/mesa/main/state.c | ||||
| * | mesa: make _mesa_clip_blit() a shared function | Brian Paul | 2009-08-05 | 1 | -180/+3 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-16 | 1 | -1/+1 |
|\| | | | | | | | | | | | Conflicts: src/mesa/main/api_validate.c | ||||
| * | mesa: fix REMAINDER() macro | Brian Paul | 2009-06-16 | 1 | -1/+1 |
| | | | | | | | | | | The results were incorrect for some negative values of A. See bug 21872. | ||||
* | | Merge branch 'mesa_7_5_branch' | José Fonseca | 2009-06-11 | 1 | -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 constants | Brian Paul | 2009-06-10 | 1 | -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 Paul | 2009-06-03 | 1 | -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() functions | Brian Paul | 2009-05-12 | 1 | -15/+9 |
| | | |||||
* | | mesa: move the NullBufferObj from GLcontext to gl_shared_state | Brian Paul | 2009-05-07 | 1 | -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 bug | Brian Paul | 2009-05-07 | 2 | -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 Paul | 2009-04-28 | 1 | -0/+1 |
| | | | | See bug 21461. | ||||
* | swrast: simplify state update logic for fragment shader const buffers | Brian Paul | 2009-04-21 | 1 | -25/+2 |
| | |||||
* | swrast: fix pointer arithmetic error in get_texel_array() | Brian Paul | 2009-04-20 | 1 | -2/+1 |
| | | | | This came from commit 1b2ab023673261b4b942e1126c0b599d02fbd4a0 | ||||
* | swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code | Brian Paul | 2009-04-09 | 1 | -7/+0 |
| | |||||
* | swrast: fix point rendering function selection | Brian Paul | 2009-04-07 | 1 | -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 Paul | 2009-04-07 | 1 | -4/+6 |
| | | | | Fixes a regression from commit 76ac75af8e5481b498981c133836efa2101be2dc. | ||||
* | swrast: more texcombine clean-ups | Brian Paul | 2009-04-06 | 1 | -21/+10 |
| | |||||
* | swrast: asst. clean-ups in texcombine code | Brian Paul | 2009-04-06 | 1 | -26/+19 |
| | |||||
* | swrast: fix secondary color add for glBitmap | Brian Paul | 2009-04-06 | 3 | -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 mode | Brian Paul | 2009-04-06 | 1 | -6/+6 |
| | |||||
* | swrast: fix texture border color interpretation | Brian Paul | 2009-04-06 | 1 | -30/+68 |
| | | | | | | | The texture border color must be interpreted according to the texture's base format. For example, for a GL_ALPHA texture, sampling the border color should return (0,0,0,borderAlpha). This wasn't an issue here until I removed the legacy texenv code (we always use the combiner path now). | ||||
* | mesa: remove the noClamp parameter to _mesa_pack_rgba_span_float() | Brian Paul | 2009-04-03 | 1 | -2/+2 |
| | | | | | It was only set to GL_TRUE in one place where it isn't really needed (glGetTexImage(sRGB format)). | ||||
* | swrast: remove unused integer lerp functions | Brian Paul | 2009-04-01 | 1 | -43/+1 |
| | |||||
* | swrast: remove old texture_apply() code; always use texture combine code | Brian Paul | 2009-04-01 | 3 | -403/+22 |
| | |||||
* | swrast: fix bad optimization check | Brian Paul | 2009-04-01 | 1 | -1/+2 |
| | |||||
* | swrast: remove unused parameter | Brian Paul | 2009-04-01 | 1 | -6/+1 |
| | |||||
* | swrast: minor improvements, clean-ups in texcombine code | Brian Paul | 2009-04-01 | 1 | -9/+8 |
| | |||||
* | swrast: use float4_array typedef to simplify the code a bit | Brian Paul | 2009-04-01 | 1 | -54/+71 |
| | |||||
* | mesa: texture combine clean-ups | Brian Paul | 2009-04-01 | 2 | -74/+68 |
| | | | | | | Use MAX_COMBINER_TERMS instead of 4. Rename some vars. Update comments. | ||||
* | swrast: refactor depth/shadow sampling code | Brian Paul | 2009-04-01 | 1 | -262/+271 |
| | |||||
* | swrast: general clean-up of texture combine code | Brian Paul | 2009-04-01 | 1 | -246/+161 |
| | |||||
* | swrast: do texture sampling/combining in floating point | Brian Paul | 2009-04-01 | 6 | -764/+511 |
| | | | | | The code's cleaner and a step toward supporting float-valued texture sampling. Some optimizations for common cases can be added and re-enabled... |