Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '7.8' | Brian Paul | 2010-04-22 | 3 | -15/+20 |
|\ | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_format.c | ||||
| * | st/mesa: add cases for MESA_FORMAT_Z24_X8, MESA_FORMAT_X8_Z24 | Brian Paul | 2010-04-22 | 1 | -0/+4 |
| | | |||||
| * | mesa: fix conversion errors in signed_rgba8888[rev] texel fetch | Brian Paul | 2010-04-22 | 1 | -8/+8 |
| | | | | | | | | | | | | Without the cast the returned texel colors were wrong. Also, we don't need the "& 0xff" part anymore. Bug found by Vinson Lee. | ||||
| * | r300: fix vertex unit setup | Alex Deucher | 2010-04-22 | 1 | -7/+8 |
| | | | | | | | | | | | | RV3xx is 2, RV560,RV570 is 8 Noticed by Tormod Volden. | ||||
* | | radeon: fix warning | Marek Olšák | 2010-04-21 | 1 | -1/+1 |
| | | |||||
* | | mesa/st: Translate a few more mesa/gallium formats. | José Fonseca | 2010-04-21 | 2 | -5/+17 |
| | | | | | | | | These endup used by Xvnc. | ||||
* | | mesa: do version checking for GL 3.x queries | Brian Paul | 2010-04-20 | 2 | -8/+74 |
| | | |||||
* | | mesa: API and state for GL 3.1 primitive restart | Brian Paul | 2010-04-20 | 6 | -0/+76 |
| | | |||||
* | | mesa: add GL 3.2 GL_CONTEXT_PROFILE_MASK query | Brian Paul | 2010-04-20 | 4 | -5/+27 |
| | | |||||
* | | mesa: remove some comments | Brian Paul | 2010-04-20 | 1 | -12/+10 |
| | | |||||
* | | intel: Add Sandybridge mobile chipset id | Zhenyu Wang | 2010-04-21 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Zhenyu Wang <[email protected]> | ||||
* | | intel: Clean up chipset name and gen num for Ironlake | Zhenyu Wang | 2010-04-21 | 24 | -148/+146 |
| | | | | | | | | | | | | | | | | | | Rename old IGDNG to Ironlake, and set 'gen' number for Ironlake as 5, so tracking the features with generation num instead of special is_ironlake flag. Reviewed-by: Eric Anholt <[email protected]> Signed-off-by: Zhenyu Wang <[email protected]> | ||||
* | | mesa: better, smaller error handling code for glGet*() | Brian Paul | 2010-04-20 | 2 | -623/+645 |
| | | | | | | | | get.o is about 17% smaller. | ||||
* | | mesa: better, smaller error handling code for glEnable/Disable/IsEnabled() | Brian Paul | 2010-04-20 | 1 | -24/+29 |
| | | | | | | | | | | Use a goto instead of replicating the _mesa_error() call many times. enable.o is about 15% smaller. | ||||
* | | mesa: raise GL_INVALID_OPERATION for glReadPixels(GL_COLOR_INDEX) | Brian Paul | 2010-04-20 | 1 | -0/+6 |
| | | | | | | | | We no longer support CI-mode color buffers so this is always an error. | ||||
* | | i915: Map sampler indices to texture units correctly for fragment shaders. | Eric Anholt | 2010-04-20 | 1 | -1/+3 |
| | | | | | | | | | | | | | | Fixes hang with "gst-launch-0.10 videotestsrc ! video/x-raw-rgb ! glupload ! gleffects effect=heat ! glimagesink" which uses 2 samplers pointing at GL_TEXTURE1 and GL_TEXTURE2, and piglit glsl-fs-sampler-numbering. | ||||
* | | i915: Add missing break; after handling the stub NOISE instructions. | Eric Anholt | 2010-04-20 | 1 | -0/+1 |
| | | | | | | | | Bug #27348 | ||||
* | | gallium: replace pipe_resource::_usage with pipe_resource::usage | Brian Paul | 2010-04-20 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'gallium-index-bias' | José Fonseca | 2010-04-20 | 2 | -7/+7 |
|\ \ | |||||
| * | | mesa/st: Update for index bias interface change. | José Fonseca | 2010-04-19 | 2 | -7/+7 |
| | | | |||||
* | | | glapi: GL 3.x xml file | Brian Paul | 2010-04-19 | 1 | -0/+581 |
| | | | | | | | | | | | | | | | Some of the entrypoints defined in other .xml files will need to be removed in favor of these... | ||||
* | | | Merge branch '7.8' | Jesse Barnes | 2010-04-19 | 6 | -13/+21 |
|\ \ \ | | |/ | |/| | |||||
| * | | st/mesa: invert scissor rect depending on FB orientation | Brian Paul | 2010-04-19 | 1 | -5/+8 |
| | | | | | | | | | | | | Fixes fd.o bug 27715 | ||||
| * | | mesa: Fix build with gcc 3.3. | Matthieu Herrb | 2010-04-19 | 2 | -3/+6 |
| | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
| * | | radeon: Let this build with gcc 3.3 | Matthieu Herrb | 2010-04-19 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | Declaring the loop index inside for () is not supported by this version. Signed-off-by: Brian Paul <[email protected]> | ||||
| * | | radeon: Fix command type for DRM_RADEON_IRQ_EMIT ioctl. | Owain Ainsworth | 2010-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This should be drmCommandWriteRead to avoid an EINVAL error on systems that strictly check ioctl args. This command has been r/w for ever. Discussion with airlied agreed that this was the correct course. Signed-off-by: Brian Paul <[email protected]> | ||||
| * | | mesa: Use __OpenBSD__ to check for OpenBSD. | Matthieu Herrb | 2010-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
* | | | mesa: unmap the immediate mode VB before destroying it | Brian Paul | 2010-04-19 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | Fixes failed assertion from fd.o bug 27713. The assertion was added with the new resource/transfer changes. This patch could apply to the 7.8 branch but it's not essential. | ||||
* | | | Merge branch '7.8' | Brian Paul | 2010-04-19 | 3 | -2/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/drivers/llvmpipe/lp_context.c | ||||
| * | | gallium/draw: use correct rasterization state for wide/AA points/lines | Brian Paul | 2010-04-19 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When points or lines are decomposed into triangles, we need to be sure to disable polygon culling, stippling, "un-filled" modes, etc. This patch sets the rasterization state to disable those things prior to drawing points/lines with triangles, then restores the previous state afterward. The new piglit point-no-line-cull test checks this problem & solution. | ||||
| * | | savage: call _mesa_meta_init/free() | Tormod Volden | 2010-04-16 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes crash when using _mesa_CopyTexImage2D. Bug #27652. Signed-off-by: Tormod Volden <[email protected]> Signed-off-by: Brian Paul <[email protected]> | ||||
* | | | r300c/r300g: add 3155 rv380 pci id | Dave Airlie | 2010-04-19 | 2 | -0/+2 |
| | | | |||||
* | | | st/mesa: s/st_get_stobj_texture/st_get_stobj_resource/ | Brian Paul | 2010-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | st/mesa: s/st_get_texobj_texture/st_get_texobj_resource/ | Brian Paul | 2010-04-18 | 3 | -4/+4 |
| | | | |||||
* | | | st/mesa: remove st_texture_object::pipe field | Brian Paul | 2010-04-18 | 8 | -14/+15 |
| | | | | | | | | | | | | | | | Just pass the pipe context to st_get_texture_sampler_view() as is done for st_get_renderbuffer_sampler_view(). | ||||
* | | | st/mesa: s/st_renderbuffer_get_sampler_view/st_get_renderbuffer_sampler_view/ | Brian Paul | 2010-04-18 | 4 | -5/+5 |
| | | | |||||
* | | | st/mesa: s/st_sampler_view_from_texture/st_create_texture_sampler_view/ | Brian Paul | 2010-04-18 | 5 | -9/+9 |
| | | | |||||
* | | | st/mesa: s/st_get_stobj_sampler_view/st_get_texture_sampler_view/ | Brian Paul | 2010-04-18 | 6 | -6/+6 |
| | | | |||||
* | | | r300/compiler: lower CEIL | Marek Olšák | 2010-04-19 | 3 | -1/+33 |
| | | | |||||
* | | | r300/compiler: enable branch emulation for vertex shaders | Marek Olšák | 2010-04-19 | 1 | -21/+22 |
| | | | |||||
* | | | r300/compiler: optimize CMP for vertex shaders a bit | Marek Olšák | 2010-04-19 | 1 | -20/+9 |
| | | | |||||
* | | | r300/compiler: Use memory_pool_array_reserve in deadcode elimination | Nicolai Hähnle | 2010-04-19 | 1 | -13/+2 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Use memory_pool_array_reserve in r500-fragprog_emit | Nicolai Hähnle | 2010-04-19 | 1 | -17/+2 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: enable branch emulation for R500 fragment programs | Marek Olšák | 2010-04-19 | 1 | -4/+13 |
| | | | |||||
* | | | r300/compiler: Implement branch emulation for R300 fragment programs | Nicolai Hähnle | 2010-04-19 | 8 | -104/+512 |
| |/ |/| | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | mesa: Restore comment too. | José Fonseca | 2010-04-18 | 2 | -2/+2 |
| | | |||||
* | | glsl: Fix handling of OPCODE_PRINT for no registers case. | Vinson Lee | 2010-04-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | A register file value is unsigned so could never be -1. A value of 0 also aliased to PROGRAM_TEMPORARY. If an OPCODE_PRINT has no registers to print, set the register file value to PROGRAM_UNDEFINED and check for that value when executing this instruction. | ||||
* | | i965: Assert that an OPCODE_IF was seen before an OPCODE_ELSE. | Vinson Lee | 2010-04-17 | 1 | -0/+1 |
| | | |||||
* | | r300/compiler: Remove unnecessary header. | Vinson Lee | 2010-04-17 | 1 | -2/+0 |
| | | |||||
* | | r300/compiler: Add radeon_program_tex.c to SCons build. | Vinson Lee | 2010-04-16 | 1 | -0/+1 |
| | | | | | | | | This was missed in commit f8a14186809356871ae74159c774e9e3959a22e5. |