summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nvfx
Commit message (Collapse)AuthorAgeFilesLines
* nvfx: support proper shader linkage - adds glsl supportLuca Barbieri2010-08-217-88/+211
|
* nvfx: rewrite draw code and buffer codeLuca Barbieri2010-08-2119-826/+1357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a full rewrite of the drawing and buffer management logic. It offers a lot of improvements: 1. A copy of buffers is now always kept in system memory. This is necessary to allow software processing of them, which is necessary or improves performance in many cases. 2. Support for pushing vertices on the FIFO, with index lookup if necessary. 3. "Smart" draw code that tries to intelligently choose the cheapest way to draw something: whether to use inline vertices or hardware vertex buffer, and whether to use hardware index buffers 4. Support for all vertex formats supported by the hardware 5. Usage of translate to push vertices, supporting all formats that are sensible to use as vertex formats 6. Support for base vertex 7. Usage of Ben Skeggs' primitive splitter originally for nv50, allowing correct splitting of line loops, triangle fans, etc. 8. Support for instancing 9. Precomputation using the vertex elements CSO Thanks to Ben Skeggs for his primitive splitter originally for nv50. Thanks to Christoph Bumiller for his nv50 push code, that was the basis of this work, even though I changed his code dramatically, in particular to replace his ad-hoc vertex data emitter with translate. The changes could also go into nv50 too, but there are substantial differences due to the additional nv50 hardware features.
* nvfx: refactor sampling code, add support for swizzles and depth texLuca Barbieri2010-08-218-393/+521
| | | | | | | | | | | | | | | | | | | | | | This is a significant refactoring of the sampling code that: - Moves all generic functions in nvfx_fragtex.c - Adds a driver-specific sampler view structure and uses it to precompute texture setup as it should be done - Unifies a bit more of code between nv30 and nv40 - Adds support for sampler view swizzles - Support for specifying as sampler view format different from the resource one (only trivially) - Support for sampler view specification of first and last level - Support for depth textures on nv30, both for reading depth and for compare - Support for sRGB textures - Unifies the format table between nv30 and nv40 - Expands the format table to include essentially all supportable formats except mixed sign and "autonormal" formats - Fixes the "is format supported" logic, which was quite broken, and makes it use the format table Only tested on nv30 currently.
* nvfx: new 2D: unify textures and buffersLuca Barbieri2010-08-214-137/+46
| | | | Stop using the vtbl, and use real transfers for buffers too.
* nvfx: new 2D: use a CPU copy for up to 4 pixels, up from 0Luca Barbieri2010-08-211-5/+1
| | | | | | | | Seems a reasonable threshold for now. Significantly speeds up Piglit's 1x1 glReadPixels (but, you know, reading pixels in 1x1 blocks is NOT a good idea, especially if you might be running on a less-than-perfect driver).
* nvfx: new 2D: new render temporaries with resourcesLuca Barbieri2010-08-218-146/+408
| | | | | | | | | | | | This patch adds support for creating temporary surfaces to allow rendering to surfaces that cannot be rendered to. It uses the _second_ version of the render temporary infrastructure. This is necessary for swizzled 3D textures and small mipmaps of swizzled 2D textures. This version of the patch creates a resource to use as a temporary instead of a raw BO, making the code simpler.
* nv30: new 2D: support ARB_texture_rectangleLuca Barbieri2010-08-212-3/+36
| | | | This uses nv30's _RECT formats.
* nvfx: new 2D: optimize fragtex format lookupLuca Barbieri2010-08-212-50/+10
| | | | Use an array indexed by the pipe format instead of doing a linear scan.
* nvfx: new 2D: enable swizzling for all surfacesLuca Barbieri2010-08-211-17/+4
| | | | | | | Now that the new 2D code is in place, swizzling can be safely enabled. Render temporaries are needed in some cases, so this may degrade nv30 a bit until it gets render temporaries too.
* nvfx: new 2D: use new 2D engine in GalliumLuca Barbieri2010-08-2110-626/+340
| | | | | | | | | | This patch implements nv04_surface_copy/fill using the new 2D engine module. It supports falling back to the 3D engine using the u_blitter module, which will be added in a later patch. Also adds support for using the 3D engine, reusing the u_blitter module created for r300. This is used for unswizzling and copies between swizzled surfaces.
* nv04-nv40: new 2D: add new Gallium-independent 2D engineLuca Barbieri2010-08-214-0/+1478
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch add a brand new nv04-nv40 2D engine module. It should correctly implement all operations involving swizzled, and 3D-swizzled surfaces. This code is independent from the Gallium framework and can thus be reused in the DDX and classic Mesa drivers (it's only likely to be useful in the latter, though). Currently, surface_copy and surface_fill are broken for 3D textures, for swizzled source textures and possibly for some misaligned cases The code is based around the new nv04_region structure, which encapsulates the information from pipe_surface needed for the 2D engine and CPU copies. The use of nv04_region makes the code independent of the Gallium framework and allows to transform the nv04_region without clobbering the nv04_region. The existing M2MF, blitter, and SWIZZLED_SURFACE paths have been improved and a new CPU path has been added. There is also support to tell the caller to use the 3D engine. The main feature of the copy/fill setup algorithm is linearization/contiguous-linearization of swizzled surfaces. The idea of linearization is that some swizzled surfaces are laid out like linear ones (1xN, 2xN, Nx1) and can thus be used as such (e.g. useful for copying single pixels). Also, some rectangles (e.g. the whole surface) are contiguous in memory. If both the source and destination rectangles are swizzled but contiguous, then they can be regarded as both linear: this is the idea of "contiguous linearization". This, for instance, allows to use the 2D engine to duplicate the content of a swizzled surface to another swizzled surface, by pretending they are actually linear. After linearization, the result may not be 64-byte aligned. Another transformation is done to enlarge the linear surface so that it becomes 64-byte aligned. This is also used to 64-byte align swizzled texture mipmaps. The inner loop of the CPU path is as optimized as possible without using SSE/SSE2. Future improvements could include SSE/SSE2 support, and possibly a faster coordinate swizzling algorithm (which is however not used in the inner loop). It may be a good idea to autogenerate swizzling code at least for all possible POT 2D texture dimensions (less than 256), maybe for all 3D ones too (less than 4096). Also, it woud be a very good idea to make a copy with the GPU first if the source surface is in uncached memory.
* nvfx: new 2D: rewrite transfer code to use staging transfersLuca Barbieri2010-08-213-173/+61
| | | | | | | This greatly simplifies the code, and avoids ad-hoc copy code. Also, these new transfers work for buffers too, even though they are still used for miptrees only.
* nvfx: new 2D: rewrite miptree code, adapt transfersLuca Barbieri2010-08-216-224/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Disable swizzling on non-RGBA 2D textures, since the current 2D code is mostly broken in those cases. A later patch will fix this. Thanks to Andrew Randrianasulu who reported this. - Fix compressed texture transfers and hack around the current 2D code inability to copy compressed textures by using direct access. Thanks to Andrew Randrianasulu who reported this. This patch rewrites all the miptree layout and transfer code in the nvfx driver. The current code is broken in several ways: 1. 3D textures are laid out first by face, then by level, which is incorrect 2. Cube maps should have 128-byte aligned faces 3. Swizzled textures have a strange alignment test that seems unnecessary 4. We store the image_offsets for each face/slice but they can be easily computed instead 5. "Swizzling" is not supported for compressed formats. They can be "swizzled" but swizzling only means that there are no gaps (pitch is level-dependant) and the layout is still linear 6. Swizzling is not supported for non-RGBA formats. All formats (except possibly depth) can be swizzled according to my testing. The miptree layout is rewritten based on my empirical testing, which I posted in the "miptree findings" mail. The image_offset array is removed, since it can be calculated with a simple multiplication; the only array in the miptree structure is now the one for mipmap level starts, which it seems cannot be easily computed in constant time. Also, we now directly store a nouveau_bo instead of a pipe_buffer in the miptree structure, like nv50 does. Support for render temporaries is removed, and will be readded in a later patch. Note that the current temporary code is broken, because it does not copy the temporary back on render cache flushes.
* nvfx: add nouveau_resource_on_gpuLuca Barbieri2010-08-211-1/+15
| | | | | | Add a function to get whether a resource is likely on the GPU or not. Currently always returns TRUE.
* nvfx: add linear flag for buffersLuca Barbieri2010-08-214-2/+5
|
* nvfx: properly unreference bound objects on context destructionLuca Barbieri2010-08-211-0/+8
|
* nvfx: reference count bound objectsLuca Barbieri2010-08-211-7/+29
|
* nvfx: fix format support code for compressed textureLuca Barbieri2010-08-211-1/+1
| | | | A source line was put in the wrong place.
* gallium: make all checks for PIPE_TEXTURE_2D check for PIPE_TEXTURE_RECT tooLuca Barbieri2010-08-203-1/+4
| | | | | | | Searched for them with: git grep -E '[!=]=.*PIPE_TEXTURE_2D|PIPE_TEXTURE_2D.*[!=]=|case.*PIPE_TEXTURE_2D' Behavior hasn't been changed.
* nvfx: fix nv30 vertex program scalar opcodesLuca Barbieri2010-08-061-1/+7
| | | | | | | Apparently they have always been broken, even before unification. Fixes a lot of stuff, starting from morph3d and lighting in teapot with textures disabled.
* nvfx: shut up unknown cap 64 warningLuca Barbieri2010-08-061-0/+2
|
* gallium: Keep only pipe_context::draw_vbo.Chia-I Wu2010-07-293-11/+2
| | | | | | | That is, remove pipe_context::draw_arrays, pipe_context::draw_elements, pipe_context::draw_arrays_instanced, pipe_context::draw_elements_instanced, pipe_context::draw_range_elements.
* gallium: Implement draw_vbo and set_index_buffer for all drivers.Chia-I Wu2010-07-294-7/+53
| | | | | | | | | | | | | | | Some drivers define a generic function that is called by all drawing functions. To implement draw_vbo for such drivers, either draw_vbo calls the generic function or the prototype of the generic function is changed to match draw_vbo. Other drivers have no such generic function. draw_vbo is implemented by calling either draw_arrays and draw_elements. For most drivers, set_index_buffer does not mark the state dirty for tracking. Instead, the index buffer state is emitted whenever draw_vbo is called, just like the case with draw_elements. It surely can be improved.
* nvfx: Move declaration before code.Vinson Lee2010-07-241-2/+3
|
* nouveau/nvfx: Add new PIPE_CAP valuesPatrice Mandin2010-07-211-0/+4
| | | | Signed-off-by: Patrice Mandin <[email protected]>
* nvfx: fix typo from gallium-msaa mergeBen Skeggs2010-06-091-1/+1
|
* gallium: adjust the query interface to support custom typesZack Rusin2010-06-081-1/+2
| | | | we need to change it to support composite types
* gallium: rename clearRT / clearDS to clear_render_target / clear_depth_stencilRoland Scheidegger2010-06-031-14/+14
| | | | | more consistent with rest of gallium naming conventions. Also rename driver-internal names for these the same.
* nvfx: adapt to clear interface changesRoland Scheidegger2010-05-292-11/+29
|
* Merge branch 'gallium-msaa'Roland Scheidegger2010-05-216-18/+47
|\ | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_gen_mipmap.c src/mesa/state_tracker/st_texture.c
| * gallium: implement set_sample_mask() in all driversRoland Scheidegger2010-05-181-0/+7
| | | | | | | | | | | | | | | | prevents segfault when state trackers try to set default mask. Other option would be to make this required only for drivers supporting multisampling, but this seems more clean. Only dummy implementations (for normal drivers) provided (no driver supports multisampling yet neither).
| * nouveau: adapt to interface changesRoland Scheidegger2010-05-175-18/+40
| | | | | | | | | | this probably needs further cleanup (just getting a surface for the resource seems quite nonoptimal and potentially cause unnecessary copies I think)
* | nouveau/nvfx: Fill more PIPE_CAP_MAX_ valuesPatrice Mandin2010-05-211-13/+14
| | | | | | | | Signed-off-by: Patrice Mandin <[email protected]>
* | Merge branch 'gallium-front-ccw'Keith Whitwell2010-05-211-50/+23
|\ \
| * | gallium: more work on ccw flag removalKeith Whitwell2010-05-141-1/+1
| | | | | | | | | | | | The linux-debug target builds...
| * | gallium: convert rasterizer state to use gl-style front/back conceptsKeith Whitwell2010-05-141-50/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use front/back instead of cw/ccw throughout. Also, use offset_point/line/fill instead of offset_cw/ccw. Brings gallium representation of this state into line with its main user, and also what turns out to be the most common hardware representation. This fixes a long-standing bias in the interface towards the architecture of the software rasterizer.
* | | gallium: EXT_timer_query support.Mathias Fröhlich2010-05-171-0/+2
| | | | | | | | | | | | Signed-off-by: Corbin Simpson <[email protected]>
* | | nouveau/nvfx: Define some capabilities for shadersPatrice Mandin2010-05-141-0/+38
|/ / | | | | | | Signed-off-by: Patrice Mandin <[email protected]>
* | gallium: Make PIPE_CAP_xxx enums.José Fonseca2010-05-121-2/+2
| |
* | nouveau: only advertise PIPE_FORMAT_DXT* if s3tc availableXavier Chantry2010-05-051-4/+12
|/
* nvfx: Move src/gallium/drivers to beginning of SCons include path.Vinson Lee2010-04-271-1/+1
| | | | | | | | | | | | libdrm-2.4.20 and earlier include the nouveau/nouveau_class.h header. A later version of libdrm will not ship this header. Mesa also has this header at src/gallium/drivers. The symbol NV34TCL_VTXFMT_TYPE_HALF is needed by nvfx_vbo.c. This symbol is not in the libdrm copy of the header but is in the Mesa copy of the header. This patch moves src/gallium/drivers to the beginning of the include paths such that when building on hosts with libdrm-2.4.20 or ealier the build uses the copy in Mesa.
* nvfx: Add include path to SCons build.Vinson Lee2010-04-251-0/+4
|
* nvfx: Add missing header.Vinson Lee2010-04-251-0/+1
|
* nvfx: Add to SCons build.Vinson Lee2010-04-241-0/+36
|
* gallium: replace pipe_resource::_usage with pipe_resource::usageBrian Paul2010-04-204-7/+7
|
* nvfx: Fix typo.José Fonseca2010-04-201-1/+1
|
* Merge branch 'gallium-index-bias'José Fonseca2010-04-203-16/+24
|\
| * nvfx: Adapt for index bias interface change.José Fonseca2010-04-193-16/+24
| |
* | Merge branch '7.8'Brian Paul2010-04-192-2/+3
| | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/drivers/llvmpipe/lp_context.c
* | nvfx: Fix include recursion.Vinson Lee2010-04-181-1/+2
| | | | | | | | | | Don't include nvfx_context.h and use a forward reference instead. nvfx_context.h includes nvfx_screen.h (itself).