Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into asm-shader-rework-2 | Ian Romanick | 2009-09-10 | 286 | -9888/+17888 |
|\ | | | | | | | | | | | | | Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_parse.tab.c src/mesa/shader/program_parse.tab.h | ||||
| * | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-10 | 9 | -67/+154 |
| |\ | |||||
| | * | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Brian Paul | 2009-09-10 | 1 | -1/+3 |
| | |\ | |||||
| | | * | softpipe: minor indentation fix | Brian Paul | 2009-09-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | softpipe: set dirty_render_cache in softpipe_clear() | Brian Paul | 2009-09-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug seen when doing a glDrawPixels(GL_STENCIL_INDEX) right after a glClear(). The check-for-flush test was failing because we didn't set the dirty_render_cache flag in softpipe_clear(). So we saw stale data when we mapped the stencil buffer. | ||||
| | * | | intel: disable intel_stencil_drawpixels() for now | Brian Paul | 2009-09-10 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | It doesn't work reliably even when all the prerequisite checks are made. | ||||
| | * | | Fix merge fail | Ian Romanick | 2009-09-10 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the conflicst from this merge was missed: commit 0c309bb494b6ee1c403442d1207743f749f95b6e Merge: c6c44bf d27d659 Author: Brian Paul <[email protected]> Date: Wed Sep 9 08:33:39 2009 -0600 | ||||
| | * | | tgsi: use new tgsi_call_record to handle execution mask stacks | Brian Paul | 2009-09-10 | 2 | -14/+43 |
| | | | | | | | | | | | | | | | | This fixes some issues when "return"ing from nested loops/conditionals. | ||||
| | * | | mesa: need to set all stencil bits to 0 before setting the 1 bits | Brian Paul | 2009-09-10 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | Plus, check for pixel transfer stencil index/offset. | ||||
| | * | | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Ian Romanick | 2009-09-10 | 2 | -1/+6 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_context.c | ||||
| | | * | intel: add B43 chipset support | Zhenyu Wang | 2009-09-10 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Zhenyu Wang <[email protected]> Signed-off-by: Ian Romanick <[email protected]> Hopefully this will be one of the last cherry-picks. (cherry picked from commit ca246dd186f9590f6d67038832faceb522138c20) | ||||
| | * | | i965: Fix relocation delta for WM surfaces. | Eric Anholt | 2009-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression in 0f328c90dbc893e15005f2ab441d309c1c176245. Bug #23688 Bug #23254 (cherry picked from commit 5604b27b9326ac542069a49ed9650c4b0d3e939a) | ||||
| | * | | mesa: in texenvprogram code, only do saturation when really needed. | Brian Paul | 2009-09-10 | 1 | -8/+53 |
| | | | | | | | | | | | | | | | | | | | | For some env modes (like modulate or replace) we don't have to clamp because we know the results will be in [0,1]. | ||||
| | * | | gallium: Add PIPE_OS_APPLE back to auxiliary/util/u_time.h. | Vinson Lee | 2009-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fixes typo from commit c6c44bf48124dd5b4661014a8d58482c5a54557f. | ||||
| | * | | radeon: Change debugging code to use macros instead of inline functions. | Pauli Nieminen | 2009-09-10 | 2 | -43/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | Variadic functions can't be inlined which makes debugging to have quite large function overead. Only aleternative method is to use variadic macros which are inlined so compiler can optimize debugging to minimize overhead. | ||||
| | * | | radeon: Add more verbose error message for failed command buffer. | Pauli Nieminen | 2009-09-09 | 1 | -1/+3 |
| | | | | |||||
| * | | | st/xorg: rename ctx to pipe to match every other gallium state tracker | Zack Rusin | 2009-09-10 | 4 | -35/+35 |
| | | | | | | | | | | | | | | | | plus it avoids the "ctx->ctx->" syntax | ||||
| * | | | st/xorg: temporarily disablie copies | Zack Rusin | 2009-09-10 | 1 | -1/+2 |
| | | | | |||||
| * | | | st/xorg: implement pipelines surface/texture copies | Zack Rusin | 2009-09-10 | 2 | -7/+329 |
| | | | | |||||
| * | | | st/xorg: unite finalization and stub out pipelined copies | Zack Rusin | 2009-09-10 | 4 | -20/+50 |
| | | | | |||||
| * | | | st/xorg: abstract flushing and syncing for the exa code | Zack Rusin | 2009-09-10 | 2 | -5/+23 |
| | | | | |||||
| * | | | st/xorg: disable solid fills until copies are accelerated as well | Zack Rusin | 2009-09-10 | 2 | -1/+3 |
| | | | | |||||
| * | | | st/xorg: implement exasolids with full pipelining | Zack Rusin | 2009-09-10 | 4 | -32/+135 |
| | | | | | | | | | | | | | | | | plus fix some small issues with the shaders | ||||
| * | | | st/xorg: start adding support for surface fills | Zack Rusin | 2009-09-10 | 5 | -26/+66 |
| | | | | |||||
| * | | | nv50: Fix tiling mode for lower mipmap levels. | Marcin Kościelnicki | 2009-09-10 | 3 | -5/+8 |
| | | | | |||||
| * | | | intel: Don't forget to map the depth read buffer in spans. | Eric Anholt | 2009-09-10 | 1 | -22/+28 |
| | | | | | | | | | | | | | | | | This broke BlitFramebufferEXT(GL_DEPTH_BUFFER_BIT). | ||||
| * | | | r300: enable rb3d_discard_src_pixel_lte_threshold for more chips on dri2 | Alex Deucher | 2009-09-10 | 1 | -5/+1 |
| | | | | |||||
| * | | | r300: add full support for two sided stencil on r5xx for dri2 | Alex Deucher | 2009-09-10 | 4 | -4/+46 |
| | | | | |||||
| * | | | mesa: fix cut&paste typos | Mathias Frohlich | 2009-09-10 | 1 | -4/+4 |
| | | | | |||||
| * | | | util: Add PIPE_OS_APPLE back to auxiliary/util/u_time.h. | Vinson Lee | 2009-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fixes typo from commit c6c44bf48124dd5b4661014a8d58482c5a54557f. | ||||
| * | | | llvmpipe: Fix alpha test. | José Fonseca | 2009-09-10 | 1 | -26/+13 |
| | | | | |||||
| * | | | llvmpipe: Mask out color channels not present in the color buffer. | José Fonseca | 2009-09-10 | 1 | -5/+23 |
| | | | | |||||
| * | | | llvmpipe: Fix sampling from depth textures. Respect texture compare func. | José Fonseca | 2009-09-10 | 2 | -49/+122 |
| | | | | | | | | | | | | | | | | Fixes Mesa shadowtex sample. | ||||
| * | | | llvmpipe: Skip blending when mask is zero. | José Fonseca | 2009-09-10 | 2 | -13/+30 |
| | | | | | | | | | | | | | | | | This increases quake3 timedemo fps another 10%. | ||||
| * | | | llvmpipe: Proper control flow builders. | José Fonseca | 2009-09-10 | 3 | -60/+426 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New control flow helper functions which keep track of all variables and generate the correct Phi functions. This re-enables skipping the fs execution of quads masked out by the rasterizer, early z testing, and kill opcode. This yields a performance improvement of around 20%. | ||||
| * | | | llvmpipe: Copy the texture target into the sampler static state. | José Fonseca | 2009-09-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Hunk forgotten in previous commit. | ||||
| * | | | llvmpipe: Quick hack for 1D textures. | José Fonseca | 2009-09-09 | 2 | -0/+4 |
| | | | | |||||
| * | | | llvmpipe: Fix depth mask computation. | José Fonseca | 2009-09-09 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | Fixes depth test for 24bit depth formats. | ||||
| * | | | llvmpipe: Include zsbuf's format in the fragment shader key. | José Fonseca | 2009-09-09 | 2 | -14/+17 |
| | | | | |||||
| * | | | util: Fix depth/stencil format description. | José Fonseca | 2009-09-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | Inverse channel order. | ||||
| * | | | llvmpipe: Debug function to check stack alignment. | José Fonseca | 2009-09-09 | 3 | -4/+28 |
| | | | | | | | | | | | | | | | | | | | | Doing alignment check in locus is redundant, as gcc alignment assumptions will optimize away the check. | ||||
| * | | | i965: Fix relocation delta for WM surfaces. | Eric Anholt | 2009-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression in 0f328c90dbc893e15005f2ab441d309c1c176245. Bug #23688 Bug #23254 | ||||
| * | | | i965: fix an overlooked merge conflict | Brian Paul | 2009-09-09 | 1 | -13/+0 |
| | | | | |||||
| * | | | r600: check if textures are actually enabled before submission | Alex Deucher | 2009-09-09 | 2 | -56/+64 |
| | | | | | | | | | | | | | | | | noticed by taiu on IRC. | ||||
| * | | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-09 | 16 | -23/+59 |
| |\| | | |||||
| | * | | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Brian Paul | 2009-09-09 | 6 | -3/+24 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile configs/default progs/glsl/Makefile src/gallium/auxiliary/util/u_simple_shaders.c src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/i965/brw_draw_upload.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/intel/intel_context.h src/mesa/drivers/dri/intel/intel_pixel.c src/mesa/drivers/dri/intel/intel_pixel_read.c src/mesa/main/texenvprogram.c src/mesa/main/version.h | ||||
| | | * | mesa: bump version to 7.5.2 | Brian Paul | 2009-09-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | I'm not 100% sure there'll be a 7.5.2 release, but just in case. | ||||
| | | * | i965: fix incorrect test for vertex position attribute | Brian Paul | 2009-09-08 | 3 | -1/+4 |
| | | | | |||||
| | | * | i965: Fix warnings in intel_pixel_read.c. | Eric Anholt | 2009-09-04 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | (cherry picked from commit c80ce5ac90b1e0ac7a72cd41c314aa2000bfecf5) | ||||
| | | * | intel: Also get the DRI2 front buffer when doing front buffer reading. | Eric Anholt | 2009-09-04 | 4 | -1/+29 |
| | | | | | | | | | | | | | | | | (cherry picked from commit df70d3049a396af3601d2a1747770635a74120bb) |