summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'outputswritten64'Ian Romanick2009-11-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add a GLbitfield64 type and several macros to operate on 64-bit fields. The OutputsWritten field of gl_program is changed to use that type. This results in a fair amount of fallout in drivers that use programs. No changes are strictly necessary at this point as all bits used are below the 32-bit boundary. Fairly soon several bits will be added for clip distances written by a vertex shader. This will cause several bits used for varyings to be pushed above the 32-bit boundary. This will affect any drivers that support GLSL. At this point, only the i965 driver has been modified to support this eventuality. I did this as a "squash" merge. There were several places through the outputswritten64 branch where things were broken. I foresee this causing difficulties later for bisecting. The history is still available in the branch. Conflicts: src/mesa/drivers/dri/i965/brw_wm.h
* swrast: handle additional Z24 formats in read_depth_pixels()Brian Paul2009-11-111-5/+18
|
* swrast: update renderbuffer format assertionsbrian2009-11-101-3/+4
|
* mesa: Mostly fix swrast's ARB_depth_clamp support.Eric Anholt2009-10-292-12/+26
| | | | | | | I'd written a testcase for the hard part of the extension enablement, so naturally the easy stuff was completely broken. There are still issues, as I'm seeing FLOAT_TO_UINT(max_f) == 0x0 when max_f == 1.0, but it gets piglit depth-clamp-range closer to success.
* swrast: added bracesChia-I Wu2009-10-281-2/+4
|
* Merge branch 'texformat-rework'Brian Paul2009-10-284-130/+138
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/radeon/radeon_fbo.c src/mesa/drivers/dri/s3v/s3v_tex.c src/mesa/drivers/dri/s3v/s3v_xmesa.c src/mesa/drivers/dri/trident/trident_context.c src/mesa/main/debug.c src/mesa/main/mipmap.c src/mesa/main/texformat.c src/mesa/main/texgetimage.c
| * swrast: fix RGB, RGBA texturing codeBrian Paul2009-10-281-5/+11
| | | | | | | | | | | | Fix backward component ordering for RGB textures. Only optimize RGBA texture case if running little endian. This restriction could be lifted with a little work.
| * swrast: check for single texture unit in _swrast_choose_triangle()Brian Paul2009-10-281-0/+1
| |
| * swrast: clean up and remove dead code in triangle functionsBrian Paul2009-10-281-57/+47
| |
| * swrast: fix texel decoding in opt_sample_rgba_2d()Brian Paul2009-10-281-5/+5
| |
| * mesa: remove a bunch of gl_renderbuffer fieldsBrian Paul2009-10-083-10/+13
| | | | | | | | | | | | _ActualFormat is replaced by Format (MESA_FORMAT_x). ColorEncoding, ComponentType, RedBits, GreenBits, BlueBits, etc. are all replaced by MESA_FORMAT_x queries.
| * swrast: fix some texformat regressionsBrian Paul2009-09-302-41/+49
| | | | | | | | | | Need to be careful with component ordering for MESA_FORMAT_RGB888 and MESA_FORMAT_RGBA8888.
| * mesa: remove GLchan-based formats; use hw 8-bit/channel formats insteadBrian Paul2009-09-302-24/+24
| | | | | | | | Removed: MESA_FORMAT_RGBA, RGB, ALPHA, LUMINANCE, LUMINANCE_ALPHA, INTENSITY.
| * mesa: replace gl_texture_format with gl_formatBrian Paul2009-09-302-16/+16
| | | | | | | | | | | | Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum. ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x. gl_texture_format will go away next.
* | Merge branch 'mesa_7_6_branch'Nicolai Hähnle2009-10-071-1/+3
|\ \
| * | swrast: s/GLfloat/GLuint/ in bzero()Brian Paul2009-10-071-1/+1
| | |
| * | swrast: add missing returnsBrian Paul2009-10-071-0/+2
| | |
* | | swrast: Move up state validation in _swrast_ReadPixels.Michel Dänzer2009-10-031-3/+3
| | | | | | | | | | | | This ensures the driver won't map the wrong set of textures.
* | | 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
| |