Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | gallium: plumb winsys-drawable-handle through to state tracker | Keith Whitwell | 2010-03-10 | 2 | -3/+8 |
| | | | | | | | The state trackers need this value so that they can supply it as the "void *" argument to flush_frontbuffer. Fixes single-buffer rendering. | ||||
* | mesa/st: initialize velements state properly | Roland Scheidegger | 2010-03-09 | 1 | -0/+1 |
| | | | | | | one variable is a bitfield where the rest is never written to, which caused valgrind to complain. Might have caused cso to not recognize an already stored state. Reported by Christoph Bumiller. | ||||
* | Merge branch 'gallium-vertexelementcso' | Roland Scheidegger | 2010-03-09 | 7 | -5/+26 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/cso_cache/cso_context.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i965/brw_draw_upload.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_context.h src/gallium/drivers/r300/r300_render.c src/gallium/drivers/r300/r300_state_derived.c src/mesa/state_tracker/st_cb_bitmap.c src/mesa/state_tracker/st_cb_clear.c | ||||
| * | st/mesa: fix clear/drawpixels/bitmap for new cso vertex elements interface | Roland Scheidegger | 2010-03-09 | 5 | -0/+23 |
| | | | | | | | | somehow those got lost... | ||||
| * | st/mesa: fix mesa statetracker adaption to new vertex elements interface | Roland Scheidegger | 2010-03-01 | 1 | -1/+2 |
| | | |||||
| * | gallium: remove redundant nr_components field from pipe_vertex_element | Roland Scheidegger | 2010-02-17 | 2 | -4/+0 |
| | | | | | | | | | | This is a property of the associated src_format pipe format. Hence use util_format_get_nr_components to query this when necessary instead. | ||||
* | | mesa/st: Gallium quads, by spec, never change provoking vertex. | Corbin Simpson | 2010-03-09 | 1 | -0/+3 |
| | | | | | | | | Fixes glean/clipFlat for r300g. | ||||
* | | st/mesa: don't detach renderbuffer, surface in st_finish_render_texture() | Brian Paul | 2010-03-08 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | There's no reason to release the renderbuffer from the framebuffer object or release the gallium surface in this function (they're reference counted). In fact, we don't want to do this because we may later use the texture as a pixel source (ex: glBlitFramebuffer) and need the surface. Fixes fd.o bug 26923 and is part of the fix for bug 26932. | ||||
* | | mesa: Eliminate index parameter to _mesa_feedback_vertex | Ian Romanick | 2010-03-03 | 1 | -2/+1 |
| | | | | | | | | Signed-off-by: Ian Romanick <[email protected]> | ||||
* | | Merge branch 'gallium-format-cleanup' | José Fonseca | 2010-03-02 | 6 | -101/+101 |
|\ \ | |||||
| * | | mesa: Rename pipe formats. | José Fonseca | 2010-03-01 | 6 | -101/+101 |
| | | | |||||
| * | | mesa: Use PIPE_FORMAT_R8G8B8A8_UNORM_REV where appropriate. | José Fonseca | 2010-03-01 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'gallium-no-rhw-position' | Michal Krol | 2010-03-02 | 3 | -21/+34 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_state_derived.c | ||||
| * | | st/mesa: Reset clip state when clearing with quads. | Michal Krol | 2010-02-24 | 2 | -1/+6 |
| | | | |||||
| * | | st/mesa: Use cso context to manage clip state. | Michal Krol | 2010-02-24 | 1 | -1/+3 |
| | | | |||||
| * | | gallium: Remove bypass_vs_clip_and_viewport from rasteriser state. | Michal Krol | 2010-02-22 | 1 | -19/+25 |
| | | | | | | | | | | | | Needs testing. | ||||
* | | | st/mesa: do not advertise S3TC if the external lib is not available | Marek Olšák | 2010-02-28 | 1 | -2/+6 |
| | | | |||||
* | | | st/mesa: updated comments | Brian Paul | 2010-02-24 | 2 | -3/+4 |
| | | | |||||
* | | | st/mesa: consolidate redundant format conversion code | Brian Paul | 2010-02-24 | 1 | -86/+21 |
| | | | |||||
* | | | st/mesa: more format code clean-up and removal | Brian Paul | 2010-02-24 | 2 | -68/+18 |
| | | | |||||
* | | | st/mesa: clean-ups in FBO code | Brian Paul | 2010-02-24 | 1 | -21/+6 |
| | | | |||||
* | | | st/mesa: clean-up of format-related code | Brian Paul | 2010-02-24 | 3 | -77/+13 |
| | | | |||||
* | | | st/mesa: use util_format_get_blocksize() | Brian Paul | 2010-02-24 | 1 | -1/+1 |
| | | | |||||
* | | | st/mesa: code clean-ups in st_renderbuffer_alloc_storage() | Brian Paul | 2010-02-24 | 1 | -8/+7 |
| | | | |||||
* | | | mesa: Update for UTIL_FORMAT_LAYOUT_xxx changes. | José Fonseca | 2010-02-24 | 1 | -3/+7 |
| | | | |||||
* | | | st/mesa: whitespace fixes | Brian Paul | 2010-02-23 | 1 | -4/+1 |
|/ / | |||||
* | | st/mesa: change viewport Z scale/bias for glBitmap/glDrawPixels | Brian Paul | 2010-02-22 | 2 | -4/+10 |
| | | | | | | | | | | | | | | This fixes incorrect Z position of glBitmap, glDraw/CopyPixels for the svga driver. Now we use 0.5, 0.5 as is typical for ordinary 3D rendering. (cherry picked from commit bcd561c66777e58dbb29a573c4d2279772bac6c5) | ||||
* | | st/mesa: Add checks for ST_SURFACE_x vs MESA_BUFFER_x | Brian Paul | 2010-02-22 | 2 | -1/+9 |
| | | | | | | | | | | | | | | The ST_SURFACE_x values should match the Mesa BUFFER_x values. Added some assertions to prevent future mix-ups. (cherry picked from commit 13cbb5fff68ef8831230638e9f0b29a217750e9d) | ||||
* | | mesa/st: Make ST_SURFACE_DEPTH index consistent with mesa's BUFFER_DEPTH. | Brian Paul | 2010-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | Some st functions assume that they are identical. (cherry picked from commit 9d17ad2891b58de9e33e943ff918a678c6a3c2bd) | ||||
* | | st/mesa: Fix memory leak on out-of-memory error path. | Vinson Lee | 2010-02-21 | 1 | -1/+3 |
| | | |||||
* | | Replace the _mesa_*printf() wrappers with the plain libc versions | Kristian Høgsberg | 2010-02-19 | 1 | -5/+5 |
| | | |||||
* | | Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versions | Kristian Høgsberg | 2010-02-19 | 11 | -27/+27 |
| | | |||||
* | | Remove _mesa_memcpy in favor of plain memcpy. | Kenneth Graunke | 2010-02-19 | 1 | -1/+1 |
| | | | | | | | | This may break the SUNOS4 build, but it's no longer relevant. | ||||
* | | st/mesa: added some bitmap debug code (disabled) | Brian Paul | 2010-02-18 | 1 | -0/+22 |
| | | |||||
* | | Revert "st/mesa: Make the frontbuffer visible on st_flush(PIPE_FLUSH_FRAME)." | Francisco Jerez | 2010-02-18 | 1 | -4/+8 |
| | | | | | | | | | | | | We probably don't want to propagate this condition to the pipe driver, this reverts commit f455ca6490fcb65781b21f81c7117bd923e250d1 and the dri_update_buffer flush altogether until an agreement is reached. | ||||
* | | st/mesa: always call FLUSH_CURRENT before st->pipe->flush() | Keith Whitwell | 2010-02-18 | 1 | -2/+1 |
| | | | | | | | | | | | | Undoes part of commit f455ca6 which would permit pipe->flush() to be called while the VBO module still had its buffers mapped. Some drivers care deeply about this. Sorry for not spotting this earlier. | ||||
* | | st/mesa: Make the frontbuffer visible on st_flush(PIPE_FLUSH_FRAME). | Francisco Jerez | 2010-02-17 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | So far the frontbuffer was only being flushed on st_glFlush and st_glFinish, however, a co-state tracker may need to make sure that any frontbuffer changes are already on its way to the actual front. The dri2 state tracker will need this for event-driven GL applications to resize properly (It could also be done calling "dri_flush_frontbuffer", but that way we would flush unnecessarily in the double-buffered case). Additionally this patch avoids flushing the mesa rendering cache if PIPE_FLUSH_RENDER_CACHE wasn't specified. | ||||
* | | st/mesa: replace conditional with assertion | Brian Paul | 2010-02-17 | 1 | -7/+2 |
| | | | | | | | | | | Core Mesa will not call ctx->Driver.CheckQuery() if the Ready flag is already set. | ||||
* | | st/dri2: Use event-driven buffer validation. | Francisco Jerez | 2010-02-16 | 4 | -82/+6 |
|/ | |||||
* | st/mesa: minor assorted clean-ups | Brian Paul | 2010-02-14 | 1 | -8/+12 |
| | |||||
* | st/mesa: change some function return types | Brian Paul | 2010-02-14 | 1 | -15/+15 |
| | |||||
* | st/mesa: move per-fragment shader fields to local vars | Brian Paul | 2010-02-14 | 2 | -20/+19 |
| | |||||
* | st/mesa: use _mesa_clone_fragment_program() | Brian Paul | 2010-02-14 | 1 | -1/+1 |
| | |||||
* | mesa: Add missing include. | José Fonseca | 2010-02-14 | 1 | -0/+1 |
| | |||||
* | mesa: Use util_format_name(). | José Fonseca | 2010-02-14 | 2 | -2/+2 |
| | |||||
* | st/mesa: restore draw rasterization stage after rasterpos | Brian Paul | 2010-02-12 | 1 | -0/+8 |
| | | | | | | | This fixes invalid calls to rastpos_point/line/tri() that can occur when glRasterPos() is called while in feedback or selection mode. (cherry picked from commit b3c7dc6ff232eb4c5ff6b0ddcfa90bcb56f78df1) | ||||
* | st/mesa: improved draw_range_elements code | Brian Paul | 2010-02-12 | 1 | -9/+7 |
| | | | | | | | | Don't use pipe->draw_range_elements() if min_index=max_index=~0 since that doesn't provide any useful info. Also, implement the loop around pipe->draw_range_elements() when nr_prims > 1. | ||||
* | st/mesa: rename state -> tgsi, updated comments | Brian Paul | 2010-02-12 | 6 | -22/+24 |
| | |||||
* | st/mesa: remove unused var | Brian Paul | 2010-02-12 | 1 | -3/+0 |
| | |||||
* | Merge branch 'gallium-dynamicstencilref' | Roland Scheidegger | 2010-02-12 | 3 | -4/+17 |
|\ |