summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-222-14/+34
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
| * swrast: add missing call to _swrast_depth_bounds_test()Brian Paul2010-01-151-0/+7
| | | | | | | | | | | | | | | | We were calling this from the CI span function, but not the RGBA span function. I don't know of a test program for the GL_EXT_depth_bounds_test extension...
| * swrast: fix broken _swrast_depth_clamp_span()Brian Paul2010-01-151-14/+27
| | | | | | | | | | | | | | | | | | | | The integer Z clamping range depends on the number of bits in the Z buffer because that's the scale factor used when we transform NDC coords by the viewport/depth range. Fixes fd.o bug #25972 but only for Z buffers up to a depth of 30 bits. Beyond that we get into messy integer overflow issues and things fall apart.
* | Merge remote branch 'origin/opengl-es-v2'Chia-I Wu2010-01-201-6/+0
|\ \
| * \ Merge branch 'master' into opengl-es-v2Chia-I Wu2010-01-1215-104/+140
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h
| * | | mesa/main: Add more OpenGL ES types to glheader.h.Chia-I Wu2009-11-051-6/+0
| | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]>
* | | | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2010-01-1412-13/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
| * | swrast: Remove unnecessary header from s_accum.c.Vinson Lee2010-01-131-1/+0
| | |
| * | swrast: Remove unnecessary header from s_atifragshader.c.Vinson Lee2010-01-131-1/+0
| | |
| * | swrast: Remove unnecessary header from s_bitmap.c.Vinson Lee2010-01-131-1/+0
| | |
| * | swrast: Remove unnecessary headers from s_copypix.c.Vinson Lee2010-01-131-2/+0
| | |
| * | swrast: Remove unnecessary header from s_depth.c.Vinson Lee2010-01-131-1/+0
| | |
| * | swrast: Remove unnecessary header from s_drawpix.c.Vinson Lee2010-01-131-1/+0
| | |
| * | swrast: Remove unnecessary header from s_feedback.c.Vinson Lee2010-01-131-1/+0
| | |
| * | swrast: Remove unnecessary header from s_fragprog.c.Vinson Lee2010-01-121-1/+0
| | |
| * | swrast: Remove unnecessary header in s_lines.c.Vinson Lee2010-01-121-1/+0
| | |
| * | swrast: Remove unnecessary header from s_points.c.Vinson Lee2010-01-121-1/+0
| | |
| * | swrast: Remove unnecessary header from s_readpix.c.Vinson Lee2010-01-121-1/+0
| | |
| * | swrast: Remove unnecessary header from s_texcombine.c.Vinson Lee2010-01-121-1/+0
| | |
* | | swrast: fix color masking for glAccum(GL_RETURN)Brian Paul2010-01-071-4/+4
| | | | | | | | | | | | Should fix fdo bug 25837.
* | | mesa: make texture BorderColor a union of float/int/uintBrian Paul2010-01-041-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | When we have integer-valued texture formats, the texture border color must also store integer and uint values. With GL 3.0, the new glTexParameterIiv() and glTexParameterIuiv() functions can set the border color to int or uint values.
* | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-311-7/+3
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
| * | swrast: use different temp array in _swrast_get_dest_rgba()Brian Paul2009-12-311-7/+3
| | | | | | | | | | | | | | | When using multiple color drawbuffers with blending/logicop/masking we were overwriting color values which we still needed.
* | | swrast: add check for conditional renderingBrian Paul2009-12-315-0/+20
| | |
* | | mesa: implement per-buffer color maskingBrian Paul2009-12-297-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of the GL_EXT_draw_buffers2 extension and part of GL 3.0. The ctx->Color.ColorMask field is now a 2-D array. Until drivers are modified to support per-buffer color masking, they can just look at the 0th color mask. The new _mesa_ColorMaskIndexed() function will be called by glColorMaskIndexedEXT() or glColorMaski().
* | | mesa: per-buffer blend enabled flagsBrian Paul2009-12-291-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ctx->Color.BlendEnabled is now a GLbitfield instead of a GLboolean to indicate blend on/off status for each color/draw buffer. This is infrastructure for GL_EXT_draw_buffers2 and OpenGL 3.x New functions include _mesa_EnableIndexed(), _mesa_DisableIndexed(), and _mesa_IsEnabledIndexed(). The enable function corresponds to glEnableIndexedEXT() for GL_EXT_draw_buffers2 or glEnablei() for GL3. Note that there's quite a few tests for ctx->Color.BlendEnabled != 0 in drivers, etc. Those tests can remain as-is since the mask will be 0 or ~0 unless GL_EXT_draw_buffers2 is enabled.
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-152-1/+7
|\ \ | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
| * | swrast: Silence uninitialized variable warnings in s_triangle.cVinson Lee2009-12-121-0/+6
| | |
| * | swrast: Initialize tex_coords in handle_sample_op.Vinson Lee2009-12-121-1/+1
| | |
* | | 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
| |\
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 21:41:10 +0000