summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* st/mesa: Set the pipe context of the texture object.Chia-I Wu2010-03-181-0/+1
| | | | | The field was added in b8030c6561e019e079b5be2fe64ec804df4bfa03. This fixes a NULL dereference in xdemos/texture_from_pixmap.
* intel: Replace mt->pitch with mt->region->pitch.Eric Anholt2010-03-1711-122/+47
| | | | | | The pitch is not really an inherent part of the miptree, since it's not part of any of the layout calculations, and it's dictated by the libdrm-allocated region pitch now.
* intel: Return false like other blit failure paths if out of aperture.Eric Anholt2010-03-171-16/+2
| | | | | | | The primary consumer of this (miptree relayout) already has this code for handling failure, and the other paths want to know if failure actually occurs and do something appropriate, which may not include memcpy.
* intel: Respect src pitch in _mesa_copy_rect().Eric Anholt2010-03-171-1/+1
| | | | | If a non-zero src_y was used, this would break piglit depth-level-clamp.
* intel: Rely on allocated region pitch for the miptree pitch.Eric Anholt2010-03-174-25/+7
| | | | Bug #26966: 945 miptree pitch disagreement with libdrm.
* intel: Assert that the linear blits succeed.Eric Anholt2010-03-171-14/+17
| | | | | We don't have any fallback code here, and we want to avoid this path if failure would happen, so just assert.
* intel: Remove level_offset now that it's unused.Eric Anholt2010-03-172-13/+5
| | | | This is the last pitch-dependent part of miptree setup.
* intel: Remove extra tiling setting after allocating a tiled region.Eric Anholt2010-03-172-9/+3
|
* intel: Rename the z24_x8 depth spans to z24_s8 since they do stencil too.Eric Anholt2010-03-171-2/+2
|
* st/mesa: plug in default for pipe_context::surface_copy() if neededBrian Paul2010-03-176-55/+38
| | | | This lets us avoid conditionals and duplicated code in several places.
* Merge branch '7.8'Brian Paul2010-03-173-137/+37
|\ | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_cb_drawpixels.c
| * st/mesa: fix glCopyPixels bugs/crashes when src region need clippingBrian Paul2010-03-171-54/+36
| | | | | | | | | | | | | | | | | | Use the _mesa_clip_readpixels() function to clip the src region against the buffer's bounds. Neatly, the resulting pixel unpack object's SkipPixels/SkipRows fields can be used to determine the position of the region in the destination texture. Fixes crash in progs/samples/copy.c and probably other cases.
| * mesa: rename params in prototype to match implementationBrian Paul2010-03-171-1/+1
| |
| * swrast: remove unused compute_coveragei() functionBrian Paul2010-03-171-82/+0
| |
* | glapi: fix assorted warningsBrian Paul2010-03-173-7/+10
| | | | | | | | | | And replace some instances of GLuint with unsigned int to avoid pulling in GL/gl.h
* | st/mesa: Fix build breakage.Corbin Simpson2010-03-171-1/+1
| | | | | | | | | | Nearly certain this is what was intended; it compiles, but I'm not sure this path is ever hit in my tests.
* | Merge branch '7.8' into masterPauli Nieminen2010-03-179-25/+24
|\ \ | |/ | | | | | | | | Conflicts: Makefile src/mesa/main/version.h
| * i965: Fix ENDLOOP to only patch up this loop's BREAK and CONT.Eric Anholt2010-03-161-2/+4
| | | | | | | | | | | | Corresponds to d225a25e21a24508aea3b877c78beb35502e942d and fixes piglit glsl-fs-loop-nested. Bug #25173. (cherry picked from commit a81836ee2fe5092d695b717addf8cec91f569777)
| * i965: Unalias all GLSL source regs from the destination regs used.Eric Anholt2010-03-161-113/+25
| | | | | | | | | | | | | | | | | | | | | | | | We were doing it ad-hoc before, as instructions with potential aliasing problems were identified. But thanks to swizzling basically anything can have aliasing, so just do it generally at source reg setup time. This is somewhat inefficient, because sometimes an operation doesn't need unaliasing protection if the swizzling is safe, but the unaliasing before didn't cover those cases either. Fixes piglit glsl-fs-loop. (cherry picked from commit 6b194dab6b4d9f12cdd54c699b23c0d3420a49c2)
| * i965: Fix nested loops in the VS.Eric Anholt2010-03-161-2/+4
| | | | | | | | | | | | | | | | We were patching up all the break and continues between the start of our loop and the end of our loop, even if they were breaks/continues for an inner loop. Avoiding patching already patched breaks/continues fixes piglit glsl-vs-loop-nested. (cherry picked from commit f6f547d87ea68f44c50a0b0231b7360ca94b2975)
| * i965: Fix up VP constbuf leak on program delete.Eric Anholt2010-03-161-3/+11
| | | | | | | | (cherry picked from commit 7f6d2754d586545ab6c970acffdd897294879039)
| * i965: Fix up the handling of point sprite coordinate replacement.Eric Anholt2010-03-163-66/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was walking over the regs of pairs of attributes and checking whether the attribute with a given reg index had point sprite enabled. So the point sprite setup code was rarely even getting executed. Instead, we need to determine which channels of a reg need point sprite coordinate replacement. In addition, it was multiplying the attribute by 1/w, when it's supposed to cover (0, 1) in each direction regardless of w, and it wasn't filling in the Z and W components of the texcoord as specified. Fixes piglit point-sprite and the spriteblast demo. Bug #24431, #22245. (cherry picked from commit bc632d04370566c1156cbd0345fe303834f0b910)
| * i965: Add support for the CMP opcode in the GLSL path.Eric Anholt2010-03-163-6/+15
| | | | | | | | | | | | This would be triggered by use of sqrt() along with control flow. Fixes piglit-fs-sqrt-branch and a bug in Yo Frankie!. (cherry picked from commit 48dca99feb394febc3af44e14f23fb12a9cc9204)
| * i965: Fix the response len of masked sampler messages for 8-wide dispatch.Eric Anholt2010-03-161-3/+15
| | | | | | | | | | | | | | | | | | | | | | The bad response length would hang the GPU with a masked sample in a shader using control flow. For 8-wide, the response length is always 4, and masked slots are just not written to. brw_wm_glsl.c already allocates registers in the right locations. Fixes piglit glsl-fs-bug25902 (fd.o bug #25902). (cherry picked from commit f6d210c284751ac50a8d6358de7e75a1ff1e4ac7) (cherry picked from commit dc8c0359448cdae7b367552ba58783c04b199778)
| * mesa: set version string to 7.8-rc1Ian Romanick2010-03-161-1/+1
| |
| * Correct GL_EQUIV code in r67/7xx.Matthew W. S. Bell2010-03-161-1/+1
| | | | | | | | | | | | | | From 247e121106e8d3e389f2e5a6edf13ea70ac18df7 Mon Sep 17 00:00:00 2001 These seem to be documented in <http://www.svgopen.org/2003/papers/RasterOperationsUsingFilterElements/index.html>.
| * radeon: Fix buffer object unmap to be called only once for dma buffers.Pauli Nieminen2010-03-161-6/+1
| | | | | | | | | | | | If flush happens inside radeonRefillCurrentMaRegion the last dma buffer would be unmapped twice. Unmapping buffer when moving buffer to wait list fixes the mapping error.
| * Replace _mesa_strtod with _mesa_strtof.Marcin Baczyński2010-03-156-18/+20
| | | | | | | | Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| * mesa: Fix memory leak in decompress-with-blit.Keith Whitwell2010-03-131-0/+2
| | | | | | | | (cherry picked from commit f05a4ee6f2840590c90da4be2fe5c6295410a5af)
* | i965: Fix readpixels from ReadBuffer != DrawBuffer.Eric Anholt2010-03-161-8/+8
| | | | | | | | Fixes piglit fbo-readdrawpix.
* | i965: Fix inversion for glCopyPixels to/from FBOs.Eric Anholt2010-03-164-13/+20
| | | | | | | | fixes piglit fbo-copypix.
* | intel: Remove more code for x8z24 visuals, since we only do s8z24.Eric Anholt2010-03-161-12/+7
| |
* | Revert "i965: Do VS SGT, SLT, and friends using CMP, SEL instead of CMP, ↵Eric Anholt2010-03-161-2/+3
| | | | | | | | | | | | | | MOV, MOV." This reverts commit 8ef3b1834a896927bdd4f2aea552cdb732849da9. Fixes piglit glsl-vs-if.
* | Revert "i965: Do FS SLT, SGT, and friends using CMP, SEL instead of CMP, ↵Eric Anholt2010-03-161-2/+5
| | | | | | | | | | | | | | | | MOV, MOV." This reverts commit 46450c1f3f93bf4dc96696fc7e0f0eb808d9c08a. I was wrong about null reg behavior -- it reads undefined, not 0. And they're not kidding.
* | meta: Fix up restoration of state if _mesa_map_pbo_source() fails.Eric Anholt2010-03-161-1/+3
| |
* | meta: Properly refcount our saved programs and texobjs.Eric Anholt2010-03-161-2/+7
| | | | | | | | Found while debugging bug #24119.
* | st/mesa: Invalidate sampler view when texture object changes.Michal Krol2010-03-162-0/+4
| |
* | gallium: change remaining util functions to use cso sampler viewsRoland Scheidegger2010-03-162-8/+21
| | | | | | | | | | changes arguments of util_blit_pixels_tex and util_gen_mipmap to struct pipe_sampler_view * instead of struct pipe_texture *.
* | Merge commit 'origin/master' into gallium-sampler-viewKeith Whitwell2010-03-1610-9/+881
|\ \ | | | | | | | | | | | | | | | | | | This branch already seems to have the nv50_tex.c fix. Conflicts: src/gallium/drivers/nv50/nv50_tex.c
| * \ Merge remote branch 'origin/gallium-st-api'Chia-I Wu2010-03-1610-9/+881
| |\ \
| | * | st/mesa: Update the comments in st_manager.c.Chia-I Wu2010-03-151-4/+7
| | | |
| | * | st/mesa: Fix handling of FBO.Chia-I Wu2010-03-141-16/+24
| | | | | | | | | | | | | | | | | | | | FBOs are created by st_new_framebuffer and cannot be casted to st_framebuffer.
| | * | st/mesa: Validate the state in st_readpixels.Chia-I Wu2010-03-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The front renderbuffer of a framebuffer is usually added as needed when glReadBuffer(GL_FRONT) is called. When the call is followed by glReadPixels, we should validate the state before reading from the renderbuffer.
| | * | st/mesa: Set revalidate in st_framebuffer_update_attachments.Chia-I Wu2010-03-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | There are two conditions that a validation is required. One is when the the framebuffer becomes invalid. The other is when we request for textures that we did not request before.
| | * | st/mesa: Check the format before adding depth/stencil buffers.Chia-I Wu2010-03-121-3/+9
| | | | | | | | | | | | | | | | | | | | The format might have depth bits, stencil bits, or both. Add the renderbuffers as needed.
| | * | st/mesa: Implement st_api.h.Chia-I Wu2010-03-129-9/+860
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently no user of this new interface. As the inteface can coexist with st_public.h, everthing should work as before. ST_TEXTURE_2D is both defined by st_public.h and st_api.h. Reorder the headers in st/dri to avoid conflicts.
* | | | st/mesa: Fix a call to st_get_stobj_sampler_view().Michal Krol2010-03-151-1/+1
| | | |
* | | | st/mesa: Pass in correct sampler view object to blitter.Michal Krol2010-03-151-1/+1
| | | |
* | | | gallium: util_blit_pixels() takes source sampler view as argument.Michal Krol2010-03-152-5/+12
| | | |
* | | | st/mesa: Cache FBO texture's sampler view object.Michal Krol2010-03-154-0/+31
| | | |