summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gallium-sampler-viewMichal Krol2010-03-1025-429/+319
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript src/gallium/auxiliary/tgsi/tgsi_exec.c src/gallium/auxiliary/util/u_blitter.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i965/brw_context.h src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/nv50/nv50_context.h src/gallium/drivers/nv50/nv50_state_validate.c src/gallium/drivers/nv50/nv50_tex.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_context.h src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/softpipe/sp_context.h src/gallium/drivers/svga/svga_context.h src/gallium/drivers/svga/svga_pipe_sampler.c
| * gallium: plumb winsys-drawable-handle through to state trackerKeith Whitwell2010-03-102-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 properlyRoland Scheidegger2010-03-091-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 Scheidegger2010-03-097-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 interfaceRoland Scheidegger2010-03-095-0/+23
| | | | | | | | | | | | somehow those got lost...
| | * st/mesa: fix mesa statetracker adaption to new vertex elements interfaceRoland Scheidegger2010-03-011-1/+2
| | |
| | * gallium: remove redundant nr_components field from pipe_vertex_elementRoland Scheidegger2010-02-172-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 Simpson2010-03-091-0/+3
| | | | | | | | | | | | Fixes glean/clipFlat for r300g.
| * | st/mesa: don't detach renderbuffer, surface in st_finish_render_texture()Brian Paul2010-03-081-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_vertexIan Romanick2010-03-031-2/+1
| | | | | | | | | | | | Signed-off-by: Ian Romanick <[email protected]>
| * | Merge branch 'gallium-format-cleanup'José Fonseca2010-03-026-101/+101
| |\ \
| | * | mesa: Rename pipe formats.José Fonseca2010-03-016-101/+101
| | | |
| | * | mesa: Use PIPE_FORMAT_R8G8B8A8_UNORM_REV where appropriate.José Fonseca2010-03-011-3/+3
| | | |
| * | | Merge branch 'gallium-no-rhw-position'Michal Krol2010-03-023-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 Krol2010-02-242-1/+6
| | | |
| | * | st/mesa: Use cso context to manage clip state.Michal Krol2010-02-241-1/+3
| | | |
| | * | gallium: Remove bypass_vs_clip_and_viewport from rasteriser state.Michal Krol2010-02-221-19/+25
| | | | | | | | | | | | | | | | Needs testing.
| * | | st/mesa: do not advertise S3TC if the external lib is not availableMarek Olšák2010-02-281-2/+6
| | | |
| * | | st/mesa: updated commentsBrian Paul2010-02-242-3/+4
| | | |
| * | | st/mesa: consolidate redundant format conversion codeBrian Paul2010-02-241-86/+21
| | | |
| * | | st/mesa: more format code clean-up and removalBrian Paul2010-02-242-68/+18
| | | |
| * | | st/mesa: clean-ups in FBO codeBrian Paul2010-02-241-21/+6
| | | |
| * | | st/mesa: clean-up of format-related codeBrian Paul2010-02-243-77/+13
| | | |
| * | | st/mesa: use util_format_get_blocksize()Brian Paul2010-02-241-1/+1
| | | |
| * | | st/mesa: code clean-ups in st_renderbuffer_alloc_storage()Brian Paul2010-02-241-8/+7
| | | |
| * | | mesa: Update for UTIL_FORMAT_LAYOUT_xxx changes.José Fonseca2010-02-241-3/+7
| | | |
| * | | st/mesa: whitespace fixesBrian Paul2010-02-231-4/+1
| |/ /
| * | st/mesa: change viewport Z scale/bias for glBitmap/glDrawPixelsBrian Paul2010-02-222-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_xBrian Paul2010-02-222-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 Paul2010-02-221-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 Lee2010-02-211-1/+3
| | |
| * | Replace the _mesa_*printf() wrappers with the plain libc versionsKristian Høgsberg2010-02-191-5/+5
| | |
| * | Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versionsKristian Høgsberg2010-02-1911-27/+27
| | |
| * | Remove _mesa_memcpy in favor of plain memcpy.Kenneth Graunke2010-02-191-1/+1
| | | | | | | | | | | | This may break the SUNOS4 build, but it's no longer relevant.
| * | st/mesa: added some bitmap debug code (disabled)Brian Paul2010-02-181-0/+22
| | |
| * | Revert "st/mesa: Make the frontbuffer visible on st_flush(PIPE_FLUSH_FRAME)."Francisco Jerez2010-02-181-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.
* | | gallium: WIP: Introduce sampler views.Michal Krol2010-02-191-2/+2
|/ /
* | st/mesa: always call FLUSH_CURRENT before st->pipe->flush()Keith Whitwell2010-02-181-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 Jerez2010-02-171-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 assertionBrian Paul2010-02-171-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 Jerez2010-02-164-82/+6
|/
* st/mesa: minor assorted clean-upsBrian Paul2010-02-141-8/+12
|
* st/mesa: change some function return typesBrian Paul2010-02-141-15/+15
|
* st/mesa: move per-fragment shader fields to local varsBrian Paul2010-02-142-20/+19
|
* st/mesa: use _mesa_clone_fragment_program()Brian Paul2010-02-141-1/+1
|
* mesa: Add missing include.José Fonseca2010-02-141-0/+1
|
* mesa: Use util_format_name().José Fonseca2010-02-142-2/+2
|
* st/mesa: restore draw rasterization stage after rasterposBrian Paul2010-02-121-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 codeBrian Paul2010-02-121-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 commentsBrian Paul2010-02-126-22/+24
|