| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | | |
swizzling in fetch/store srgba/sargb functions fixed (consistent with
equivalent non-srgb formats now).
|
| | | |
|
| | |
| | |
| | |
| | | |
Add the MSAA samples array or make sure its contents are initialized.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
(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.
|
| | |
| | |
| | |
| | |
| | | |
This contains the core mesa code but excludes things not needed for gallium
such as tnl/, swrast/, swrast_setup/, etc.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gallium/state_trackers/wgl/shared/stw_public.h
|
| | | |
| | | |
| | | |
| | | | |
Similar to the GLX state trackers for DRI and xlib.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Allows to leave screen->winsys NULL.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
move it to pipe/internal/p_winsys_screen.h and start converting
the state trackers to the screen usage
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from master/commit f78c388b6c156cb155f089b00612f00919090a8e)
|
| | | |
| | | |
| | | |
| | | | |
(cherry picked from master/commit 72ee0e247d799c85612c72bbd2257648e11fa583)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
intel_meta_set_passthrough_transform(), intel_meta_restore_transform()
(cherry picked from master, commit 723648f2ee2a8e529063c9da84e9dff9c8c6be99)
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
reuse the size of the actual buffer
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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]>
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
to return TRUE/FALSE if the st_framebuffer is valid, and if it is
return the surface/texture in the passed pointer.
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
windows/VC8/mesa/osmesa/osmesa.vcproj
windows/VC8/progs/demos/gears.vcproj
windows/VC8/progs/progs.sln
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes front-buffer rendering when following a SwapBuffers.
See progs/tests/rubberband.c
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/mesa/shader/slang/slang_compile.c
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
pipe_winsys::flush_front_buffer should die someday, but this is good enough
for now.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | | |
|
| | | | | | |
|