| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Since this program is used for testing, catching this case can be helpful.
|
|
|
|
|
| |
Doing simple buffer clears isn't enough to actually allocate render buffers, we
need to do real drawing.
|
| |
|
|
|
|
|
|
|
|
| |
Add OML_sync_control support, along with a simple program for testing
it. This means adding support for the DRI2GetMSC, DRI2WaitMSC and
DRI2WaitSBC requests.
Signed-off-by: Jesse Barnes <[email protected]>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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/gallium/drivers/softpipe/sp_quad_blend.c
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| | |
The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values.
We only need to use the glXChooseFBConfig() code when glXChooseVisual()
fails (but I don't know when that would happen).
Other recent commits errantly removed some code in this area too.
|
| |
| |
| |
| | |
(cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
|
| |
| |
| |
| | |
(cherry picked from commit e0857962b911ef317238498305651515d83029ae)
|
| |
| |
| |
| | |
(cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)
|
| |
| |
| |
| | |
(cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610)
|
| |
| |
| |
| | |
(cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f)
|
| |
| |
| |
| | |
(cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4)
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
Create one window and render into it with two GLX contexts. Setup the
rendering state differently for each context to be sure there's no state
"bleeding" between contexts.
|
| |
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/mesa/main/state.c
|
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes the problem that first frame would report bogus usage values.
Problem was caused because get_frame_usage returned data from previous buffer
swap.
Signed-off-by: Pauli Nieminen <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Pauli Nieminen <[email protected]>
|
|/ |
|
|
|
|
|
|
|
|
|
|
| |
Of course glXGetVideoSyncSGI doesn't return the swap interval. The feature
only exists in the Mesa extension... which is the whole reason I created the
Mesa extension! Note that the Mesa extension allows drivers to default to a
swap interval of 0. If the Mesa extension exists, use its value. Only
consider the SGI extension when the Mesa extension is not available.
Fixes bug #22604.
|
|
|
|
|
|
|
| |
Fix xdemos which default to using display :0.0 to default to $DISPLAY,
this is kind of irritating when testing on a display other than :0.0
Signed-off-by: Jon TURNEY <[email protected]>
|
|
|
|
|
|
|
|
| |
The reshape() function was called when there was no GLX context so
the viewport/modelview/projection setup wasn't doing anything. Move
the call to reshape() into draw().
Also, remove -stereo, -fullscreen options and do some general clean-up.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
1) Don't allow multiple threads sharing current context,
even if they are mutex protected.
2) Remove all XLockDisplay(), XUnLockDisplay() calls, as they were
only workarounds for xcb.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
|
| |
|
|
|
|
| |
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/mesa/shader/prog_print.c
|