472a601966
progs/egl: Fix screen surface demos.
...
Set the screen surface size to the mode size, as the spec requires the
screen surface size to be larger than the mode size. Besides, bind the
API to OpenGL as they are written in it.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
c657c80180
progs/egl: glGenTextures is called too early in xeglbindtex.
...
It should be called after eglMakeCurrent.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
3bcb08f6c4
progs: Check the number of configs returned by eglChooseConfig.
...
A successful eglChooseConfig call does not imply there are valid
configs.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
033bd95802
progs: Add missing EGL_RENDERABLE_TYPE for EGL demos.
...
The default value of EGL_RENDERABLE_TYPE is EGL_OPENGL_ES_BIT. The
proper values should be specified if we are not using OpenGL ES.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-12 10:55:35 +08:00
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
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
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
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
f35f666f81
xdemos/glsync: Add swap interval support to glsync test
2010-01-08 12:37:43 -05:00
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
fd70841121
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_emit.c
2010-01-08 08:21:12 -07:00
7c55fe9bfd
progs/fp: increase buffer size to read larger shaders
2010-01-07 09:20:48 -07:00
2b7a4b2c0e
progs/fp: remove invalid tri-inv.c test
...
INV is not a valid instruction.
2010-01-07 08:22:39 -07:00
d42467687e
progs/demos: Assert that input to malloc is valid.
2010-01-06 21:39:44 -08:00
45ac10fe6a
progs/xdemos: Check for string overflow.
2010-01-06 18:19:46 -08:00
25ffd76278
progs/xdemos: Check for string overflow.
2010-01-06 18:08:41 -08:00
4c45810d57
progs/xdemos: Remove comma at end of enumerator list.
2010-01-06 15:35:18 -08:00
96a4e4552d
progs/xdemos: Use temporary variables.
...
This was missed from the previous commit to glxheads.c.
2010-01-06 15:33:13 -08:00
c1dad22d71
progs/glsl: Prevent possible string overflow.
2010-01-06 15:25:42 -08:00
f4952f040b
progs/xdemos: Prevent possible string overflow.
2010-01-06 14:56:43 -08:00
5ac16495a2
Merge branch 'mesa_7_7_branch'
...
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
2010-01-04 19:16:24 -07:00
8a29e3f8e8
progs/egl: Silence uninitialized variable warnings.
2010-01-03 21:39:20 -08:00
3ea5a95078
progs/samples: Silence compiler warnings.
2010-01-03 21:29:33 -08:00
1da47ac20e
progs/vp: Ensure null-terminated byte string.
2010-01-03 02:38:22 -08:00
c9c6e9a39e
progs/tests: Silence uninitialized variable warning.
2010-01-02 21:58:40 -08:00
32d18924df
progs/tests: Silence warn_unused_result warning.
2010-01-02 21:52:51 -08:00
646c8ce032
progs/samples: 'Silence no previous prototype' warnings.
2010-01-01 17:54:11 -08:00
ad9defdd9c
progs/rbug: s/wait/rbug_wait/
...
wait conflicts with wait in /usr/include/sys/wait.h.
2010-01-01 16:25:37 -08:00
7bbf7f94ea
scons: Build progs together with everything else.
...
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
2010-01-01 12:16:19 +00:00
58b401315b
progs: Ignore derived files.
2010-01-01 12:16:19 +00:00
25024d9482
Merge branch 'mesa_7_7_branch'
...
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-31 09:02:27 -07:00
34075d0219
progs/tests: added test for GL_EXT_draw_buffers2
...
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.
2009-12-31 08:49:27 -07:00
08d145e1d7
progs/tests: added conditional rendering test program
2009-12-31 08:49:27 -07:00
5b2713c92a
progs/glsl: Provide a better fix for fgets warning.
2009-12-30 12:38:21 -08:00
0ab29d2b35
progs/glsl: Silence compiler warnings.
2009-12-29 21:11:37 -08:00
d0b7ff551a
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
2009-12-27 15:31:08 -07:00
e81fe088f4
progs/demos: Silence warn_unused_result warnings.
2009-12-26 01:08:26 -08:00
cdc69e3469
progs/util: Silence warn_unused_result warnings.
2009-12-25 23:13:50 -08:00
faae0e5da3
rbug: rename pf_is_compressed to util_format_is_compressed
2009-12-23 16:57:46 +01:00
0f6cbc55b7
progs/tests: Fix build.
...
(cherry picked from commit 1bf2d78b11
2009-12-22 23:30:23 -08:00
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
1bf2d78b11
progs/tests: Fix build.
2009-12-22 00:54:34 -08:00
982acbddab
progs/perf: Fix MSVC build.
...
(cherry picked from commit cbf46ed670
2009-12-21 18:10:44 -08:00
9eb7fc6661
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
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
07b54fe35b
progs/redbook: Silence compiler warnings.
2009-12-21 15:20:01 -08:00
fdae39c289
progs/perf: added check for GL_ARB_framebuffer_object
2009-12-21 13:49:25 -07:00
79e74cda73
progs/demos: report pixel rate in million pixels / sec
2009-12-21 13:49:25 -07:00
d26cdaaa23
progs/osmes: add missing libGL dependency, remove unneeded lines
2009-12-21 13:37:11 -07:00
66e779c22b
i965g: back out unintentional changes to gears
2009-12-21 19:19:01 +00:00
Chia-I Wu
Jesse Barnes
Brian Paul
Vinson Lee
José Fonseca
Roland Scheidegger
Keith Whitwell