OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,221 Commits 9 Branches 1 Tag
ac18b8c44c1219f0f5162307477a615a13360bd6
Commit Graph

283 Commits

Author SHA1 Message Date
Ian Romanick
4fb2daf42c Merge branch '7.8' 2010-04-04 16:54:00 -07:00
Jeremy Huddleston
71b2f1d8e6 xdemos: Build object files first 
This helps debugging on darwin.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2010-04-03 11:23:09 -07:00
Jeremy Huddleston
115203281c Revert accidental commits from the xquartz tree 
This reverts commit 9aadc793f3.
This reverts commit 69ea4e7718.
This reverts commit dbe8b01393.
This reverts commit 23215ef4d6.
This reverts commit 9495e37030.
This reverts commit 0594cf7088.
This reverts commit 86a7978d37.
This reverts commit 437902ce97.
 2010-04-01 17:01:51 -07:00
Jeremy Huddleston
86a7978d37 xdemos: Build object files first 
This helps debugging on darwin.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2010-04-01 12:33:39 -07:00
Jeremy Huddleston
437902ce97 xdemos: Fix a build failure for non-autoconf configs 
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 2010-04-01 12:14:45 -07:00
Dan Nicholson
e725ef171b Change libX11 variables to not conflict with AC_PATH_XTRA 
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir
parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars
for linking with Xlib to avoid the conflict.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
 2010-03-23 13:26:50 -07:00
Jeff Smith
8d86d395dc Use X_LIBS from pkg-config, instead of libdir, for locating libX11 
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
 2010-03-13 11:42:24 -08:00
Michel Dänzer
b13e305ee1 Merge branch '7.8' 2010-03-12 19:00:47 +01:00
Jeff Smith
3aa8692883 Add programs to .gitignore in xdemos 
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
 2010-03-12 08:57:06 -07:00
Jeff Smith
9787060423 Add -L$(libdir) for xdemos and egl so that the right libX11 is found 
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
 2010-03-12 08:56:06 -07:00
Jesse Barnes
f2a035e5d8 xdemos/omlsync: improve OML WaitMsc test 
Use the divisor/remainder for the WaitForMscOML call if a wait_interval
is passed.  Allows for testing of the WaitMSC paths in the server & DDX.
 2010-03-08 11:31:26 -08:00
Jesse Barnes
f846a008e9 progs/xdemos: fix up GLX extension checking 
A few of my programs were using the client string in addition to the
main extensions string to see if a feature was present.  Correct this to
only check for the currently available and working extensions.
 2010-03-05 11:22:05 -08:00
Jesse Barnes
77bc721a52 xdemos/omlsync: add waitformsc and swap interval code 2010-03-05 11:22:04 -08:00
Jesse Barnes
b6456dc234 xdemos: add OML sync test 
Add program to test glXSwapBuffersMscOML behavior.  Based on glsync.c.
 2010-03-04 13:14:59 -08:00
Brian Paul
68205bf5b4 progs/xdemos: fix typo in glxinfo help 2010-02-26 08:17:37 -07:00
George Sapountzis
9a4a219d20 drop header files and demos for dropped window systems 2010-02-26 04:02:41 +02:00
Brian Paul
52cc3b03c3 glxinfo: Fix User error in glGetProgramivARB 
glxinfo needed fixing after commit 4bccd69.

Move fragment program only parameters into their own list
so that they are not queried for a vertex program.

Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>

(cherry picked from commit b0e5dcb859692707fec8752dd21fc61fc4c3dbcc)
 2010-02-22 08:56:18 -07:00
Ian Romanick
381d5e2098 glxgears_fbconfig: Use glXCreateWindow and glXDestroyWindow 2010-02-11 15:40:29 -08:00
Ian Romanick
6518f6037c glxgears_fbconfig: Use GLX 1.3 name for function poiner types 2010-02-11 15:40:29 -08:00
Vinson Lee
ad93f3e489 progs/xdemos: Silence uninitialized variable warning. 2010-02-09 01:35:14 -08:00
Vinson Lee
7da1a528b8 progs/xdemos: Silence uninitialized variable warning. 2010-02-08 01:53:31 -08:00
Aaron Plattner
cec0e7c086 glxgears: Support GLX_EXT_swap_control for querying the current swap interval. 
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
 2010-01-26 12:00:51 -07:00
Brian Paul
cd8614b028 Merge branch 'mesa_7_7_branch' 
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
 2010-01-22 12:17:02 -07:00
Brian Paul
2f1a49e335 progs/xdemos: add z/Z keys for scaling the rendering 2010-01-22 08:08:45 -07:00
Marcin Slusarz
23ae318200 glxgears: unbind current context before "destroying" it 
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 <brianp@vmware.com>
 2010-01-18 10:44:53 -07:00
Jakob Bornecrantz
b01ffb12ed Merge branch 'mesa_7_7_branch' 
Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/util/Makefile
	src/gallium/drivers/r300/r300_state_derived.c
 2010-01-14 22:31:04 +00:00
Vinson Lee
8e9ceb8309 progs/xdemos: Remove unnecessary header from corender.c. 2010-01-11 20:24:57 -08:00
Jesse Barnes
c6ef705e41 Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa 
Conflicts due to DRI1 removal:
	src/mesa/drivers/dri/intel/intel_context.c
	src/mesa/drivers/dri/intel/intel_screen.c
 2010-01-11 15:23:29 -05:00
Jesse Barnes
c642f3941b xdemos/glsync: handle no sync method better 
Print out count, finish rendering, etc.  Makes the -sn option more useful.
 2010-01-08 12:37:44 -05:00
Jesse Barnes
0269dc19b5 xdemos/glsync: check glXMakeCurrent return value 
Since this program is used for testing, catching this case can be helpful.
 2010-01-08 12:37:43 -05:00
Jesse Barnes
f860aac0d8 xdemos/glsync: Make glsync test draw a rectangle 
Doing simple buffer clears isn't enough to actually allocate render buffers, we
need to do real drawing.
 2010-01-08 12:37:43 -05:00
Jesse Barnes
f35f666f81 xdemos/glsync: Add swap interval support to glsync test 2010-01-08 12:37:43 -05:00
Jesse Barnes
daf7fe69f7 DRI2: add OML_sync_control support 
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 <jbarnes@virtuousgeek.org>
 2010-01-08 12:31:10 -05:00
Vinson Lee
199dedd6dd progs/demos: Check upper bounds of input in manywin.c. 2010-01-10 01:57:13 -08:00
Vinson Lee
45ac10fe6a progs/xdemos: Check for string overflow. 2010-01-06 18:19:46 -08:00
Vinson Lee
25ffd76278 progs/xdemos: Check for string overflow. 2010-01-06 18:08:41 -08:00
Vinson Lee
4c45810d57 progs/xdemos: Remove comma at end of enumerator list. 2010-01-06 15:35:18 -08:00
Vinson Lee
96a4e4552d progs/xdemos: Use temporary variables. 
This was missed from the previous commit to glxheads.c.
 2010-01-06 15:33:13 -08:00
Vinson Lee
f4952f040b progs/xdemos: Prevent possible string overflow. 2010-01-06 14:56:43 -08:00
Brian Paul
b57abd3bea Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 
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
 2009-12-21 18:23:53 -07:00
Vinson Lee
3340fd65fb progs/xdemos: Use C-style comment. 2009-12-19 00:00:56 -08:00
Vinson Lee
15c6558a2e progs/xdemos: Silence compiler warnings in glxinfo.c. 2009-12-12 02:06:51 -08:00
Brian Paul
ca7cd3ade0 progs/xdemos: fix some visual/fbconfig logic in glxinfo.c 
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.
 2009-12-04 08:09:57 -07:00
Vinson Lee
12a440abfb progs/xdemos: Silence unused value warnings in sharedtex_mt.c. 
(cherry picked from commit 8556fad751)
 2009-12-04 00:04:38 -08:00
Vinson Lee
4bf96ebdae progs/xdemos: Fix memory leak in pbdemo.c. 
(cherry picked from commit e0857962b9)
 2009-12-04 00:03:14 -08:00
Vinson Lee
ba3fedf246 progs/xdemos: Add missing break statement in offset.c. 
(cherry picked from commit 4ab8dbe593)
 2009-12-04 00:01:20 -08:00
Vinson Lee
8350648401 progs/xdemos: Remove duplicate code in glxinfo.c. 
(cherry picked from commit a4720a1a32)
 2009-12-03 23:59:47 -08:00
Vinson Lee
7324c22024 progs/xdemos: Fix memory leak in glxinfo.c. 
(cherry picked from commit f080567f4c)
 2009-12-03 23:59:11 -08:00
Vinson Lee
68d206fafa progs/xdemos: Add assert in corender.c. 
(cherry picked from commit 66a4ec14c3)
 2009-12-03 23:22:47 -08:00
Brian Paul
61a96a2ac7 progs/xdemos: fix command line flag typo 2009-10-22 17:11:59 -06:00