Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/gallium-master-merge' | Brian Paul | 2009-02-10 | 1108 | -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-merge | Brian Paul | 2009-02-10 | 38 | -523/+671 |
| |\ | |||||
| | * | nouveau: nv40 swizzled mipmap fixes. | Younes Manton | 2009-02-10 | 3 | -13/+31 |
| | | | |||||
| | * | nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at ↵ | Patrice Mandin | 2009-02-10 | 2 | -13/+30 |
| | | | | | | | | | | | | the right places | ||||
| | * | nouveau: revert all my changes here, not the right way | Patrice Mandin | 2009-02-10 | 1 | -22/+9 |
| | | | |||||
| | * | nouveau: stop with 0 dimension | Patrice Mandin | 2009-02-10 | 1 | -1/+1 |
| | | | |||||
| | * | nouveau: we already have the right src offset | Patrice Mandin | 2009-02-10 | 1 | -3/+2 |
| | | | |||||
| | * | nouveau: do not forget to half dimension. | Patrice Mandin | 2009-02-10 | 1 | -3/+7 |
| | | | |||||
| | * | nouveau: revert most parts of recent mipmap+swizzle stuff. We only need to ↵ | Patrice Mandin | 2009-02-10 | 1 | -50/+43 |
| | | | | | | | | | | | | find right src and dst offset for given mipmap level. | ||||
| | * | wgl: return before locking if stw_icd is NULL | Keith Whitwell | 2009-02-10 | 1 | -2/+17 |
| | | | |||||
| | * | Merge commit 'origin/gallium-0.2' into gallium-0.2 | Keith Whitwell | 2009-02-10 | 102 | -526/+8510 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/wgl/icd/stw_icd.c | ||||
| | | * | nouveau: dst offset is correct | Patrice Mandin | 2009-02-10 | 1 | -4/+2 |
| | | | | |||||
| | | * | pipebuffer: Drop reliance on pipe_winsys. | José Fonseca | 2009-02-10 | 4 | -24/+54 |
| | | | | |||||
| | | * | Missing: tgsi: Fix build -- rename Size to NrTokens. | Patrice Mandin | 2009-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | nouveau: recalc sub width and height for each mipmap level | Patrice Mandin | 2009-02-10 | 1 | -16/+23 |
| | | | | |||||
| | | * | nv40: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | nv30: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | nv20: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | brw: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | i915: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | gallivm: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -2/+2 |
| | | | | |||||
| | | * | draw: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 2 | -2/+2 |
| | | | | |||||
| | | * | tgsi: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 8 | -20/+20 |
| | | | | |||||
| | | * | gallium: Rename Size member of TGSI token to NrTokens. | Michal Krol | 2009-02-10 | 1 | -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é Fonseca | 2009-02-10 | 1 | -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é Fonseca | 2009-02-10 | 1 | -0/+3 |
| | | | | |||||
| | | * | stw: Hack for applications which use wglSetPixelFormat instead of ↵ | José Fonseca | 2009-02-10 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | SetPixelFormat. | ||||
| | | * | glut: Use the official WGL functions. | José Fonseca | 2009-02-10 | 3 | -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é Fonseca | 2009-02-10 | 1 | -6/+0 |
| | | | | |||||
| | | * | wgl: s/0x%p/%p/g | José Fonseca | 2009-02-10 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | Rather not have 0x prefix, than 0x0x in certain platforms. | ||||
| | | * | mesa: fixes for srgb formats | Roland Scheidegger | 2009-02-09 | 1 | -20/+14 |
| | | | | | | | | | | | | | | | | | | | | swizzling in fetch/store srgba/sargb functions fixed (consistent with equivalent non-srgb formats now). | ||||
| | | * | fix _mesa_get_teximage for srgb textures | Roland Scheidegger | 2009-02-09 | 1 | -11/+52 |
| | | | | |||||
| | | * | indices: Fix typo. | José Fonseca | 2009-02-09 | 2 | -241/+241 |
| | | | | |||||
| | * | | wgl: mutex-protect the shared stw_icd struct | Keith Whitwell | 2009-02-10 | 1 | -73/+138 |
| | | | | |||||
| | * | | vmw/icd: remove bogus current_context value | Keith Whitwell | 2009-02-10 | 1 | -6/+4 |
| | | | | |||||
| * | | | mesa: Build both software rasterizers for debug | Jakob Bornecrantz | 2009-02-10 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | But put the gallium one in lib/gallium | ||||
| * | | | gallium: Don't rebuild common drm code | Jakob Bornecrantz | 2009-02-10 | 2 | -6/+6 |
| | | | | |||||
| * | | | gallium: Install DRI drivers into lib/gallium | Jakob Bornecrantz | 2009-02-10 | 2 | -8/+8 |
| | | | | |||||
| * | | | gallium: Introduce new subdirs build variables | Jakob Bornecrantz | 2009-02-10 | 3 | -7/+7 |
| | | | | | | | | | | | | | | | | (based on gallium-xorg-driver/commit 270ce504052d415870a25ab59818b2309eb8ac13) | ||||
| * | | | gallium: Fixups for driCreateConfigs MSAA support. | Michel Dänzer | 2009-02-10 | 12 | -3/+28 |
| | | | | | | | | | | | | | | | | Add the MSAA samples array or make sure its contents are initialized. | ||||
| * | | | mesa: add x86/rtasm/x86sse.c to fix linux-x86 build | Brian Paul | 2009-02-09 | 1 | -0/+1 |
| | | | | |||||
| * | | | re-add MSAA support | Brian Paul | 2009-02-09 | 12 | -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 builds | Brian Paul | 2009-02-09 | 4 | -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 configs | Brian Paul | 2009-02-09 | 2 | -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 Paul | 2009-02-09 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | Fixes segfault regression in progs/glsl/identity.c | ||||
| * | | | mesa: prefix #includes with main/ | Brian Paul | 2009-02-09 | 1 | -4/+4 |
| | | | | |||||
| * | | | swrast: fix typo: s/drapix/drawpix/ | Brian Paul | 2009-02-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | mesa: remove old 'sources' file in favor of 'sources.mak' | Brian Paul | 2009-02-09 | 1 | -303/+0 |
| | | | | |||||
| * | | | mesa: merge gallium-0.2 into gallium-master-merge | Brian Paul | 2009-02-09 | 1093 | -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 level | Patrice Mandin | 2009-02-08 | 1 | -2/+3 |
| | | | |