summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_6_branch'Brian Paul2009-09-241-3/+9
|\ | | | | | | | | | | | | | | | | | | | | 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/+9
| |\
| | * st/mesa: trim calculated userbuffer sizeKeith Whitwell2009-09-231-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In get_array_bounds we were previously defining a user buffer sized as (nr_vertices * stride). The trouble is that if the vertex data occupies less than stride bytes, the extra tailing (stride - size) bytes may extend outside the memory actually allocated by the app and caused a segfault. To fix this, define a the buffer bounds to be: ptr .. ptr + (nr-1)*stride + element_size
* | | mesa: Ensure TGSI tokens are freed with gallium's free.José Fonseca2009-09-214-5/+20
| | | | | | | | | | | | To avoid breaking the gallium's builtin malloc debugging.
* | | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-203-8/+29
|\| | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_clear.c
| * | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchNicolai Hähnle2009-09-202-5/+14
| |\|
| | * mesa/st: Initialize format bits of framebuffer renderbuffersNicolai Hähnle2009-09-201-0/+1
| | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]>
| | * st/mesa: fix some incorrect branching/clean-up code in TexImage functionsBrian Paul2009-09-161-3/+3
| | | | | | | | | | | | | | | We need to be sure to call the _mesa_unmap_teximage_pbo() function if we called _mesa_validate_pbo_teximage().
| | * st/mesa: fix texture memory allocation bugBrian Paul2009-09-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following example caused an incorrect GL_OUT_OF_MEMORY error to be raised in glTexSubImage2D: glTexImage2D(level=0, width=32, height=32, pixels=NULL); glTexImage2D(level=0, width=64, height=64, pixels=NULL); glTexSubImage2D(level=0, pixels!=NULL); The second glTexImage2D() call needs to cause the first image to be deallocated then reallocated at the new size. This was not happening because we were testing for pixels==NULL too early.
| | * st/mesa: silence uninitialized var warningsBrian Paul2009-09-031-2/+2
| | |
| | * st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted positionBrian Paul2009-09-031-0/+4
| | | | | | | | | | | | | | | If the renderbuffer orientation is Y=0=TOP we need to invert the dstY position.
| | * st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardwareKeith Whitwell2009-09-021-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State tracker currently backs GL_RGB textures with RGBA almost always. This means we need to maintain A==1 in these textures to give correct GL_RGB sampling results. This change offloads the RGBA->RGB copy to hardware using the new writemask version of u_blit_pixels. More src/dstLogical/dstActual triples could be shifted to hardware by this technique in future patches.
| | * st/mesa: flush bitmap cache if Z value changesBrian Paul2009-08-211-5/+11
| | | | | | | | | | | | | | | | | | | | | When adding a new bitmap to the cache we have to check if the Z value is changing and flush first if it is. This is a modified version of a patch from Justin Dou <[email protected]>
| * | mesa/st: Create front renderbuffer on the fly when supplied with a surfaceNicolai Hähnle2009-09-201-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, the mesa/st would create a fake front buffer out of a client-allocated surface. In the DRI setting, however, st/dri provides a front buffer surface which is created and maintained by the X server. Prefer to use this surface instead, so that front buffer rendering and reading works correctly. Signed-off-by: Nicolai Hähnle <[email protected]>
* | | mesa: Allow BlitFramebuffer from a texture.José Fonseca2009-09-191-11/+45
| | | | | | | | | | | | | | | Although GL_EXT_framebuffer_blit does not mention textures, it doesn't forbid them either, and some thirdparty driver appear to support this.
* | | mesa: move generate mipmap callsBrian Paul2009-09-151-12/+0
| | | | | | | | | | | | | | | | | | Per the suggestion in the Intel driver, move the calls to ctx->Driver.GenerateMipmap() into core Mesa so that drivers don't have to worry about it.
* | | st/mesa: disable accidentally committed _mesa_print_program() callBrian Paul2009-09-151-1/+1
| | |
* | | st/mesa: minor whitespace, comment clean-upsBrian Paul2009-09-141-21/+9
| | |
* | | mesa/st: remove dead commentKeith Whitwell2009-09-141-7/+0
| | |
* | | st/mesa: convert to new tgsi_ureg mechanism for shader emitKeith Whitwell2009-09-143-983/+625
| | | | | | | | | | | | | | | | | | | | | | | | | | | Should be easier to read and work with than the older ways of emitting TGSI tokens. Also, emit simpler TGSI than previously: - translate away source and dest extended modifiers - translate away the SWZ opcode
* | | mesa: remove unused SATURATE_PLUS_MINUS_ONE flagKeith Whitwell2009-09-121-2/+0
| | | | | | | | | | | | Never set in mesa. Remove from tgsi translation as well.
* | | st/mesa: use st_context() helperBrian Paul2009-09-101-17/+17
|/ /
* | st/mesa: silence uninitialized var warningsBrian Paul2009-09-031-2/+2
| |
* | st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted positionBrian Paul2009-09-031-0/+4
| | | | | | | | | | If the renderbuffer orientation is Y=0=TOP we need to invert the dstY position.
* | st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardwareKeith Whitwell2009-09-031-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | State tracker currently backs GL_RGB textures with RGBA almost always. This means we need to maintain A==1 in these textures to give correct GL_RGB sampling results. This change offloads the RGBA->RGB copy to hardware using the new writemask version of u_blit_pixels. More src/dstLogical/dstActual triples could be shifted to hardware by this technique in future patches.
* | mesa: consolidate PBO map/unmap helpersBrian Paul2009-09-034-13/+13
| | | | | | | | | | | | | | Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source(). Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use _mesa_map_pbo_dest().
* | mesa: change ctx->Driver.BufferData() to return GLboolean for success/failureBrian Paul2009-09-031-4/+5
| | | | | | | | | | Return GL_FALSE if we failed to allocate the buffer. Then raise GL_OUT_OF_MEMORY in core Mesa.
* | st/mesa: use new _mesa_expand_bitmap() functionBrian Paul2009-09-011-57/+4
| |
* | st/mesa: fix obj->Pointer offset in st_bufferobj_map_range()Brian Paul2009-08-311-5/+5
| | | | | | | | | | This fixes a bunch of gallium regressions since commit 8096aa521369c3bcf5226c060efa6dd06e48ddc8
* | st/mesa: flush bitmap cache if Z value changesBrian Paul2009-08-241-5/+11
| | | | | | | | | | | | | | When adding a new bitmap to the cache we have to check if the Z value is changing and flush first if it is. This is a modified version of a patch from Justin Dou <[email protected]>
* | gallium: rename copy/fill_rect utility functionsBrian Paul2009-08-191-1/+1
| |
* | Merge branch 'new-frag-attribs'Brian Paul2009-08-123-66/+14
|\ \ | | | | | | | | | | | | | | | | | | This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these attributes were packed with the FOG attribute. That made things complicated elsewhere.
| * | mesa: add new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment program inputsBrian Paul2009-07-293-66/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the FOGC attribute contained the fragment fog coord, front/back- face flag and the gl_PointCoord.xy values. Now each of those things are separate fragment program attributes. This simplifies quite a few things in Mesa and gallium. Need to test i965 driver and fix up point coord handling in the gallium/draw module...
* | | vbo: Avoid extra validation of DrawElements.Eric Anholt2009-08-124-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves mapping the index buffer to get a bounds on the indices that drivers just drop on the floor in the VBO case (cache win), saves a bonus walk of the indices in the CheckArrayBounds case, and other miscellaneous validation. On intel it's a particularly a large win (50-100% in my app) because even though we let the indices stay in both CPU and GPU caches, we still end up waiting for the GPU to be done with the buffer before reading from it. Drivers that want the min/max_index fields must now check index_bounds_valid and use vbo_get_minmax_index before using them.
* | | st/mesa: remove redundant calls to _mesa_set_vp_override()Brian Paul2009-08-071-4/+2
| | | | | | | | | | | | Called from core Mesa now.
* | | mesa/st: Add support for binding pipe surface to texture.Chia-I Wu2009-08-054-16/+107
| | | | | | | | | | | | | | | | | | | | | This commit adds functions to bind a pipe surface to a texture. This allows texturing directly from the surface. Signed-off-by: Chia-I Wu <[email protected]>
* | | Merge branch 'mesa_7_5_branch'Brian Paul2009-08-052-13/+88
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/main/state.c
| * | st/mesa: implement BlitFramebuffer() for depth/stencil (incomplete)Brian Paul2009-08-051-29/+80
| | | | | | | | | | | | | | | | | | We now handle the case of blitting Z+stencil to/from combined Z/stencil surfaces. But Z-only or stencil-only and separate depth/stencil surfaces are not yet implemented.
| * | st/mesa: fix Y inversion and optimize st_BlitFramebuffer()Brian Paul2009-08-051-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Need to check for Y inversion separately for src/dest buffers. If both the src and dest regions are upside down, make them right-side up for a better chance at a fast path. progs/tests/copypixrate -blit is much faster now.
| * | st/mesa: we don't support GL_NV_point_sprite (see comment)Brian Paul2009-08-031-1/+3
| | |
* | | mesa st: Use POT texture for draw pixels operations if NPOT texture is not ↵Patrice Mandin2009-08-011-10/+58
| | | | | | | | | | | | supported
* | | mesa st: Move logbase2 function to util/u_math.hPatrice Mandin2009-08-011-13/+4
| | |
* | | Rename TGSI LOOP instruction to better match theri usage.Michal Krol2009-07-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The LOOP/ENDLOOP pair is renamed to BGNFOR/ENDFOR as its behaviour is similar to a C language for-loop. The BGNLOOP2/ENDLOOP2 pair is renamed to BGNLOOP/ENDLOOP as now there is no name collision.
* | | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-302-4/+32
|\| |
| * | mesa/st: short-circuit glFinish calls on WIN32 onlyKeith Whitwell2009-07-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows opengl32.dll calls glFinish prior to every swapbuffers, which makes it pretty hard to get decent performance... Work around by mapping finish to flush on PIPE_OS_WINDOWS. This is conformant, though it might confuse poorly-written benchmarks which attempt to measure a single event rather than figuring out the rate of continuous processing.
| * | mesa/st: recognize no-op scissor state when checking clear_with_quadsKeith Whitwell2009-07-291-4/+20
| | | | | | | | | | | | | | | Some apps enable scissor but set the rectangle to the dimensions of the window. Don't let this force us onto a slower clear path.
* | | mesa st: Change the preferred internal format for some RGB formats.Thomas Hellstrom2009-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | For GL_RGB5, GL_RGB4 and GL_R3_G3_B2, prefer PIPE_FORMAT_R5G6B5_UNORM over PIPE_FORMAT_A1R5G5B5_UNORM, since hardware is more likely to support the previous format for rendering. Signed-off-by: Thomas Hellstrom <[email protected]>
* | | mesa st: Report unsupported render-to-texture formats.Thomas Hellstrom2009-07-301-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | If a texture image is bound to a framebuffer for render-to-texture, but the hardware doesn't support rendering to its internal format, report the framebuffer as incomplete with FRAMEBUFFER_UNSUPPORTED. Signed-off-by: Thomas Hellstrom <[email protected]>
* | | gallium: fix SSE shadow texture instructionsBrian Paul2009-07-291-6/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When sampling a 2D shadow map we need 3 texcoord components, not 2. The third component (distance from light source) is compared against the texture sample to return the result (visible vs. occluded). Also, enable proper handling of TGSI_TEXTURE_SHADOW targets in Mesa->TGSI translation. There's a possibility for breakage in gallium drivers if they fail to handle the TGSI_TEXTURE_SHADOW1D / TGSI_TEXTURE_SHADOW2D / TGSI_TEXTURE_SHADOWRECT texture targets for TGSI_OPCODE_TEX/TXP instructions, but that should be easy to fix. With these changes, progs/demos/shadowtex.c renders properly again with softpipe.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-281-1/+2
|\| | | | | | | | | | | | | | | | | Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h