summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/svga
Commit message (Collapse)AuthorAgeFilesLines
* svga: check min_index, max_index before assertionsBrian Paul2010-02-111-2/+6
| | | | | | | | | | It's possible for min_index and max_index to be ~0 if the min/max values were not actually set or computed in the state tracker. Skip some assertions in that case. This only effects the debug build error checking. (cherry picked from commit 408f32dc165b36eb5ec0e2bbc7dcecd28f3a62d3)
* svga: implement PIPE_CAP_MAX_COMBINED_SAMPLERS queryBrian Paul2010-02-111-0/+2
|
* Merge branch 'gallium-nopointsizeminmax'Roland Scheidegger2010-02-094-8/+7
|\ | | | | | | | | | | | | Conflicts: src/gallium/drivers/nv10/nv10_state.c src/gallium/drivers/nv20/nv20_state.c src/gallium/drivers/nv50/nv50_program.c
| * gallium: add point_quad_rasterization bit to rasterizer stateRoland Scheidegger2010-02-041-0/+1
| | | | | | | | | | This determines if points should be rasterized according to GL point rules or as normal quads (GL point sprites / d3d points / d3d point sprites).
| * gallium: clean up point sprite rasterizer stateRoland Scheidegger2010-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | Don't need sprite coord origin per coord. Also, don't need separate sprite enable bit - if all coords have it diabled, then there are no point sprites (technically, there's a distinction in pre-GL3, but it only differs in having more leniency in clamping to max size, something the state tracker would need to handle and the hardware won't bother anyway). Also, use packed field for the per-coord enables. All in all, should save 3 dwords in rasterizer state (from 10 down to 7).
| * gallium: remove point_size_min and point_size_max from rasterizer stateRoland Scheidegger2010-01-124-7/+5
| | | | | | | | | | | | | | The state tracker is responsible for clamping to any graphics API enforced size min/max limits for both the static point_size setting as well as per vertex point size (in the vertex shader). Note that mesa state tracker didn't actually use these values.
* | svga: Actually call fence_reference in texture downloads.José Fonseca2010-02-091-2/+2
| |
* | svga: remove dead debug sleepKeith Whitwell2010-02-081-5/+0
| |
* | gallium: squash-merge of gallium screen contextKeith Whitwell2010-02-084-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 009598122adf5cad42bf9af067eccaf8e89e1233 Author: Christoph Bumiller <[email protected]> Date: Mon Feb 8 11:03:26 2010 +0000 nouveau: fix gallium-screen-context branch fallout commit 7b2ffc2019d72e833afea7eebf3e80121187375d Merge: 51e190e c036d13 Author: Keith Whitwell <[email protected]> Date: Fri Feb 5 09:55:02 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c This branch has got a pretty tortured history now, I expect a squash merge will be appropriate when it is done. commit 51e190e95acf120f72768fafb29e9721e358df1b Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:58:02 2010 +0000 gallium: fix some build issues commit f524bdaa723fb181637ad30c6ad708aeedabe25b Merge: f906212 3aba0a2 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:51:32 2010 +0000 Merge commit 'origin/master' into gallium-screen-context commit f9062126883199eabf045714c717cd35f4b7b313 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:17:12 2010 +0000 gallium/docs: small description of screen::create_context commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:42 2010 +0000 drm/radeon: more dead create_context wrapper removal commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:30 2010 +0000 drm/i965: more dead create_context wrapper removal commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:05 2010 +0000 st/python: more dead create_context wrapper removal commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:37:58 2010 +0000 idenity: wrapped context creation commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:28:47 2010 +0000 ws/gdi: remove dead context_create wrapper commit 132b55f4bec39386ac625f09aaa11f609664024c Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:27:52 2010 +0000 ws/gdi: remove dead context_create wrapper commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:25:38 2010 +0000 st/xorg: use screen::context_create commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:23:20 2010 +0000 glx/xlib: simplify creation of trace-wrapped contexts Trace screen knows how to properly wrap context creation in the wrapped screen, so nothing special to do here. commit c99404c03ebaec4175f08a2f363e43c9085f2635 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:18:24 2010 +0000 st/python: no need to special case context creation for trace commit 193a527a682b6877bb1faecd8092df4dfd055a18 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:15:30 2010 +0000 drm/radeon: remove dead create_context declaration commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:14:58 2010 +0000 nv/drm: remove dead create_context ref commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:12:51 2010 +0000 st/egl: remove a layer of wrappers around screen::create_context commit 39caa6672a04122f185c22e17aab86d1c40938bf Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:05:28 2010 +0000 r300g: fill in screen::context_create commit 407f12556d16ba0656774d8a1d9ebda22f82f473 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:04:04 2010 +0000 cell: adapt for screen::create_context, untested commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:50:24 2010 +0000 drm/nv: adapt for screen::create_context All contexts now created directly through the screen, so remove equivalent code here. Remove apparently un-needed array of contexts in the winsys. commit 53eec5b1349aa1b6892a75a7bff7e7530957aeae Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:50:08 2010 +0000 stw: adapt for screen::create_context, untested commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:49:20 2010 +0000 trace: expose the wrapped context's priv data If we are going to keep this priv idea, really want an accessor function for it so that trace and other drivers can wrap that. commit 75d6104e11d86ec2b0749627ed58e35f856ee6eb Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:47:55 2010 +0000 nv30: adapt to screen::context_create commit 12f5deb6ed9723e9b5d34577052b8365813ca14e Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:44:47 2010 +0000 nv40: adapt to screen::context_create commit 14baccaa3b6bbb3b91056126f6521828e786dc62 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:35:27 2010 +0000 nv50: adapt to screen::create_context Not build tested. Need to figure out how to build nouveau. commit a0e94505ccd2d7f3e604465a2ac302f1286b73b6 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:22:27 2010 +0000 llvmpipe: update for screen::create_context, untested commit 0eae17107c950346030e4f7e0ec232f868d3893d Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:16:57 2010 +0000 xlib/llvmpipe: remove dead winsys context creation path commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 14:58:27 2010 +0000 gallium: convert most code to use screen::create_context I wish I could build all of gallium at once to find breakages. commit d7b57f4061b82322cbcae176125913d9f0dea6c1 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 12:46:21 2010 +0000 glx: permit building with older protocol headers I'd like to be able to build mesa on current distro releases without having to upgrade from the standard dri2proto and glproto headers. With this change I'm able to build on ancient releases such as Ubuntu 9-10... In general, it would be nice to be able to build-test mesa to check for unintended breakages without having to follow the external dependencies of every group working on the codebase. commit 57adedd6fb06c98572ed8d4aef19203df4c4eea2 Merge: da71847 e1906ae Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 11:38:15 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/drivers/softpipe/sp_video_context.h src/gallium/drivers/trace/tr_context.c src/gallium/state_trackers/wgl/shared/stw_context.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c commit da71847ea6414d7e352c6094f8963bb4eda344dc Author: José Fonseca <[email protected]> Date: Sat May 2 08:57:39 2009 +0100 wgl: Use pipe_screen::context_create. commit 2595a188f93fd903600ef5d8517737ee0592035d Author: José Fonseca <[email protected]> Date: Sat May 2 08:56:47 2009 +0100 trace: Implement pipe_screen::context_create. commit f3640e4ae37a5260cbfba999d079f827de0a313a Author: José Fonseca <[email protected]> Date: Sat May 2 08:56:17 2009 +0100 softpipe: Implement pipe_screen::context_create. commit 347266bddc8bd39c711bacb2193793759d0f3696 Author: José Fonseca <[email protected]> Date: Sat May 2 08:55:31 2009 +0100 gallium: New pipe_screen::context_create callback.
* | svga: Remove unnecessary header.Vinson Lee2010-02-071-1/+0
| |
* | svga: Remove unnecessary header.Vinson Lee2010-02-031-1/+0
| |
* | Merge branch 'gallium-embedded'José Fonseca2010-02-0331-31/+34
|\ \
| * | gallium: Move p_thread.h and p_atomic.h out of gallium interfaces.José Fonseca2010-02-024-4/+4
| | | | | | | | | | | | Into os/os_thread.h and util/u_atomic.h respectively.
| * | gallium: pipe/p_inlines.h -> util/u_inlines.hJosé Fonseca2010-02-0229-27/+30
| | |
* | | svga: fix TXD and TXL opcode translationKeith Whitwell2010-02-032-15/+122
| | |
* | | svga: deriv insns not valid in dynamic flow control eitherKeith Whitwell2010-02-031-3/+48
| | |
* | | svga: texture from lod zero inside dynamic branchingKeith Whitwell2010-02-032-13/+59
| | | | | | | | | | | | | | | | | | Texture derivatives are potentially undefined inside dynamic branches, so hardwire lod zero in this case. Treating all if/endif and loop constructs as dynamic branches.
* | | svga: better method for generating white fs color outputsKeith Whitwell2010-02-036-106/+75
|/ /
* | tgsi: add caps for fragment coord conventions (v3)Luca Barbieri2010-01-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in v3: - Renumber caps to accomodate caps to add to master in the meantime - Document caps - Add unsupported caps to *_screen.c too Changes in v2: - Split for properties patch - Use positive caps instead of negative caps This adds 4 caps to indicate support of each of the fragment coord conventions. All drivers are also modifed to add the appropriate caps. Some drivers were incorrectly using non-Gallium-default conventions, and caps for them have them set so that they will behave correctly after the later state tracker patches. This drivers are softpipe/llvmpipe (uses integer rather than half integer) and pre-nv50 Nouveau (uses lower left rather than upper left). Other drivers might be broken. With this patchset, fixing them is only a matter of exposing the appropriate caps that match the behavior of the existing code. Drivers are encouraged to support all conventions themselves for better performance, and this feature is added to softpipe in a later patch.
* | svga: Remove unnecessary headers.Vinson Lee2010-01-282-2/+0
| |
* | Merge commit 'origin/perrtblend'Roland Scheidegger2010-01-281-9/+9
|\ \ | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
| * | svga: adapt to blend changesRoland Scheidegger2010-01-251-9/+9
| | |
* | | gallium: Enable multiple constant buffers for vertex and geometry shaders.Michal Krol2010-01-281-1/+1
| | |
* | | 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.