summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-master-merge'Brian Paul2009-02-10169-768/+21060
|\ | | | | | | | | | | | | | | | | | | | | | | 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-104-35/+68
| |\
| | * Missing: tgsi: Fix build -- rename Size to NrTokens.Patrice Mandin2009-02-101-1/+1
| | |
| | * 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.
| | * 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
| | |
| * | 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-091-1/+2
| | | | | | | | | | | | | | | 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.
| * | 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-09156-709/+21212
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * mesa: fix offset problem with interleaved arraysAlan Hourihane2009-02-031-1/+1
| | |
| | * gallium: remove pipe_buffer from surfacesZack Rusin2009-02-022-7/+6
| | | | | | | | | | | | | | | | | | | | | this change disassociates, at least from the driver perspective, the surface from buffer. surfaces are technically now views on the textures so make it so by hiding the buffer in the internals of textures.
| | * Merge branch 'gallium-wgl-rework' into gallium-0.2Keith Whitwell2009-02-0226-4485/+0
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/wgl/shared/stw_public.h
| | | * wgl: relocate wgl code to state_trackers/wglKeith Whitwell2009-01-2726-4490/+0
| | | | | | | | | | | | | | | | Similar to the GLX state trackers for DRI and xlib.
| | * | stw: Remove pipe_winsys references.José Fonseca2009-01-302-2/+1
| | | |
| | * | gallium: Don't ask winsys name -- let pipe screen do that if it wants.José Fonseca2009-01-301-5/+2
| | | | | | | | | | | | | | | | Allows to leave screen->winsys NULL.
| | * | stw: Don't use the winsys.José Fonseca2009-01-303-9/+5
| | | |
| | * | gallium: make p_winsys internalZack Rusin2009-01-306-10/+10
| | | | | | | | | | | | | | | | | | | | move it to pipe/internal/p_winsys_screen.h and start converting the state trackers to the screen usage
| | * | i965: fix bug in pass0_precalc_mov()Brian Paul2009-01-291-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, "in-place" swizzles such as: MOV t, t.xxyx; were handled incorrectly. Fixed by splitting the one loop into two loops so we get all the refs before assigning them (to avoid potential clobbering). (cherry picked from master/commit faa48915d27634a12f123eaa6e954ec79565e365)
| | * | i965: widen per-texture bitfields for 16 texture image unitsBrian Paul2009-01-291-5/+5
| | | | | | | | | | | | | | | | (cherry picked from master/commit f78c388b6c156cb155f089b00612f00919090a8e)
| | * | intel: check if stencil test is enabled in intel_stencil_drawpixels()Brian Paul2009-01-291-1/+5
| | | | | | | | | | | | | | | | (cherry picked from master/commit 72ee0e247d799c85612c72bbd2257648e11fa583)
| | * | intel: save/restore GL matrix mode in ↵Brian Paul2009-01-292-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | intel_meta_set_passthrough_transform(), intel_meta_restore_transform() (cherry picked from master, commit 723648f2ee2a8e529063c9da84e9dff9c8c6be99)
| | * | mesa: set version to 7.4 for mesa_7_4_branchBrian Paul2009-01-291-3/+3
| | | |
| | * | mesa: set version to 7.3Brian Paul2009-01-291-1/+1
| | | |
| | * | gallium: remove redundant size from the constant bufferZack Rusin2009-01-271-2/+0
| | | | | | | | | | | | | | | | reuse the size of the actual buffer
| | * | gallium: it's a reference value, not a reference numberZack Rusin2009-01-271-1/+1
| | | |
| | * | gallium: standardize api on the prefix "nr"Zack Rusin2009-01-271-3/+3
| | | |
| | * | gallium: standardize naming of masksZack Rusin2009-01-272-6/+6
| | | |
| | * | gallium: standardize on stride instead of pitch in the interfaceZack Rusin2009-01-272-4/+4
| | |/
| | * gallium: updated comments in st_extensions.cBrian Paul2009-01-261-7/+12
| | |
| | * mesa: declare pipe_texture in st_public.hPekka Paalanen2009-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: In file included from nouveau_context_dri.c:6: ../../../../../../src/mesa/state_tracker/st_public.h:87: warning: 'struct pipe_texture' declared inside parameter list ../../../../../../src/mesa/state_tracker/st_public.h:87: warning: its scope is only this definition or declaration, which is probably not what you want ../../../../../../src/mesa/state_tracker/st_public.h:104: warning: 'struct pipe_texture' declared inside parameter list Signed-off-by: Pekka Paalanen <[email protected]>
| | * wgl: Adapt for st_get_framebuffer_surface call change.José Fonseca2009-01-231-1/+1
| | |
| | * gallium: change the st_get_framebuffer_surface/texture functionsAlan Hourihane2009-01-233-19/+26
| | | | | | | | | | | | | | | to return TRUE/FALSE if the st_framebuffer is valid, and if it is return the surface/texture in the passed pointer.
| | * Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-2235-422/+890
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
| | * | statetracker: copy back color buffer to front buffer when neededBrian Paul2009-01-191-1/+13
| | | | | | | | | | | | | | | | | | | | Fixes front-buffer rendering when following a SwapBuffers. See progs/tests/rubberband.c
| | * | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-1613-17/+80
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c
| | * | | stw: Dispatch to our stw_winsys::flush_front_bufferJosé Fonseca2009-01-162-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | pipe_winsys::flush_front_buffer should die someday, but this is good enough for now.
| | * | | mesa: tweak to formattingAlan Hourihane2009-01-151-2/+2
| | | | |
| | * | | mesa: small cleanupAlan Hourihane2009-01-151-6/+5
| | | | |
| | * | | mesa: revert partial commit for 0x0 render targetsAlan Hourihane2009-01-151-5/+4
| | | | |
| | * | | mesa: check frambuffer complete status before renderingAlan Hourihane2009-01-151-13/+20
| | | | |
| | * | | mesa: Fix merge conflictsJakob Bornecrantz2009-01-151-15/+0
| | | | |
| | * | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-1445-165/+1248
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h
| | * | | | mesa: handle some cases of 0x0 render targetsAlan Hourihane2009-01-143-8/+15
| | | | | |
| | * | | | glsl: fix regression from sampler arrays commitAlan Hourihane2009-01-141-3/+1
| | | | | |