| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
X11/extensions/randr.h
mesalib/src/glsl/ast_function.cpp
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/glsl/glsl_parser_extras.h
mesalib/src/glsl/link_functions.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/mesa/state_tracker/st_program.c
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/program/prog_optimize.c
mesalib/src/mesa/state_tracker/st_cb_blit.c
xorg-server/xkeyboard-config/rules/base.o_s.part
xorg-server/xkeyboard-config/rules/base.xml.in
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/mesa/SConscript
mesalib/src/mesa/main/compiler.h
mesalib/src/mesa/main/enable.c
mesalib/src/mesa/main/ff_fragment_shader.cpp
mesalib/src/mesa/main/texcompress_rgtc_tmp.h
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/main/texparam.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/program/prog_print.c
mesalib/src/mesa/program/prog_statevars.c
mesalib/src/mesa/program/program.c
mesalib/src/mesa/program/program_parse.y
mesalib/src/mesa/program/program_parser.h
mesalib/src/mesa/program/sampler.cpp
mesalib/src/mesa/sources.mak
mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
mesalib/src/mesa/state_tracker/st_cb_blit.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
mesalib/src/mesa/state_tracker/st_program.c
mesalib/src/mesa/state_tracker/st_texture.h
mesalib/src/mesa/vbo/vbo_exec_array.c
pixman/pixman/pixman-arm-neon-asm.S
pixman/pixman/pixman-arm-neon.c
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/glsl/link_functions.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/main.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
xorg-server/composite/compalloc.c
xorg-server/configure.ac
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Makefile.am
xorg-server/hw/xquartz/xpr/xprFrame.c
xorg-server/include/windowstr.h
|
| | |
|
| | |
|
| |
| |
| |
| | |
the parent directory.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/glsl/ast_function.cpp
mesalib/src/glsl/glsl_types.cpp
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texparam.c
xorg-server/config/udev.c
xorg-server/configure.ac
xorg-server/dix/main.c
xorg-server/hw/dmx/dmxinit.c
xorg-server/hw/kdrive/src/kdrive.c
xorg-server/hw/xfree86/common/xf86Config.c
xorg-server/hw/xfree86/common/xf86Configure.c
xorg-server/hw/xfree86/common/xf86Helper.c
xorg-server/hw/xfree86/common/xf86Init.c
xorg-server/hw/xfree86/common/xf86Option.c
xorg-server/hw/xfree86/common/xf86Priv.h
xorg-server/hw/xfree86/common/xf86Xinput.c
xorg-server/hw/xnest/Init.c
xorg-server/hw/xquartz/darwin.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winerror.c
xorg-server/hw/xwin/xlaunch/config.cc
xorg-server/hw/xwin/xlaunch/config.h
xorg-server/hw/xwin/xlaunch/main.cc
xorg-server/hw/xwin/xlaunch/resources/dialog.rc
xorg-server/hw/xwin/xlaunch/resources/resources.h
xorg-server/hw/xwin/xlaunch/resources/resources.rc
xorg-server/hw/xwin/xlaunch/resources/strings.rc
xorg-server/hw/xwin/xlaunch/window/util.cc
xorg-server/hw/xwin/xlaunch/window/util.h
xorg-server/hw/xwin/xlaunch/window/wizard.h
xorg-server/include/os.h
xorg-server/os/log.c
xorg-server/xkeyboard-config/symbols/lv
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
libX11/configure.ac
mesalib/src/mesa/main/ff_fragment_shader.cpp
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/texparam.c
pixman/pixman/pixman-arm-neon-asm.S
|
| | |
|
|\|
| |
| |
| |
| | |
Conflicts:
mesalib/src/mesa/state_tracker/st_extensions.c
|
| | |
|
| |
| |
| |
| | |
created.
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
libX11/specs/libX11/CH11.xml
mesalib/src/glsl/main.cpp
mesalib/src/mesa/main/compiler.h
mesalib/src/mesa/main/get.c
mesalib/src/mesa/main/texcompress.c
mesalib/src/mesa/main/texparam.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/program/prog_optimize.c
pixman/pixman/pixman-fast-path.c
pixman/pixman/pixman-fast-path.h
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/X11Application.h
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
xorg-server/hw/xquartz/darwinEvents.c
xorg-server/hw/xquartz/darwinEvents.h
xorg-server/hw/xquartz/man/Xquartz.man
xorg-server/hw/xquartz/xpr/dri.c
xorg-server/xkeyboard-config/symbols/ee
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
mesalib/src/glsl/ast_function.cpp
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/glsl/glsl_types.cpp
mesalib/src/glsl/ir.cpp
mesalib/src/glsl/ir.h
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/s_expression.cpp
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/main/dd.h
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
X11/Xfuncproto.h.in
X11/configure.ac
X11/keysymdef.h
freetype/include/freetype/internal/pcftypes.h
freetype/src/cache/ftcbasic.c
freetype/src/cache/ftccmap.c
mesalib/src/glsl/ir.h
mesalib/src/glsl/link_functions.cpp
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/program/prog_optimize.c
mesalib/src/mesa/state_tracker/st_program.c
pthreads/Makefile
|
| | |
|
| |
| |
| |
| |
| |
| | |
inputproto-2.0.2
xproto-7.0.22
resourceproto-1.2.0
|
| | |
|
| | |
|
| |
| |
| |
| | |
This caused some windows to catolised as gl windows which were not.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
libX11/configure.ac
mesalib/configs/linux-dri
mesalib/docs/download.html
mesalib/src/SConscript
mesalib/src/mesa/main/bufferobj.c
mesalib/src/mesa/main/bufferobj.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/program/program.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/dix/window.c
xorg-server/xkb/xkb.c
xorg-server/xkb/xkmread.c
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
But only for file winmultiwindowwndproc.c
This caused regression in multiwindow mode when wgl was used.
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/mesa/state_tracker/st_context.c
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/wgl_ext_api.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/man/XWin.man
xorg-server/hw/xwin/winmultiwindowwindow.c
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
mesalib/src/mesa/main/depthstencil.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
|
| | |
|