Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'glsl-pp-rework-2' | Michal Krol | 2009-12-17 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' into glsl-pp-rework-2 | Michal Krol | 2009-12-12 | 761 | -43888/+59630 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/perf/drawoverhead.c progs/perf/teximage.c progs/perf/vbo.c progs/perf/vertexrate.c src/mesa/shader/slang/library/slang_common_builtin_gc.h | ||||
| * | | scons: Get GLSL code building correctly when cross compiling. | José Fonseca | 2009-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This is quite messy. GLSL code has to be built twice: one for the host OS, another for the target OS. | ||||
| * | | gdi: Link to glslcl. | Michal Krol | 2009-11-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'origin/master' into glsl-pp-rework-2 | Michal Krol | 2009-09-17 | 73 | -939/+1788 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/gallium/winsys/gdi/SConscript | ||||
| * \ \ | Merge commit 'origin/master' into glsl-pp-rework-2 | Michal Krol | 2009-09-14 | 92 | -834/+3841 |
| |\ \ \ | |||||
| * | | | | gdi: Fix prototype of gdi_softpipe_surface_buffer_create(). | Michal Krol | 2009-09-08 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | gdi: Add glsl to LIBS. | Michal Krol | 2009-09-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | llvmpipe: add LP_DEBUG env var | José Fonseca | 2009-12-16 | 3 | -59/+151 |
| | | | | | | | | | | | | | | | | | | | | Cherry-picked from dec35d04aeb398eef159aaf8cde5e0d04622b811. | ||||
* | | | | | llvmpipe: fix broken TGSI_OPCODE_FRC codegen | Brian Paul | 2009-12-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | llvmpipe: fix broken lp_build_abs() | Brian Paul | 2009-12-16 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | r300g: fix emission of which textures are enabled | Marek Olšák | 2009-12-15 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes most of the "Bad CS" issues in piglit/texCombine and piglit/fbo. Some other issues of this kind will get fixed in the kernel soon (depth-only rendering, S3TC, and RGTC). | ||||
* | | | | | r300g: clean up the invariant state | Marek Olšák | 2009-12-15 | 1 | -10/+3 |
| | | | | | |||||
* | | | | | r300g: clamp vertex indices to [min,max] everywhere | Marek Olšák | 2009-12-15 | 2 | -7/+6 |
| | | | | | |||||
* | | | | | r300g: if no colorbuffers are set, disable blending and set the color mask to 0 | Marek Olšák | 2009-12-15 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | This seems to be the only way to disable the first colorbuffer. | ||||
* | | | | | r300g: set the number of colorbuffers in RB3D_CCTL | Marek Olšák | 2009-12-15 | 3 | -3/+6 |
| | | | | | |||||
* | | | | | r300g: remove unnecessary flush in set_sampler_textures | Marek Olšák | 2009-12-15 | 1 | -2/+0 |
| | | | | | |||||
* | | | | | r300g: add Z24X8 to the list of unsupported sampler formats on R3xx-R4xx | Marek Olšák | 2009-12-15 | 1 | -1/+7 |
| | | | | | |||||
* | | | | | r300g: add acceleration of the clear, surface_copy, and surface_fill functions | Marek Olšák | 2009-12-15 | 7 | -45/+162 |
| | | | | | |||||
* | | | | | r300g: flush CS if a buffer being deleted is referenced by it | Marek Olšák | 2009-12-15 | 3 | -0/+8 |
| | | | | | |||||
* | | | | | util/blitter: kill the draw_quad callback | Marek Olšák | 2009-12-15 | 2 | -25/+6 |
| | | | | | |||||
* | | | | | util/blitter: allocate most of the state objects on-demand | Marek Olšák | 2009-12-15 | 1 | -75/+179 |
| | | | | | |||||
* | | | | | util/blitter: use PIPE_MAX_* limits, and fix a memory leak | Marek Olšák | 2009-12-15 | 1 | -13/+27 |
| | | | | | |||||
* | | | | | pipe: add PIPE_MAX_TEXTURE_TYPES | Marek Olšák | 2009-12-15 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | util: add blitter | Marek Olšák | 2009-12-15 | 4 | -0/+851 |
| | | | | | |||||
* | | | | | util: add a function which converts 2D coordinates to cubemap coordinates | Marek Olšák | 2009-12-15 | 5 | -52/+161 |
| | | | | | | | | | | | | | | | | | | | | The code was taken over from u_gen_mipmap. | ||||
* | | | | | util: add new fragment shaders to simple_shaders | Marek Olšák | 2009-12-15 | 4 | -12/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New shaders: * Fragment shader which writes depth sampled from a texture * Fragment shader which copies COLOR[0] to multiple render targets Additional improvements: * The fragment 'tex' shaders now take a sampler type (TGSI_TEXTURE_*) so that they can sample from any type of texture, not only from a 2D one. | ||||
* | | | | | llvmpipe: Fix yet another copynpaste typo in lp_build_log2_approx. | José Fonseca | 2009-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Now fslight looks perfect. | ||||
* | | | | | llvmpipe: Fix lp_build_polynomial comment. | José Fonseca | 2009-12-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | llvmpipe: Fix typo in lp_build_log constant. | José Fonseca | 2009-12-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | util: Fix unity value for swizzle 1. | José Fonseca | 2009-12-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be 255 for ubytes, and not 1. Thanks Michal for spotting this. | ||||
* | | | | | llvmpipe: Fix bad SI -> FP conversion into lp_build_log2_approx. | José Fonseca | 2009-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | It should be a bitcast as the integer value is actually an encoded FP already. | ||||
* | | | | | util: Add dl wrappers. | José Fonseca | 2009-12-15 | 4 | -0/+142 |
| | | | | | | | | | | | | | | | | | | | | Borrowed from Mesa, slightly changed for more type safety. | ||||
* | | | | | tgsi/text: Don't use strncasecmp(), it breaks windows build. | Michal Krol | 2009-12-15 | 1 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | Also, break out of the for-loop when a matching property is found. | ||||
* | | | | | tgsi: add properties and system value register | Zack Rusin | 2009-12-14 | 18 | -21/+475 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds support for properties to all parts of the tgsi framework, plus introduces a new register which will be used for system generated values. | ||||
* | | | | | nouveau: avoid running out of relocs | Maarten Maathuis | 2009-12-14 | 11 | -18/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added flush notify functions for NV30 and NV40. - Flushing mid frame will call flush notify, which will resubmit all relocs. - We don't try to recover from reloc failure yet. | ||||
* | | | | | nv50: be more cautious about using reg_instance | Christoph Bumiller | 2009-12-14 | 1 | -17/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to free part of nv50_pc->reg_instances[] for an nv50_reg representing an indirect constant resulted in a segmentation fault. | ||||
* | | | | | tgsi/ureg: Add ureg_DECL_gs_input(). | Michal Krol | 2009-12-14 | 2 | -2/+33 |
| | | | | | | | | | | | | | | | | | | | | Allows one to declare GS input registers. | ||||
* | | | | | nv50: store immediates as uint32 | Christoph Bumiller | 2009-12-14 | 2 | -33/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes we want non-float immediates, hacking them into floats isn't nice. Sorry, this should have already been committed before. | ||||
* | | | | | nouveau: nv50: Add missing ctor_immd_4u32 function | Patrice Mandin | 2009-12-13 | 1 | -2/+15 |
| | | | | | |||||
* | | | | | nv50: add proper zslice offset in miptree_surface | Christoph Bumiller | 2009-12-13 | 2 | -20/+21 |
| | | | | | |||||
* | | | | | nv50: use m2mf z pos instead of calculating offset manually | Christoph Bumiller | 2009-12-13 | 1 | -13/+10 |
| | | | | | |||||
* | | | | | nv50: add craziness for non-constant TXB and TXL | Christoph Bumiller | 2009-12-13 | 1 | -44/+204 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If lod or bias can be non-constant across a quad of fragments, we need to execute TEX separately for each value. Don't ask why. | ||||
* | | | | | Revert "nouveau: nv30: Disable swizzled surface usage if any dimension is 1 ↵ | Patrice Mandin | 2009-12-12 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Warsow creates a 1x1 front buffer)" This reverts commit ec7844537ecdb0b598447e37bf0b7120acd029f3. | ||||
* | | | | | nouveau: nv30: Disable swizzled surface usage if any dimension is 1 (Warsow ↵ | Patrice Mandin | 2009-12-12 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | creates a 1x1 front buffer) | ||||
* | | | | | nv50: support TXB and TXL | Christoph Bumiller | 2009-12-12 | 2 | -57/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and don't set the 'live' flag for TEX anymore, we'd have to know if results affect the inputs for another TEX, and I'm not going to do that kind of analysis now. | ||||
* | | | | | nv50: add S8Z24 depth texture format too | Christoph Bumiller | 2009-12-12 | 3 | -0/+3 |
| | | | | | |||||
* | | | | | nv50: fix depth comparison func TSC bits | Christoph Bumiller | 2009-12-12 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately it seems that if depth comparison is active and we read a 2D texture, i.e. provide only 2 inputs, the second is used for comparison ... | ||||
* | | | | | nv50: add src_mask case for IF opcode | Christoph Bumiller | 2009-12-12 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | nv50: plug memory leak in miptree creation/destruction | Christoph Bumiller | 2009-12-12 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeping this dynamically allocated for texture arrays. Since we don't use it to store zslice offsets anymore it's either 1 or 6 integers (cube) ... |