summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv40
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gallium-vertexelementcso'Roland Scheidegger2010-03-094-13/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * nv40: adapt to vertex element csoRoland Scheidegger2010-03-014-13/+40
| |
* | Squashed commit of gallium-no-texture-blanketKeith Whitwell2010-03-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f90b3f01af82b9522067b1824e21709a6fb2d3af Author: Keith Whitwell <[email protected]> Date: Mon Mar 8 14:39:44 2010 +0000 gallium: remove p_screen::surface_buffer_create This isn't very useful without texture_blanket(), which has also been removed. Note that this function hasn't been removed from the old pipe_winsys (u_simple_screen) still used internally by some drivers (eg softpipe). commit 6c462de39a4b9980a5f034a95e580efdfcb8173b Author: Keith Whitwell <[email protected]> Date: Mon Mar 8 14:27:40 2010 +0000 egl/x11: disable texture_blanket usage commit b42da9160df9f47224e5b3291b972f41767aa6e5 Merge: 4be2436 3ca9336 Author: Keith Whitwell <[email protected]> Date: Mon Mar 8 14:27:24 2010 +0000 Merge commit 'origin/master' into gallium-no-texture-blanket Conflicts: src/gallium/drivers/svga/svga_screen_texture.c commit 4be2436316929e3dfc55bc34d810920c06556b66 Author: Keith Whitwell <[email protected]> Date: Thu Mar 4 14:59:26 2010 +0000 gallium: remove texture blanket call No longer needed, except for nouveau and egl/xll/native_ximage.c. Fix for nouveau is to keep the call, but move it to an internal function within nouveau. Fix for that egl/x11 relies on gallium-sw-api branch or its successor. commit 69b6764330367d63c237d0bde9fb96435d0e0257 Author: Keith Whitwell <[email protected]> Date: Thu Mar 4 13:35:16 2010 +0000 drm_api: wrap comment
* | nv: define NV30/40/50_MAX_TEXTURE_LEVELSBrian Paul2010-03-081-1/+3
| |
* | Merge commit 'origin/gallium-winsys-handle-rebased'Keith Whitwell2010-03-081-2/+2
|\ \
| * | nouveau: s/TEXTURE_USAGE_PRIMARY/TEXTURE_USAGE_SCANOUTChristoph Bumiller2010-03-051-2/+2
| | |
* | | nouveau: Rename pipe formats.José Fonseca2010-03-021-7/+7
| | | | | | | | | | | | | | | These format uses were being hiden by pre-processor magic and were missed in the previous search'n'replace.
* | | Merge branch 'gallium-format-cleanup'José Fonseca2010-03-023-17/+17
|\ \ \
| * | | nouveau: Rename pipe formats.José Fonseca2010-03-013-17/+17
| |/ /
* | | Merge branch 'gallium-no-rhw-position'Michal Krol2010-03-022-45/+13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_state_derived.c
| * | gallium: Remove bypass_vs_clip_and_viewport from rasteriser state.Michal Krol2010-02-222-45/+13
| | | | | | | | | | | | Needs testing.
* | | nv40: fix include of nv04_surface_2d.hChristoph Bumiller2010-02-261-1/+1
| | |
* | | gallium/nouveau: clean-up #includesBrian Paul2010-02-262-8/+8
|/ /
* | nv40: Fix incorrect so_new() numbering.Francisco Jerez2010-02-161-1/+1
| |
* | nv40: Implement PIPE_CAP_MAX_COMBINED_SAMPLERS.Francisco Jerez2010-02-161-0/+2
|/
* nv: Use util_format_name().José Fonseca2010-02-142-3/+6
|
* Merge branch 'gallium-dynamicstencilref'Roland Scheidegger2010-02-124-13/+54
|\
| * gallium: make max_anisotropy a unsigned bitfield memberRoland Scheidegger2010-02-121-7/+7
| | | | | | | | | | | | | | saves us a dword in sampler state, hw can't do non-integer aniso degree anyway. To allow aniso 1x (which seems of dubious value but some hardware (radeons) have such a mode, and even d3d allows specifiying it) redefine anisotropic filtering as disabled only if max_anistropy is 0.
| * nouveau: fix compile errors...Roland Scheidegger2010-02-111-4/+4
| |
| * nv40: adapt to stencil ref changesRoland Scheidegger2010-02-114-6/+47
| |
* | nouveau: use AVAIL_RING()Ben Skeggs2010-02-122-8/+7
| |
* | nouveau: remove u_simple_screen.h includesBen Skeggs2010-02-111-1/+0
|/
* Merge branch 'gallium-nopointsizeminmax'Roland Scheidegger2010-02-091-2/+2
|\ | | | | | | | | | | | | 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-1/+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-2/+2
| | | | | | | | | | | | | | | | | | | | 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: squash-merge of gallium screen contextKeith Whitwell2010-02-085-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | nouveau: Fix warning for void function returning value. Add missing include ↵Patrice Mandin2010-02-051-2/+2
| | | | | | | | | | | | for pipe_reference_init function. Signed-off-by: Patrice Mandin <[email protected]>
* | Nuke the nv0x-nv2x gallium pipe drivers.Francisco Jerez2010-02-042-2/+2
| |
* | nouveau: include stdio.h and u_inlines.h in all context files since embedded ↵Dave Airlie2010-02-041-0/+3
| | | | | | | | | | | | | | | | changes fixes nouveau build for me. Signed-off-by: Dave Airlie <[email protected]>
* | gallium: Move deprecated pipe/internal/p_winsys_screen.h inside ↵José Fonseca2010-02-021-1/+1
| | | | | | | | util/u_simple_screen.h
* | gallium: pipe/p_inlines.h -> util/u_inlines.hJosé Fonseca2010-02-028-8/+8
| |
* | nv50/nv40/nv30: fix small memory leak of nouveau_resources on screen_destroyMarcin Slusarz2010-02-011-3/+3
| | | | | | | | Signed-off-by: Francisco Jerez <[email protected]>
* | tgsi: add caps for fragment coord conventions (v3)Luca Barbieri2010-01-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge commit 'origin/perrtblend'Roland Scheidegger2010-01-282-11/+15
|\ \ | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
| * | gallium: add the new PIPE_CAP blend bits to more driversRoland Scheidegger2010-01-261-0/+4
| | | | | | | | | | | | some drivers will complain if they don't know the cap bit
| * | nouveau: adapt drviers to blend changesRoland Scheidegger2010-01-251-11/+11
| | |
* | | gallium: Enable multiple constant buffers for vertex and geometry shaders.Michal Krol2010-01-281-1/+1
|/ /
* | Merge branch 'gallium-noconstbuf'Roland Scheidegger2010-01-151-3/+3
|\ \ | |/ |/| | | | | | | 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-3/+3
| |
* | nouveau: rewrite nouveau_stateobj to use BEGIN_RING properlyMaarten Maathuis2010-01-0511-18/+17
| | | | | | | | | | | | | | | | | | - The previous solution was hacky and didn't do subchannel autobinding. - The beheaviour should match what libdrm_nouveau does closely. - The solution remains statically sized, but when debugging is on it will check for abuse. Signed-off-by: Maarten Maathuis <[email protected]>
* | nouveau: kill nouveau_push.h and use libdrm versions of BEGIN_RINGs, etcMarcin Slusarz2010-01-057-103/+133
| |
* | Merge commit 'origin/gallium-draw-retval'Keith Whitwell2010-01-053-20/+15
|\ \ | | | | | | | | | | | | Conflicts: src/gallium/drivers/identity/id_context.c
| * | gallium: propogate draw retval changes into more driversKeith Whitwell2009-12-213-20/+15
| | |
* | | nouveau: Fix glTexSubImage on swizzled surfaces on <=NV40Luca Barbieri2009-12-301-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently in nvXX_transfer_new a temporary as large as the surface is created. If the subrectangle is not the whole texture we would need to read back the whole texture, but we aren't. Thus, everything but the subrectangle specified is loaded as garbage. This can be seen in progs/demos/ray. This patch fixes the problem by creating a temporary that covers only the desired subrectangle. That makes us hit an alignment assert in nv04_surface_2d.c. Fix it using the point registers instead of manipulating the swizzled surface offset to account for the destination coordinates (which do not seem to have a 1024 limit). Signed-off-by: Francisco Jerez <[email protected]>
* | | nouveau: Unreference state/buffer objects on context/screen destruction.Younes Manton2009-12-283-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | - unreference state objects so that buffer objects are unreferenced and eventually destroyed - free channel at screen's destruction Based on Krzysztof Smiechowicz's patch.
* | | nouveau: Fix nv20-40 swizzled miptree RTsLuca Barbieri2009-12-282-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I just coded a patch that does this and seems to work fine. It must be fixed since it breaks OpenGL (or the state tracker can be changed, but it seems better to do it in the driver). The patch also fixes NV20 and NV30 in the same way. They compile but are untested. I would guess that using the 3D engine is faster for the larger levels, but the 2D engine is faster for the smaller ones (and lacks this issue).
* | | NV30/NV40 CMP and SCS src == dst handlingLuca Barbieri2009-12-281-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | CMP and SCS can produce incorrect results if the source and destination are the same. This patch should fix the issues. CMP is fixed by predicating both moves. SCS by changing the order if the source component is X.
* | | gallium: add geometry shader support to galliumZack Rusin2009-12-251-2/+3
| |/ |/|
* | Merge branch 'gallium-edgeflags'Roland Scheidegger2009-12-225-18/+4
|\ \ | |/ |/| | | | | Conflicts: src/mesa/state_tracker/st_draw.c
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 22:31:04 +0000