| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
src/gallium/auxiliary/pipebuffer/Makefile
src/gallium/auxiliary/pipebuffer/SConscript
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/tgsi/tgsi_scan.c
src/gallium/drivers/i915/i915_surface.c
src/gallium/drivers/i915/i915_texture.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/winsys/drm/intel/gem/intel_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
src/mesa/state_tracker/st_cb_clear.c
|
| |
| |
| |
| |
| |
| |
| | |
glXDestroyContext does not destroy the context if it's still
connected to some window. Unbind context from window to test it.
Signed-off-by: Brian Paul <[email protected]>
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
|
| | |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| | |
Conflicts due to DRI1 removal:
src/mesa/drivers/dri/intel/intel_context.c
src/mesa/drivers/dri/intel/intel_screen.c
|
| |
| |
| |
| | |
Print out count, finish rendering, etc. Makes the -sn option more useful.
|
| |
| |
| |
| | |
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]>
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
This was missed from the previous commit to glxheads.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/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.
|