summaryrefslogtreecommitdiff
path: root/src/mesa/swrast
AgeCommit message (Collapse)Author
2010-01-26swrast: Implement ARB_fragment_coord_conventions but don't enable.Eric Anholt
This brings swrast's support up to the state of gallium, and fixes the default center behavior of fragment.position.xy in piglit fp-arb-fragment-coord-conventions-none. The extension is not enabled currently because the GLSL part of the extension isn't supported, so piglit glsl-arb-fragment-coord-conventions-define fails as would any serious test of the GLSL part.
2010-01-22Merge branch 'mesa_7_7_branch'Brian Paul
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
2010-01-20Merge remote branch 'origin/opengl-es-v2'Chia-I Wu
2010-01-15swrast: add missing call to _swrast_depth_bounds_test()Brian Paul
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...
2010-01-15swrast: fix broken _swrast_depth_clamp_span()Brian Paul
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.
2010-01-14Merge branch 'mesa_7_7_branch'Jakob Bornecrantz
Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
2010-01-13swrast: Remove unnecessary header from s_accum.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_atifragshader.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_bitmap.c.Vinson Lee
2010-01-13swrast: Remove unnecessary headers from s_copypix.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_depth.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_drawpix.c.Vinson Lee
2010-01-13swrast: Remove unnecessary header from s_feedback.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_fragprog.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header in s_lines.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_points.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_readpix.c.Vinson Lee
2010-01-12swrast: Remove unnecessary header from s_texcombine.c.Vinson Lee
2010-01-12Merge branch 'master' into opengl-es-v2Chia-I Wu
Conflicts: src/mesa/main/dd.h
2010-01-07swrast: fix color masking for glAccum(GL_RETURN)Brian Paul
Should fix fdo bug 25837.
2010-01-04mesa: make texture BorderColor a union of float/int/uintBrian Paul
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.
2009-12-31Merge branch 'mesa_7_7_branch'Brian Paul
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
2009-12-31swrast: add check for conditional renderingBrian Paul
2009-12-31swrast: use different temp array in _swrast_get_dest_rgba()Brian Paul
When using multiple color drawbuffers with blending/logicop/masking we were overwriting color values which we still needed.
2009-12-29mesa: implement per-buffer color maskingBrian Paul
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().
2009-12-29mesa: per-buffer blend enabled flagsBrian Paul
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.
2009-11-05mesa/main: Add more OpenGL ES types to glheader.h.Chia-I Wu
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-29mesa: Mostly fix swrast's ARB_depth_clamp support.Eric Anholt
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.
2009-10-28swrast: added bracesChia-I Wu
2009-10-28Merge branch 'texformat-rework'Brian Paul
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
2009-10-28swrast: fix RGB, RGBA texturing codeBrian Paul
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.
2009-10-28swrast: check for single texture unit in _swrast_choose_triangle()Brian Paul
2009-10-28swrast: clean up and remove dead code in triangle functionsBrian Paul
2009-10-28swrast: fix texel decoding in opt_sample_rgba_2d()Brian Paul
2009-10-08mesa: remove a bunch of gl_renderbuffer fieldsBrian Paul
_ActualFormat is replaced by Format (MESA_FORMAT_x). ColorEncoding, ComponentType, RedBits, GreenBits, BlueBits, etc. are all replaced by MESA_FORMAT_x queries.
2009-10-07Merge branch 'mesa_7_6_branch'Nicolai Hähnle
2009-10-07swrast: s/GLfloat/GLuint/ in bzero()Brian Paul
2009-10-07swrast: add missing returnsBrian Paul
2009-10-03swrast: Move up state validation in _swrast_ReadPixels.Michel Dänzer
This ensures the driver won't map the wrong set of textures.
2009-09-30swrast: fix some texformat regressionsBrian Paul
Need to be careful with component ordering for MESA_FORMAT_RGB888 and MESA_FORMAT_RGBA8888.
2009-09-30mesa: remove GLchan-based formats; use hw 8-bit/channel formats insteadBrian Paul
Removed: MESA_FORMAT_RGBA, RGB, ALPHA, LUMINANCE, LUMINANCE_ALPHA, INTENSITY.
2009-09-30mesa: replace gl_texture_format with gl_formatBrian Paul
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.
2009-09-30mesa/main: New feature FEATURE_queryobj.Chia-I Wu
It merges FEATURE_ARB_occlusion_query and FEATURE_EXT_timer_query, and follows the feature conventions.
2009-09-24Merge branch 'mesa_7_6_branch'Brian Paul
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
2009-09-24Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul
2009-09-23swrast: add lod bias when texture samplingBrian Paul
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()
2009-09-23swrast: fix typo in partial derivatives parameter passingBrian Paul
2009-09-23Merge branch 'softpipe-opt'Keith Whitwell
Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c
2009-09-21swrast: fix cube face selectionBrian Paul
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.
2009-09-21Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul