summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* i915: Silence warningsJakob Bornecrantz2008-11-163-4/+8
|
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-11-1523-500/+935
|\ | | | | | | | | | | Conflicts: src/mesa/shader/prog_print.c
| * mesa: no longer need Writemask field in GLSL IR nodesBrian Paul2008-11-134-69/+23
| | | | | | | | The Swizzle and Size fields carry all the info we need now.
| * mesa: revamp GLSL instruction emit codeBrian Paul2008-11-131-244/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a step toward better array handling code. In particular, when more than one operand of an instruction uses indirect addressing, we'll need some temporary instructions and registers. By converting IR storage to instruction operands all in one place (emit_instruction()) we can be smarter about this. Also, somewhat better handling of dst register swizzle/writemask handling. This results in tighter writemasks on some instructions which is good for SOA execution. And, cleaner instruction commenting with inst_comment(). Next: remove some more dead code and additional clean-ups...
| * mesa: make writemask_string() non-staticBrian Paul2008-11-132-4/+7
| |
| * mesa: remove some do-nothing GLSL codeBrian Paul2008-11-131-16/+0
| |
| * mesa: fix accidental regression in GLSL built-in texture matrix lookupBrian Paul2008-11-131-0/+1
| | | | | | | | Was broken by commit 9aca9a4b72b2a7b378e50bd88f9c3324d07375ec.
| * mesa: use the tighter definition of GLSL ftransform() from the gallium branchesBrian Paul2008-11-132-31/+40
| |
| * mesa: remove unused/obsolete __NormalMatrixTranspose matrixBrian Paul2008-11-133-188/+184
| |
| * mesa: fix bug in GLSL built-in matrix state lookupBrian Paul2008-11-131-2/+5
| |
| * mesa: tweak program register printing for RelAddr caseBrian Paul2008-11-131-1/+1
| |
| * mesa: fix generation of fixed function state when no vp existsAlan Hourihane2008-11-131-43/+41
| |
| * i965: Upload state on primitive switch, don't just prepare it.Eric Anholt2008-11-121-0/+1
| | | | | | | | | | This was a regression in 59b2c2adbbece27ccf54e58b598ea29cb3a5aa85 that broke blender, among other apps.
| * i965: Fix VB refcount leak on aperture overflow.Eric Anholt2008-11-121-0/+1
| |
| * Add glsync demo program from jbarnes for testing vblank synchronization.Eric Anholt2008-11-123-0/+275
| |
| * i965: Fix up VS max_threads for G4X and removing a magic number.Eric Anholt2008-11-121-2/+14
| | | | | | | | | | | | As far as I can read in the docs, VS threads can be 1:1 with the pairs of VUE handles allocated for them. Also, G4X can run twice as many threads as before (though we won't unless the we bump the preferred URB entries for VS).
| * i965: Fix up SF max_threads.Eric Anholt2008-11-121-1/+2
| | | | | | | | | | | | We were dividing the number of URB entries by two to get number of threads, which looks suspiciously like a copy'n'paste-o from brw_vs_state.c. Also, the maximum number of threads is 24, not 12.
| * i965: Fix up clip min_nr_entries, preferred_nr_entries, and max_threads.Eric Anholt2008-11-122-2/+16
| | | | | | | | | | | | | | | | | | The clip thread could potentially deadlock when processing tristrips since being moved back to dual-thread mode, as the two threads could each have 4 VUEs referenced and not be able to allocate another one since SF processing wasn't able to continue (needing 5 entries before it freed 2). In constrained URB mode, similar deadlock could even have occurred with polygons (so we cut back max_threads if we can't handle it any primitive type).
| * i965: Update WM maximum threads for G4X.Eric Anholt2008-11-121-2/+7
| |
| * i965: Add a big comment explaining my understanding of URB management.Eric Anholt2008-11-121-1/+38
| | | | | | | | | | It shouldn't offer anything new over what's in the docs (except for G4X notes), but here it's all in one place.
| * glFlush before CopySubBuffer, fix coordinates and extension name typo.Kristian Høgsberg2008-11-123-2/+8
| |
| * glx: fix xcb buildHanno Böck2008-11-121-0/+5
| |
* | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-11-1512-118/+1276
|\ \ | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c
| * | gallium: increase table size for fast log/pow functionsBrian Paul2008-11-142-4/+6
| | | | | | | | | | | | The various conformance tests pass now.
| * | util: Use OpenGL rasterization rules in blits and mipmap generation.Brian Paul2008-11-142-0/+2
| | |
| * | translate: pull in prefetch and other optimizations from draw_vs_aos.cKeith Whitwell2008-11-142-112/+204
| | |
| * | trivial: more testsKeith Whitwell2008-11-148-0/+1064
| | |
| * | util: Optimise log2().Michal Krol2008-11-121-1/+2
| | |
| * | util: Add log2() definition for MSC.Michal Krol2008-11-121-0/+5
| | |
| * | draw: Add missing include.Michal Krol2008-11-121-0/+1
| | |
| * | mesa: restore the negate flag of dots in build_lighting.Xiang, Haihao2008-11-111-0/+3
| | | | | | | | | | | | | | | Dots is re-used if more than one light is enabled. Previously the negate flag of dots may affect next light.
| * | gallium: fix comment again. A half-closed interval was intended.Brian2008-11-101-2/+2
| | | | | | | | | | | | Never saw the [a,b[ notation before.
| * | dri: alloc __DRIscreen object with calloc()Brian Paul2008-11-101-1/+1
| | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c
| * | mesa: fix logic error in GLSL linker when looking for main() shadersBrian Paul2008-11-101-5/+10
| | |
* | | i915: Silence warningJakob Bornecrantz2008-11-151-1/+1
| | |
* | | mesa: fix buildAlan Hourihane2008-11-141-2/+1
| | |
* | | build default set of progs + eglAlan Hourihane2008-11-131-2/+1
| | |
* | | Fix configs/linux-dri to build winsys again.Pekka Paalanen2008-11-131-4/+0
| | | | | | | | | | | | | | | | | | SRC_DIRS was being reset, which left winsys unbuilt. Signed-off-by: Pekka Paalanen <[email protected]>
* | | CELL: fix stencil twiddling, stencil invertRobert Ellison2008-11-132-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many stencil tests were failing because of a failure to read the stencil buffer, due to "twiddling" (or "untwiddling") "an unsupported texture format". This is fixed for the case of a stencil/Z S824Z format (which twiddles just like the 32-bit color formats). tests/stencilwrap.c was failing on the GL_INVERT test, because the emitted code for "spe_xori" turned out not to be an actual "xori" instruction, but rather a "stqd" instruction, because of a typo in the rtasm code. This is now fixed, and tests/stencil_wrap now works.
* | | Merge branch 'gallium-0.2' of ↵Stephane Marchesin2008-11-13228-2/+46849
|\ \ \ | | | | | | | | | | | | git+ssh://[email protected]/git/nouveau/mesa into gallium-0.2
| * | | nv04..nv30: fix pipe_surface initPekka Paalanen2008-11-124-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: Pekka Paalanen <[email protected]>
| * | | Merge commit 'origin/gallium-0.1' into gallium-0.2Pekka Paalanen2008-11-1222-4/+3308
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'origin/gallium-0.1': Mesa: fix number of buffers in st_draw_vbo(). Nouveau: fix nv20_vertex_layout() Nouveau: update nv20 miptree according to nv40. Nouveau: build, link and use nv20. Nouveau: name replace for nv20. Nouveau: Rename nv20/ files as nv20. Nouveau: copy nv30_vertprog.c to nv20. Nouveau: start nv20 by copying the nv10 tree.
| | * | | Mesa: fix number of buffers in st_draw_vbo().Pekka Paalanen2008-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clean-up call to pipe->set_vertex_buffers() should use the same number of buffers as the first call. Signed-off-by: Pekka Paalanen <[email protected]>
| | * | | Nouveau: fix nv20_vertex_layout()Pekka Paalanen2008-11-091-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function should update nv20->vertex_info, and not just a local struct that's thrown away immediately. Fixes a SIGFPE due to vbuf->vertex_size = 0 in vbuf_alloc_vertices(). Signed-off-by: Pekka Paalanen <[email protected]>
| | * | | Nouveau: update nv20 miptree according to nv40.Pekka Paalanen2008-11-081-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glxinfo doesn't degfault anymore. Signed-off-by: Pekka Paalanen <[email protected]>
| | * | | Nouveau: build, link and use nv20.Pekka Paalanen2008-11-085-3/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pekka Paalanen <[email protected]>
| | * | | Nouveau: name replace for nv20.Pekka Paalanen2008-11-0816-662/+662
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes, only changed function, struct, macro etc. names. nv10 -> nv20 nv30 -> nv20 celsius -> kelvin Did not touch fifo command macros. Don't try to build nv20_vertprog.c for now. Signed-off-by: Pekka Paalanen <[email protected]>
| | * | | Nouveau: Rename nv20/ files as nv20.Pekka Paalanen2008-11-0816-12/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pekka Paalanen <[email protected]>
| | * | | Nouveau: copy nv30_vertprog.c to nv20.Pekka Paalanen2008-11-081-0/+838
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pekka Paalanen <[email protected]>
| | * | | Nouveau: start nv20 by copying the nv10 tree.Pekka Paalanen2008-11-0815-0/+2447
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Pekka Paalanen <[email protected]>