summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* swrast: fix texture border color interpretationBrian Paul2009-04-061-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 Paul2009-04-031-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 functionsBrian Paul2009-04-011-43/+1
|
* swrast: remove old texture_apply() code; always use texture combine codeBrian Paul2009-04-013-403/+22
|
* swrast: fix bad optimization checkBrian Paul2009-04-011-1/+2
|
* swrast: remove unused parameterBrian Paul2009-04-011-6/+1
|
* swrast: minor improvements, clean-ups in texcombine codeBrian Paul2009-04-011-9/+8
|
* swrast: use float4_array typedef to simplify the code a bitBrian Paul2009-04-011-54/+71
|
* mesa: texture combine clean-upsBrian Paul2009-04-012-74/+68
| | | | | | Use MAX_COMBINER_TERMS instead of 4. Rename some vars. Update comments.
* swrast: refactor depth/shadow sampling codeBrian Paul2009-04-011-262/+271
|
* swrast: general clean-up of texture combine codeBrian Paul2009-04-011-246/+161
|
* swrast: do texture sampling/combining in floating pointBrian Paul2009-04-016-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...
* swrast: fix glDrawBuffer(GL_FRONT_AND_BACK)Brian Paul2009-04-011-2/+8
| | | | We weren't putting the right colors into the back buffer in this mode.
* mesa: add new signed rgba texture formatRoland Scheidegger2009-03-281-2/+2
| | | | | This is a (partial) backport of the signed texture format support in OGL 3.1. Since it wasn't promoted from an existing extension roll our own.
* swrast: use better _swrast_compute_lambda() functionBrian Paul2009-03-171-6/+6
| | | | | | | | | | The MAX-based function can produce values that are non-monotonic for a span which causes glitches in texture filtering. The sqrt-based one avoids that. This is perhaps slightly slower than before, but the difference probably isn't noticable given we're doing software mipmap filtering. Issue reported by Nir Radian <[email protected]>
* mesa: add support for ATI_envmap_bumpmapRoland Scheidegger2009-03-121-1/+94
| | | | | | | | add new entrypoints, new texture format, etc translate in texenvprogram.c for drivers using the mesa-generated tex env fragment program also handled in swrast, but not tested (cannot work due to negative texel results not handled correctly)
* mesa: remove some last remnants of GL_MESA_program_debugBrian Paul2009-03-112-8/+0
|
* mesa: remove gl_texture_object::_Function field and associated codeBrian Paul2009-03-111-1/+3
| | | | It was only used in one place in swrast.
* swrast: remove old commentBrian Paul2009-03-071-2/+0
|
* swrast: rename s_buffers.c -> s_clear.cBrian Paul2009-03-071-0/+0
|
* mesa: remove GL_MESA_program_debug extensionBrian Paul2009-03-071-6/+0
| | | | This was never fully fleshed out and hasn't been used.
* mesa: use Stencil._Enabled field instead of Stencil.EnabledBrian Paul2009-03-023-6/+6
|
* swrast: use _EnabledCoordUnits for fixed-function texturingBrian Paul2009-03-022-8/+8
| | | | | | | Using _EnabledUnits was wrong because it included vertex texture units. This change plus the prev commit fixes occasional failures of glean/glsl1 vertex texture test failure.
* mesa: remove unused AUX buffersBrian Paul2009-03-021-4/+1
| | | | | | Remove all references to aux buffers 1..3. Keep AUX0 around for now just in case, but it'll probably go too someday. I don't know of any OpenGL drivers since the IRIX days that support aux color buffers.
* mesa: rename, reorder FRAG_RESULT_x tokensBrian Paul2009-02-282-7/+7
| | | | | | | s/FRAG_RESULT_DEPR/FRAG_RESULT_DEPTH/ s/FRAG_RESULT_COLR/FRAG_RESULT/COLOR/ Remove FRAG_RESULT_COLH (NV half-precision) output since we never used it. Next, we might merge the COLOR and DATA outputs (COLOR0, COLOR1, etc).
* mesa: move GLfixed type and related macros to swrast moduleBrian Paul2009-02-282-0/+34
| | | | Fixed point is only used in swrast and sw-based drivers.
* mesa: replace FEEDBACK_TOKEN macro with _mesa_feedback_token() inline functionBrian Paul2009-02-281-4/+4
|
* mesa: use an array for current texture objectsBrian Paul2009-02-211-5/+10
| | | | Use loops to consolidate lots of texture object code.
* swrast: Set vp_override flag during DrawPixelsNicolai Haehnle2009-02-181-0/+11
| | | | | | | | | Obviously, the color of fragments produced by DrawPixels is not constant, even if the current vertex array / vertex program state indicates that the color for normal rendering will be constant. Therefore, we need to override certain optimisations that have been added to texenvprogram.c Signed-off-by: Nicolai Haehnle <[email protected]>
* Merge commit 'origin/gallium-master-merge'Brian Paul2009-02-102-1/+4
|\ | | | | | | | | | | | | | | | | | | | | | | This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c
| * swrast: fix typo: s/drapix/drawpix/Brian Paul2009-02-091-1/+1
| |
| * mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-091-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
| | * Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-223-1/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
| | * | mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.Eric Anholt2009-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a note in state.c about _Active deserving to die, and there were potential issues with it due to i965 forgetting to set _UseTexEnvProgram. Removing both simplifies things. Reviewed-by: Brian Paul <[email protected]>