summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-master-merge'Brian Paul2009-02-101108-2766/+257013
|\ | | | | | | | | | | | | | | | | | | | | | | This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c
| * Merge commit 'origin/gallium-0.2' into gallium-master-mergeBrian Paul2009-02-1038-523/+671
| |\
| | * nouveau: nv40 swizzled mipmap fixes.Younes Manton2009-02-103-13/+31
| | |
| | * nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at ↵Patrice Mandin2009-02-102-13/+30
| | | | | | | | | | | | the right places
| | * nouveau: revert all my changes here, not the right wayPatrice Mandin2009-02-101-22/+9
| | |
| | * nouveau: stop with 0 dimensionPatrice Mandin2009-02-101-1/+1
| | |
| | * nouveau: we already have the right src offsetPatrice Mandin2009-02-101-3/+2
| | |
| | * nouveau: do not forget to half dimension.Patrice Mandin2009-02-101-3/+7
| | |
| | * nouveau: revert most parts of recent mipmap+swizzle stuff. We only need to ↵Patrice Mandin2009-02-101-50/+43
| | | | | | | | | | | | find right src and dst offset for given mipmap level.
| | * wgl: return before locking if stw_icd is NULLKeith Whitwell2009-02-101-2/+17
| | |
| | * Merge commit 'origin/gallium-0.2' into gallium-0.2Keith Whitwell2009-02-10102-526/+8510
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/wgl/icd/stw_icd.c
| | | * nouveau: dst offset is correctPatrice Mandin2009-02-101-4/+2
| | | |
| | | * pipebuffer: Drop reliance on pipe_winsys.José Fonseca2009-02-104-24/+54
| | | |
| | | * Missing: tgsi: Fix build -- rename Size to NrTokens.Patrice Mandin2009-02-101-1/+1
| | | |
| | | * nouveau: recalc sub width and height for each mipmap levelPatrice Mandin2009-02-101-16/+23
| | | |
| | | * nv40: Fix build -- rename Size to NrTokens.Michal Krol2009-02-101-1/+1
| | | |
| | | * nv30: Fix build -- rename Size to NrTokens.Michal Krol2009-02-101-1/+1
| | | |
| | | * nv20: Fix build -- rename Size to NrTokens.Michal Krol2009-02-101-1/+1
| | | |
| | | * brw: Fix build -- rename Size to NrTokens.Michal Krol2009-02-101-1/+1
| | | |
| | | * i915: Fix build -- rename Size to NrTokens.Michal Krol2009-02-101-1/+1
| | | |
| | | * gallivm: Fix build -- rename Size to NrTokens.Michal Krol2009-02-101-2/+2
| | | |
| | | * draw: Fix build -- rename Size to NrTokens.Michal Krol2009-02-102-2/+2
| | | |
| | | * tgsi: Fix build -- rename Size to NrTokens.Michal Krol2009-02-108-20/+20
| | | |
| | | * gallium: Rename Size member of TGSI token to NrTokens.Michal Krol2009-02-101-5/+5
| | | | | | | | | | | | | | | | | | | | Driver writers often got confused and assumed Size to be the number of immediate values in Immediate declaration.
| | | * mesa: Compare formats using nominal bytes per pixel.José Fonseca2009-02-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary fix which works for the formats we care so far. The real fix would be abandon the concept "nominal bytes per pixel" entirely in Mesa, and use macropixels instead, as done in gallium interfaces already.
| | | * wgl: Fix null pointer reference.José Fonseca2009-02-101-0/+3
| | | |
| | | * stw: Hack for applications which use wglSetPixelFormat instead of ↵José Fonseca2009-02-101-0/+8
| | | | | | | | | | | | | | | | SetPixelFormat.
| | | * glut: Use the official WGL functions.José Fonseca2009-02-103-32/+9
| | | | | | | | | | | | | | | | | | | | Especially using wglGetPixelFormat instead of GetPixelFormat causes problems with opengl32.dll and drivers that not hack around this issue.
| | | * glut: DESCRIPTION .def clause deprecated.José Fonseca2009-02-101-6/+0
| | | |
| | | * wgl: s/0x%p/%p/gJosé Fonseca2009-02-101-6/+8
| | | | | | | | | | | | | | | | Rather not have 0x prefix, than 0x0x in certain platforms.
| | | * mesa: fixes for srgb formatsRoland Scheidegger2009-02-091-20/+14
| | | | | | | | | | | | | | | | | | | | swizzling in fetch/store srgba/sargb functions fixed (consistent with equivalent non-srgb formats now).
| | | * fix _mesa_get_teximage for srgb texturesRoland Scheidegger2009-02-091-11/+52
| | | |
| | | * indices: Fix typo.José Fonseca2009-02-092-241/+241
| | | |
| | * | wgl: mutex-protect the shared stw_icd structKeith Whitwell2009-02-101-73/+138
| | | |
| | * | vmw/icd: remove bogus current_context valueKeith Whitwell2009-02-101-6/+4
| | | |
| * | | mesa: Build both software rasterizers for debugJakob Bornecrantz2009-02-101-3/+5
| | | | | | | | | | | | | | | | But put the gallium one in lib/gallium
| * | | gallium: Don't rebuild common drm codeJakob Bornecrantz2009-02-102-6/+6
| | | |
| * | | gallium: Install DRI drivers into lib/galliumJakob Bornecrantz2009-02-102-8/+8
| | | |
| * | | gallium: Introduce new subdirs build variablesJakob Bornecrantz2009-02-103-7/+7
| | | | | | | | | | | | | | | | (based on gallium-xorg-driver/commit 270ce504052d415870a25ab59818b2309eb8ac13)
| * | | gallium: Fixups for driCreateConfigs MSAA support.Michel Dänzer2009-02-1012-3/+28
| | | | | | | | | | | | | | | | Add the MSAA samples array or make sure its contents are initialized.
| * | | mesa: add x86/rtasm/x86sse.c to fix linux-x86 buildBrian Paul2009-02-091-0/+1
| | | |
| * | | re-add MSAA supportBrian Paul2009-02-0912-35/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f7d80aa00611917bc8ce637136d982b151b8f44f) This also involved adding the new MSAA fields to driCreateConfigs(). Also, re-add prog_instructions->Sampler field for i965 driver. Will have to revisit that.
| * | | mesa: build/use libmesagallium.a for gallium buildsBrian Paul2009-02-094-5/+6
| | | | | | | | | | | | | | | | | | | | This contains the core mesa code but excludes things not needed for gallium such as tnl/, swrast/, swrast_setup/, etc.
| * | | mesa: added new linux-gallium and linux-gallium-debug configsBrian Paul2009-02-092-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, remove gallium-related things from configs/default. They're in linux-gallium now. So the default builds are the same as they have been for Mesa/master.
| * | | softpipe: add null ptr check in softpipe_map_constant_buffers()Brian Paul2009-02-091-2/+8
| | | | | | | | | | | | | | | | Fixes segfault regression in progs/glsl/identity.c
| * | | mesa: prefix #includes with main/Brian Paul2009-02-091-4/+4
| | | |
| * | | swrast: fix typo: s/drapix/drawpix/Brian Paul2009-02-091-1/+1
| | | |
| * | | mesa: remove old 'sources' file in favor of 'sources.mak'Brian Paul2009-02-091-303/+0
| | | |
| * | | mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-091093-2671/+257006
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
| | * | nouveau: include and calc offset before changing dimensions for next levelPatrice Mandin2009-02-081-2/+3
| | | |