summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/svga
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-2228-157/+98
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
| * svga: Remove unused variable.Vinson Lee2010-01-211-1/+0
| |
| * svga: Remove duplicate code.José Fonseca2010-01-211-4/+2
| |
| * svga: Remove unused code.José Fonseca2010-01-213-30/+4
| |
| * svga: Don't swap buffers to system memory -- winsys' responsibility.José Fonseca2010-01-212-63/+0
| |
| * svga: Avoid synchronization issues when doing SW TNL.José Fonseca2010-01-211-3/+5
| |
| * svga: Follow buffer usage semantics properly.José Fonseca2010-01-212-4/+11
| | | | | | | | | | | | | | | | | | | | It's necessary to download buffers from the host always, except if the buffer is undefined, because: - just PIPE_BUFFER_USAGE_CPU_WRITE doesn't guarantee all data is written -- old contents may still pierce through - PIPE_BUFFER_USAGE_DISCARD refers to a range, not the whole buffer, so unless we track which parts have been modified and not we still need to download the data.
| * svga: Remove unnecessary headers.Vinson Lee2010-01-2123-47/+0
| |
| * svga: Do a more propper creation of textures from handlesJakob Bornecrantz2010-01-192-3/+71
| |
| * svga: Ensure buffer size/alignment is not zero.José Fonseca2010-01-182-3/+6
| |
* | Merge branch 'gallium-noconstbuf'Roland Scheidegger2010-01-151-2/+2
|\ \ | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_draw_arrays.c src/mesa/state_tracker/st_draw_feedback.c
| * | gallium: remove const qualifier from pipe_buffer argument in set_constant_bufferRoland Scheidegger2010-01-111-1/+1
| | |
| * | gallium: adapt drivers to pipe_constant_buffer removalRoland Scheidegger2009-12-241-2/+2
| | |
* | | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2010-01-142-3/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
| * | svga: Fix compile_vs error code.José Fonseca2010-01-132-3/+7
| | | | | | | | | | | | | | | | | | It could erroneously return PIPE_OK in some circumstances. Make compile_fs code identical.
* | | Merge branch 'instanced-arrays'Michal Krol2010-01-141-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_draw_arrays.c
| * | | svga: Fix call to translate::run().Michal Krol2010-01-131-1/+1
| | | |
| * | | Merge branch 'master' into instanced-arraysMichal Krol2010-01-0514-383/+461
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/tgsi/tgsi_dump.c src/gallium/include/pipe/p_shader_tokens.h
| * | | | Add lame support for instanceID to draw module.Michal Krol2009-12-301-0/+1
| | | | | | | | | | | | | | | | | | | | It's all screaming for integer support -- fake it with float for now.
| * | | | Implement draw_arrays_instanced() in softpipe.Michal Krol2009-12-291-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | Modify the translate module to respect instance divisors and accept instance id as a parameter to calculate input vertex offset.
* | | | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-081-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
| * | | svga: Silence uninitialized variable warning.Vinson Lee2010-01-061-1/+1
| | | |
* | | | svga: Fix fs key size computation and key comparison.Michal Krol2010-01-072-5/+9
| | | | | | | | | | | | | | | | | | | | This also allows us to have texture_target back as a bitfield and save us a few bytes.
* | | | svga: make texture_target a ubyte, not a bitfieldBrian Paul2010-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | gcc won't let us take the address of a bitfield in the svga_fs_key_size() function.
* | | | Make sure we use only signed/unsigned ints with bitfields.Michal Krol2010-01-061-14/+12
| | | | | | | | | | | | | | | | Seems to be the only way to stay fully portable.
* | | | Merge remote branch 'origin/mesa_7_7_branch'José Fonseca2010-01-065-18/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/default src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/mesa/main/version.h
| * | | svga: Remove stale references to delete shader results.José Fonseca2010-01-052-0/+14
| | | | | | | | | | | | | | | | | | | | To ensure that a new result that happens to have the same address of the old one will be detected as a change.
| * | | svga: Rebind shaders when tokens change.José Fonseca2010-01-053-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even shader ID doesn't change. Otherwise the token change is not effective. This reverts regression from commit cdb445f3a9285e2d8f042a07021ade78b94e0156. Regression could be seen in Quake3's loading screen -- the upper right corner of the screen would be black.
* | | | gallium: remove PIPE_TEX_FILTER_ANISOLuca Barbieri2010-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes PIPE_TEX_FILTER_ANISO. Anisotropic filtering is enabled if and only if max_anisotropy > 1.0. Values between 0.0 and 1.0, inclusive, of max_anisotropy are to be considered equivalent, and meaning to turn off anisotropic filtering. This approach has the small drawback of eliminating the possibility of enabling anisotropic filter on either minification or magnification separately, which Radeon hardware seems to support, is currently support by Gallium but not exposed to OpenGL. If this is actually useful it could be handled by splitting max_anisotropy in two values and adding an appropriate OpenGL extension. NOTE: some fiddling & reformatting by keithw to get this patch to apply. Hopefully nothing broken in the process.
* | | | Merge commit 'origin/gallium-draw-retval'Keith Whitwell2010-01-051-15/+13
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Conflicts: src/gallium/drivers/identity/id_context.c
| * | | gallium: remove return value from draw callsKeith Whitwell2009-12-211-15/+13
| | | |
* | | | Remove TGSI_OPCODE_SHR, map existing usage to TGSI_OPCODE_ISHR.Michal Krol2010-01-051-1/+1
| | | | | | | | | | | | | | | | This is to differentiate it from its unsigned version, TGSI_OPCODE_USHR.
* | | | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-048-39/+94
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c
| * | | svga: Fix debug build crash when rendering to depth/stencil renderbuffer only.Michel Dänzer2010-01-041-1/+2
| | | |
| * | | svga: Use a shader id as low as possible.José Fonseca2010-01-037-24/+78
| | | |
| * | | svga: Rename error labels.José Fonseca2010-01-031-14/+14
| | | | | | | | | | | | | | | | Make it easier to insert/remove error branches.
* | | | svga: Allow to dump an individual command.José Fonseca2009-12-263-340/+363
| | | |
* | | | gs: fix drivers so they work with geometry shadersZack Rusin2009-12-251-2/+2
| | | |
* | | | gallium: add geometry shader support to galliumZack Rusin2009-12-251-1/+1
| |_|/ |/| |
* | | Merge branch 'gallium-edgeflags'Roland Scheidegger2009-12-224-28/+7
|\ \ \ | |_|/ |/| | | | | | | | Conflicts: src/mesa/state_tracker/st_draw.c
| * | gallium: fix up drivers for edgeflag changesRoland Scheidegger2009-12-194-28/+7
| | | | | | | | | | | | | | | several drivers which chose to ignore edgeflags might require some more work, while edgeflags never worked there they might now crash.
* | | svga: fix typoRoland Scheidegger2009-12-211-1/+1
| | |
* | | Move the remaining format pf_get_* functions to u_format.h.Michal Krol2009-12-172-8/+8
| | | | | | | | | | | | | | | Previously they depended on format blocks, but after removing those they started depending on format encoding.
* | | Merge branch 'master' into pipe-format-simplifyMichal Krol2009-12-1712-737/+1086
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/auxiliary/draw/draw_pipe_pstipple.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_surface.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/cell/ppu/cell_texture.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_tile_cache.c src/gallium/drivers/svga/svga_state_vs.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/dri/dri_drawable.c src/gallium/state_trackers/egl/egl_surface.c src/gallium/state_trackers/python/p_device.i src/gallium/state_trackers/python/st_softpipe_winsys.c src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/image.c src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/vg_tracker.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/gallium/state_trackers/xorg/xvmc/surface.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_buffer.c src/gallium/winsys/egl_xlib/sw_winsys.c src/gallium/winsys/g3dvl/xlib/xsp_winsys.c src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c src/gallium/winsys/xlib/xlib_cell.c src/gallium/winsys/xlib/xlib_llvmpipe.c src/gallium/winsys/xlib/xlib_softpipe.c src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_texture.c
| * \ \ Merge branch 'mesa_7_7_branch'Brian Paul2009-12-114-19/+39
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
| | * svga: Add a missing dependency from the prescale state.José Fonseca2009-12-111-1/+2
| | | | | | | | | | | | | | | | | | Thanks for Keith to finding this. Fixes Jedi Knight 2 menus.
| | * svga: Always pass SVGA3D_SURFACE_HINT_DYNAMIC.José Fonseca2009-12-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're reusing buffers we're effectively transforming all of them into dynamic buffers. It would be nice to not cache long lived static buffers. But there is no way to detect the long lived from short lived ones yet. A good heuristic would be buffer size.
| | * svga: Keep tight control of texture handle ownership.José Fonseca2009-12-112-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The texture owns the surface handle. All derivatives need to keep a reference to texture. This fixes several assertions failures starting up Jedi Knight 2. Should cause no change for DRM surface sharing -- reference count still done as before there.
| | * svga: Fix mixed signed comparisons.José Fonseca2009-12-111-1/+1
| | |
| * | Merge branch 'gallium-strict-aliasing'Roland Scheidegger2009-12-084-7/+10
| |\ \