summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* add SRGB formatsAlan Hourihane2008-11-191-0/+26
|
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-11-1516-498/+647
|\ | | | | | | | | | | 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
| |
| * 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.
* | Merge branch 'gallium-0.2' of ↵Stephane Marchesin2008-11-131-1/+1
|\ \ | | | | | | | | | git+ssh://[email protected]/git/nouveau/mesa into gallium-0.2
| * \ Merge commit 'origin/gallium-0.1' into gallium-0.2Pekka Paalanen2008-11-121-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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]>
| | * | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-09-1817-149/+279
| | |\ \
| * | \ \ Merge remote branch 'origin/gallium-0.2' into gallium-0.2Ben Skeggs2008-11-1083-3106/+4519
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'origin/gallium-0.2' into gallium-0.2Ben Skeggs2008-10-2712-45/+314
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'origin/gallium-0.2' into gallium-0.2Ben Skeggs2008-10-1583-2108/+1238
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/gallium-0.2' into gallium-0.2Ben Skeggs2008-09-30490-7493/+2625
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2Ben Skeggs2008-09-121-70/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2Ben Skeggs2008-09-121-70/+76
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2Ben Skeggs2008-09-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri
| | * | | | | | | | | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-09-1163-1234/+2591
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/default
| | * \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-08-1421-439/+559
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-08-1120-2856/+2879
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-08-0726-1768/+2363
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-07-27151-866/+1023
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-07-2362-1807/+2750
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-07-148-21/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-07-1127-574/+586
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into gallium-0.1Ben Skeggs2008-07-0536-1200/+1674
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Revert "mesa: Use the appropriate relocation."Ben Skeggs2008-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb09d1ef60dae3b3c44f1370fd2f726c7044bc17.
* | | | | | | | | | | | | | | | | | | | gallium: add st_set_teximage_surface for EXT_texture_from_pixmapBen Skeggs2008-11-132-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support.
* | | | | | | | | | | | | | | | | | | | mesa: fix generation of fixed function state when no vp existsAlan Hourihane2008-11-131-43/+41
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-1137-3240/+3582
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| * | | | | | | | | | | | | | | | | | | mesa: allow relative indexing into all register files and indirect dst ↵Brian Paul2008-11-113-128/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | register indexing
| * | | | | | | | | | | | | | | | | | | intel: reset cliprect_mode to IGNORE_CLIPRECTS.Xiang, Haihao2008-11-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures all batchbuffers have a same cliprect mode after calling _intel_batchbuffer_flush even if there aren't invalid commands in the current batch buffer. (fix bug#18362).
| * | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | | | | | mesa: update new state for RasterPos like other operations.Xiang, Haihao2008-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a lighting issue when drawing a bitmap.
| * | | | | | | | | | | | | | | | | | | mesa: new _mesa_is_pow_two() functionBrian2008-11-105-23/+33
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | mesa: restore glapi/ prefix on #includeBrian Paul2008-11-102-2/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | mesa: fix some misc breakage caused by editing auto-generated files rather ↵Brian Paul2008-11-104-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than the python generators Specifically: #include "glapitable.h" in src/mesa/main/glapi/dispatch.h Call _mesa_bsearch() in src/mesa/main/enums.c.