summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-251-6/+11
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c
| * st/mesa: fix int->uint conversion for negative scissor bound valuesBrian Paul2010-01-241-4/+9
| | | | | | | | | | | | | | | | | | | | Based on a patch by Xavier Chantry <[email protected]>: If x+width or y+height is negative, then maxx or maxy will get a bogus value when converting that to unsigned. Fix this by setting 0 as minimal value. This was also triggered by teeworlds, but only with some combination of resolution and map section. For example upper part of dm2 at 1280x1024.
| * st/mesa: fix unsigned/signed breakage in scissorXavier Chantry2010-01-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 53174afeeb introduced a portability change that converted GLint x,y to GLuint. That breaks when x and y are negative, which seems to be allowed, and which at least one game uses : teeworlds. Rather than simply reverting the change, it seems possible to convert the 16bit unsigned to GLint so that comparisons are made between signed integers instead. This hopefully does not break anything while keeping MSVC happy. Signed-off-by: Xavier Chantry <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* | Fix compressed texture loads for non-minimal pitches againLuca Barbieri2010-01-251-2/+4
| | | | | | | | | | | | | | | | My commit eea6a7639f767b1d30b6ef1f91a9c49e3f3b78f0 does a memcpy of height lines, but that's wrong because the texture has a block layout and we must thus use the number of vertical blocks instead of the height. Signed-off-by: Brian Paul <[email protected]>
* | st/mesa: fix incorrect freeing of drawpixels vertex shadersBrian Paul2010-01-222-3/+5
| | | | | | | | | | These shaders are not st_vertex_shaders, but tgsi ureg shaders. Fixes fd.o bug 25959.
* | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-2225-76/+66
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * st/mesa: Remove unnecessary header from st_cb_viewport.c.Vinson Lee2010-01-211-1/+0
| |
| * mesa: Use pipe_buffer_write_nooverlap where appropriate.José Fonseca2010-01-213-9/+19
| |
| * st/mesa: fix format logic in compatible_src_dst_formats()Brian Paul2010-01-201-12/+44
| | | | | | | | | | We need to consider the user-requested formats, not the actual device- chosen formats. See code comments for more details.
| * st/dri: update dri2 drawables when viewport is changedBen Skeggs2010-01-191-2/+2
| | | | | | | | | | | | | | Fixes gnome-shell on nouveau, as well as window resize with various other applications. Signed-off-by: Ben Skeggs <[email protected]>
| * mesa: Handle PIPE_FORMAT_B8G8R8X8_UNORM.José Fonseca2010-01-181-0/+2
| |
| * st/mesa: change instruction count assertion to > 0Brian Paul2010-01-181-1/+1
| | | | | | | | Shaders should at least have an END instruction.
| * st/mesa: Remove unnecessary header from st_cb_drawpixels.c.Vinson Lee2010-01-161-1/+0
| |
| * st/mesa: Remove unnecessary header from st_atom_framebuffer.c.Vinson Lee2010-01-161-1/+0
| |
| * st/mesa: Remove unnecessary header from st_atom_pixeltransfer.c.Vinson Lee2010-01-161-1/+0
| |
| * st/mesa: Remove unnecessary header from st_atom_sampler.c.Vinson Lee2010-01-161-1/+0
| |
| * st/mesa: Remove unnecessary header from st_atom_shader.c.Vinson Lee2010-01-161-1/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_accum.c.Vinson Lee2010-01-161-2/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_bitmap.c.Vinson Lee2010-01-161-5/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_blit.c.Vinson Lee2010-01-151-4/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_clear.c.Vinson Lee2010-01-151-3/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_drawpixels.c.Vinson Lee2010-01-151-5/+0
| |
| * st/mesa: Remove unnecessary header from st_cb_fbo.c.Vinson Lee2010-01-151-1/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_feedback.c.Vinson Lee2010-01-151-3/+0
| |
| * st/mesa: Remove unnecessary header from st_cb_program.c.Vinson Lee2010-01-151-1/+0
| |
| * st/mesa: Remove unnecessary header from st_cb_queryobj.c.Vinson Lee2010-01-151-1/+0
| |
| * st/mesa: Remove unnecessary header from st_cb_rasterpos.c.Vinson Lee2010-01-141-1/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_readpixels.c.Vinson Lee2010-01-141-2/+0
| |
| * st/mesa: Remove unnecessary header from st_cb_strings.c.Vinson Lee2010-01-141-1/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_texture.c.Vinson Lee2010-01-141-2/+0
| |
| * st/mesa: Remove unnecessary headers from st_cb_viewport.c.Vinson Lee2010-01-141-2/+0
| |
| * st/mesa: Remove unnecessary headers from st_context.c.Vinson Lee2010-01-141-6/+0
| |
| * st/mesa: Remove unnecessary header from st_draw_feedback.c.Vinson Lee2010-01-141-1/+0
| |
| * st/mesa: Remove unnecessary header from st_extensions.c.Vinson Lee2010-01-141-1/+0
| |
| * st/mesa: Remove unnecessary header from st_format.c.Vinson Lee2010-01-141-1/+0
| |
| * st/mesa: Remove unnecessary headers from st_framebuffer.c.Vinson Lee2010-01-141-4/+0
| |
| * st/mesa: Remove unnecessary headers from st_gen_mipmap.c.Vinson Lee2010-01-141-2/+0
| |
* | Merge remote branch 'origin/opengl-es-v2'Chia-I Wu2010-01-202-2/+11
|\ \
| * \ Merge branch 'master' into opengl-es-v2Chia-I Wu2010-01-1238-1165/+1019
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h
| * | | mesa/es: Add support for GL_OES_draw_texture.Chia-I Wu2009-11-052-2/+11
| | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]>
* | | | st/mesa: enable EXT_framebuffer_multisampleMarek Olšák2010-01-191-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]>
* | | | st/mesa: updated comments and whitespaceBrian Paul2010-01-181-1/+7
| | | |
* | | | st/mesa: fix memory leak in st_translate_mesa_programMarcin Slusarz2010-01-181-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]>
* | | | Merge branch 'gallium-noconstbuf'Roland Scheidegger2010-01-154-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_draw_arrays.c src/mesa/state_tracker/st_draw_feedback.c
| * | | | gallium: adapt state trackers etc. to pipe_constant_buffer removalRoland Scheidegger2009-12-234-12/+12
| | | | |
* | | | | st/mesa: Initialise vertex element instance divisor to 0.Michal Krol2010-01-152-0/+3
| | | | |
* | | | | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2010-01-142-2/+0
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
| * | | | st/mesa: Remove unnecessary header from st_program.c.Vinson Lee2010-01-131-1/+0
| | | | |
| * | | | st/mesa: Remove unnecessary header from st_texture.c.Vinson Lee2010-01-131-1/+0
| | | | |
* | | | | st/mesa: removed unused varBrian Paul2010-01-111-2/+0
| | | | |