Age | Commit message (Collapse) | Author |
|
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
|
|
|
|
|
|
This is a substantial reorganization, This particular commit enables:
- building the progs for unices platforms
- glew is now built as a shared library (it is the default, and it is
inconvenient and pointless to shift away from that default)
- all progs get built by default
|
|
Render into two color buffers (render targets). Display half of each
buffer in the window. Use different color masks for each render target.
Only enable blending for the second render target.
|
|
|
|
(cherry picked from commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73)
|
|
|
|
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
|
|
Conflicts:
configure.ac
progs/demos/morph3d.c
progs/demos/textures.c
progs/glsl/shtest.c
progs/glsl/texaaline.c
progs/tests/packedpixels.c
progs/xdemos/corender.c
src/mesa/main/version.h
|
|
|
|
|
|
|
|
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
|
|
|
|
Silences uninitialized variable compiler warning.
|
|
Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h
To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
|
|
(cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3)
|
|
|
|
|
|
(cherry picked from commit e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f)
|
|
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 9c3197ef0abc3bf521358ea0c7af0fc6979c82b3)
|
|
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit a8ed066858f12290239ddc9165b7c0734ccc0247)
|
|
(cherry picked from commit 50e113e375b4ecfdf5b60ccce7bbcdb1c5f2ca11)
|
|
(cherry picked from commit 952bf63e2cf442504ef89b0b1d276da0d52b21d4)
|
|
Forgot these on previous commit.
(cherry picked from commit 166957abebea6aa203eba7e6348e89d53cf0e13e)
|
|
More portable. Same implementation on Linux.
(cherry picked from commit 699260b19535abaa3af0a5d33eb039e3d6a30ce9)
|
|
(cherry picked from commit f7455ad7af09b5ef31ccc454b79422a13c59af9a)
|
|
(cherry picked from commit 60b6c7458319ff01ecdd9d1650d526ac8f75e194)
|
|
(cherry picked from commit 96fd13c1a024e3b6c0b1c44394c67c772e52b9c9)
|
|
(cherry picked from commit 9c778a90ea24f25437b68bb67856c81add61e261)
|
|
(cherry picked from commit ea862ec8ff4a52b30b822e737d93a49330be9e31)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
|
|
Signed-off-by: Brian Paul <brianp@vmware.com>
|
|
|
|
|
|
Signed-off-by: Brian Paul <brianp@vmware.com>
|
|
Signed-off-by: Brian Paul <brianp@vmware.com>
|
|
Disable GL_DEPTH_TEST before glDrawPixels.
Show color buffer 0 on left, color buffer 1 on right.
|
|
|
|
|
|
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
|
|
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit aef1ab1073f3e30d699b99dae17518ed48b57c72
|
|
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit aef1ab1073f3e30d699b99dae17518ed48b57c72
|