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
080c40ab32
Merge remote branch 'origin/master' into lp-binning
...
Conflicts:
src/gallium/auxiliary/util/u_surface.c
src/gallium/drivers/llvmpipe/Makefile
src/gallium/drivers/llvmpipe/SConscript
src/gallium/drivers/llvmpipe/lp_bld_arit.c
src/gallium/drivers/llvmpipe/lp_bld_flow.c
src/gallium/drivers/llvmpipe/lp_bld_interp.c
src/gallium/drivers/llvmpipe/lp_clear.c
src/gallium/drivers/llvmpipe/lp_context.c
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/llvmpipe/lp_draw_arrays.c
src/gallium/drivers/llvmpipe/lp_jit.c
src/gallium/drivers/llvmpipe/lp_jit.h
src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/llvmpipe/lp_state_blend.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/llvmpipe/lp_state_sampler.c
src/gallium/drivers/llvmpipe/lp_state_surface.c
src/gallium/drivers/llvmpipe/lp_tex_cache.c
src/gallium/drivers/llvmpipe/lp_tex_cache.h
src/gallium/drivers/llvmpipe/lp_tex_sample.h
src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-01-08 15:42:57 +00: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
6d6c9c6688
progs/demos: Remove unnecessary header from fbotexture.c.
2010-01-11 00:24:39 -08:00
199dedd6dd
progs/demos: Check upper bounds of input in manywin.c.
2010-01-10 01:57:13 -08:00
0c7814fe23
progs/demos: Bounds check input to fire.c.
2010-01-10 00:40:46 -08:00
683e3cb8db
progs/tests: Silence 'missing initializer' warnings.
2010-01-08 23:08:57 -08:00
223c8482ca
progs/glsl: Silence uninitialized variable warning.
2010-01-08 22:10:52 -08:00
3b82de92a0
progs/demos: Add missing initializers in engine.c.
2010-01-08 22:02:49 -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
8e6774937f
progs/es1: Add compressed paletted texture tests to torus.
...
The tests can be toggled by `t'. It will print current texture format
and the size of the image.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2010-01-04 14:15:16 -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
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
0dd9513874
progs/tests: Silence compiler warnings.
2009-12-20 01:01:00 -08:00
d87d71036c
progs/trivial: Use C-style comments.
2009-12-19 00:28:01 -08:00
3340fd65fb
progs/xdemos: Use C-style comment.
2009-12-19 00:00:56 -08:00
695adf41e2
progs/demos: Silence compiler warning in morph3d.c.
2009-12-18 23:46:14 -08:00
121ff55d81
progs/glsl: Use C-style comments.
2009-12-18 23:38:15 -08:00
41377942d3
progs/demos: Use C-style comment.
2009-12-18 23:34:28 -08:00
263f4322e7
progs/demos: fix glut initialization calls
...
Remove glutInitWindowPosition() calls to play nicer with window managers.
Move glutInitWindowSize() calls before glutInit() so the the default window
size can be overridden by the -geometry cmd line option.
2009-12-18 13:58:14 -07:00
b1ed72ebe2
Move the remaining format pf_get_* functions to u_format.h.
...
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
2009-12-17 23:41:57 +01:00
0a8d508854
progs/trivial: Silence compiler warnings.
2009-12-14 18:11:57 -08:00
588e9f69c4
progs/trivial: Silence compiler warnings in tri-blend-min.c.
2009-12-12 15:47:17 -08:00
786899f153
progs/trivial: Silence compiler warnings in tri-blend-max.c
2009-12-12 14:20:17 -08:00
15c6558a2e
progs/xdemos: Silence compiler warnings in glxinfo.c.
2009-12-12 02:06:51 -08:00
d5be33477e
progs/tests: Silence compiler warnings in vpeval.c.
2009-12-12 01:34:33 -08:00
44d6ab6de5
progs/tests: Silence compiler warnings in cva.c.
2009-12-12 01:11:56 -08:00
9e2eee4ab2
progs/redbook: Silence compiler warnings in aaindex.c.
2009-12-12 01:02:16 -08:00
a087eb590d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
2009-12-11 10:04:07 -07:00
b605f4ff11
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-11 09:22:00 -07:00
1cf60c9810
progs/samples: Byte swap individual members of struct _rawImageRec.
2009-12-10 15:41:13 -08:00
bc0509bba8
progs/util: Byte swap individual members of struct _rawImageRec.
2009-12-10 13:24:15 -08:00
edf11da7f8
progs/demos/gloss: press 'n' to advance by one frame
2009-12-09 16:23:30 -07:00
288ea9770a
progs/demos: call glutDestroyWindow() in gloss.c
2009-12-09 14:53:53 -07:00
b5e256c76d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
2009-12-08 11:57:24 +02:00
0d4a05445c
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-08 10:16:14 +02:00
3e8b2fda21
progs/test: Initialize variable in prog_parameter.
...
Silences uninitialized variable compiler warning.
2009-12-07 18:40:37 -08:00
8fc433fa0f
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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.
2009-12-07 17:16:10 -08:00
7d84169865
progs/demos: Fix memory leak in projtex.c.
2009-12-07 12:31:08 -08:00
0311d9ccf4
progs/glsl: updates to deriv.c test
...
Pass window size into the shader so scaling the window doesn't effect
the colors.
2009-12-07 09:03:41 -07:00
8796dbf519
progs/glsl: added texture mapping to bump demo
...
Press 't' to toggle texture map.
2009-12-07 07:46:02 -07:00
978b80c8e3
progs/tests: Add tests to Makefile.
...
(cherry picked from commit 76d2ec3a0a
2009-12-05 21:20:54 -08:00
d13c603e37
Add 'texture leak' test.
2009-12-05 17:59:49 +01:00
1446f30875
progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.
2009-12-05 01:43:29 -08:00
412aeeed1c
progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.
2009-12-05 01:38:14 -08:00
6212c8103a
progs/samples: Add rgbtoppm to Makefile.
2009-12-05 01:28:47 -08:00
2cd2341ce8
progs/tests: Removed unused variable from texdown.c.
2009-12-05 01:23:05 -08:00
d642edd2d1
progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.
...
The return type of glGetUniformLocationARB is GLint, not GLuint.
2009-12-05 01:11:26 -08:00
8d2f3434c5
progs/fp: Redraw upon keypress.
2009-12-04 23:31:39 -08:00
4fb5ae7233
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
...
(cherry picked from commit 11905da883
2009-12-04 17:35:00 -08:00
5683d7d43f
progs/util: Fix memory leak if fail to load/compile shader
...
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit c475079ef2
2009-12-04 17:32:48 -08:00
e5bc2a19bd
progs/fp: Add tri-inv.c to Makefile.
2009-12-04 17:29:53 -08:00
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
12a440abfb
progs/xdemos: Silence unused value warnings in sharedtex_mt.c.
...
(cherry picked from commit 8556fad751
2009-12-04 00:04:38 -08:00
4bf96ebdae
progs/xdemos: Fix memory leak in pbdemo.c.
...
(cherry picked from commit e0857962b9
2009-12-04 00:03:14 -08:00
ba3fedf246
progs/xdemos: Add missing break statement in offset.c.
...
(cherry picked from commit 4ab8dbe593
2009-12-04 00:01:20 -08:00
8350648401
progs/xdemos: Remove duplicate code in glxinfo.c.
...
(cherry picked from commit a4720a1a32
2009-12-03 23:59:47 -08:00
7324c22024
progs/xdemos: Fix memory leak in glxinfo.c.
...
(cherry picked from commit f080567f4c
2009-12-03 23:59:11 -08:00
68d206fafa
progs/xdemos: Add assert in corender.c.
...
(cherry picked from commit 66a4ec14c3
2009-12-03 23:22:47 -08:00
69ed1147a8
progs/vp: Fix memory leak in vp-tris.c.
...
(cherry picked from commit 760cf71572
2009-12-03 23:20:18 -08:00
efb582fde7
progs/tests: Fix memory leak in texdown.c if malloc fails.
...
(cherry picked from commit e3cfd78969
2009-12-03 23:17:26 -08:00
b210739aad
progs/redbook: Fix memory leak in quadric.c.
...
(cherry picked from commit 47b5f584a6
2009-12-03 23:12:59 -08:00
b1a87a3e0b
progs/glsl: Fix memory leak in deriv.c.
...
(cherry picked from commit 0e783c7d03
2009-12-03 22:54:35 -08:00
25fd168f03
progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.
...
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
(cherry picked from commit b8dcb79c53
2009-12-03 22:51:43 -08:00
b803abbaad
progs/demos: Fix memory leak in ray.c.
...
(cherry picked from commit 6b480dc21d
2009-12-03 22:49:18 -08:00
5820dae4ec
progs/demos: Fix memory leak in projtex.c.
...
(cherry picked from commit ee555e3d69
2009-12-03 22:44:55 -08:00
fc5f07de1a
progs/demos: Fix memory leak in ipers.c.
...
(cherry picked from commit a1afe303de
2009-12-03 22:38:44 -08:00
d245a951f3
progs/demos: Fix memory leak in fslight.c.
...
(cherry picked from commit aef3218f0b
2009-12-03 22:36:37 -08:00
56de7e222e
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 9553a42f63
2009-12-03 17:27:24 -08:00
34a0b22a74
progs/trivial: Redraw upon keypress.
...
(cherry picked from commit 3790c6a13b
2009-12-03 17:25:00 -08:00
9e29242331
progs/glsl: Redraw upon keypress.
...
(cherry picked from commit 881f55236a
2009-12-03 17:17:24 -08:00
a0ac8fc7d8
progs/util: Exit RawImageGetData early if malloc fails.
...
Prevents a null pointer deference later on.
(cherry picked from commit e26135a744
2009-12-03 17:14:08 -08:00
0a6acecb35
progs/util: Fix memory leak if malloc fails in RawImageOpen.
...
(cherry picked from commit d36cb2396c
2009-12-03 17:08:48 -08:00
305d4f147e
progs/util: Fix memory leak if fopen fails in RawImageOpen.
...
(cherry picked from commit d9508e8df9
2009-12-03 17:03:26 -08:00
772e004781
progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
...
(cherry picked from commit 786d539511
2009-12-03 16:57:17 -08:00
f1172c4030
progs/util: Fix memory leak if LoadRGBImage fails.
...
(cherry picked from commit 041cd0e110
2009-12-03 16:24:03 -08:00
84de1672d3
progs/util: Fix memory if LoadRGBMipmaps2 fails.
...
(cherry picked from commit 28b8e4bcd7
2009-12-03 16:15:22 -08:00
4ca8e1680e
progs/util: Fix memory leak if LoadYUVImage fails.
...
(cherry picked from commit 0e790ac353
2009-12-03 16:03:22 -08:00
d6a993135f
progs/fp: Redraw upon keypress.
...
(cherry picked from commit cde6643724
2009-12-03 15:59:56 -08:00
005242f166
prog/tests: Fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 9c3197ef0a
2009-12-03 15:53:13 -08:00
d3208678c2
progs/tests: fix MSVC build.
...
Signed-off-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit a8ed066858
2009-12-03 15:50:36 -08:00
97cbf4943a
progs/tests: Fix MSVC build.
...
(cherry picked from commit 50e113e375
2009-12-03 15:45:18 -08:00
a99bf51bc8
progs/tests: Fix MSVC build.
...
(cherry picked from commit 952bf63e2c
2009-12-03 15:35:10 -08:00
28474e1225
progs/tests: Use rand() instead of random().
...
Forgot these on previous commit.
(cherry picked from commit 166957abeb
2009-12-03 15:34:38 -08:00
bb6e3af939
progs/tests: Use rand() instead of random().
...
More portable. Same implementation on Linux.
(cherry picked from commit 699260b195
2009-12-03 15:32:45 -08:00
a38776419b
progs/tests: Fix MSVC build.
...
(cherry picked from commit f7455ad7af
2009-12-03 15:29:01 -08:00
791b754687
prog/tests: Fix MSVC build.
...
(cherry picked from commit 60b6c74583
2009-12-03 15:24:43 -08:00
89e747920f
prog/tests: Fix MSVC build.
...
(cherry picked from commit 96fd13c1a0
2009-12-03 15:15:12 -08:00
5a25adb646
progs/tests: fix MSVC build.
...
(cherry picked from commit 9c778a90ea
2009-12-03 15:11:25 -08:00
3910e88ebf
prog/tests: Fix MSVC build.
...
(cherry picked from commit ea862ec8ff
2009-12-03 15:05:44 -08:00
52081f0a2c
progs/trivial: readback and print Z value in tri-z-eq.c
2009-12-03 11:43:19 -07:00
235c0c8134
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
...
(cherry picked from commit b98db7bf69
2009-12-02 20:28:54 -08:00
0a107d36c2
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
...
(cherry picked from commit 4b3ec2acf2
2009-12-02 20:20:12 -08:00
b094683e7c
progs/glsl: Fix noise GLSL compilation error on Mac OS.
...
(cherry picked from commit 0d31990b47
2009-12-02 20:16:51 -08:00
592c8522a2
demos/glsl: Add missing break statement to noise test.
...
(cherry picked from commit 7dfea5c072
2009-12-02 20:16:41 -08:00
8f4d3613da
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
...
(cherry picked from commit d4dc2e30da
2009-12-02 20:06:20 -08:00
9ed77d12b1
progs/glsl: Add missing break statement in multinoise.c.
...
(cherry picked from commit 43080e40aa
2009-12-02 20:06:11 -08:00
832593772d
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
...
(cherry picked from commit 04442841fb
2009-12-02 19:55:48 -08:00
2a5cd95e24
progs/glsl: Include local headers before installed headers during compilation.
...
Fixes compilation errors on platforms with insufficient older installed
GL headers.
(cherry picked from commit d17af7d1e1
2009-12-02 19:39:25 -08:00
ccea09cd3a
progs/glsl: minor Makefile clean-ups
...
(cherry picked from commit 4df2f7af5e
2009-12-02 19:39:11 -08:00
67a0628ab2
progs: Ignore Mac OS dSYM directories.
...
(cherry picked from commit a420056750
2009-12-02 15:22:34 -08:00
0c75854cc1
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/mesa/main/version.h
2009-12-02 14:52:51 +01:00
ba97b98842
progs/demos: remove unused glFogCoordPointer_ext var
2009-12-01 12:23:07 -07:00
b9f4a0bd2b
Simplify hackery added to fix AIX build.
...
Borrow an idiom from the GNU build system which can handle `for'
loops over empty lists.
2009-12-01 10:27:27 -08:00
650e02003f
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
2009-11-30 17:47:07 -08:00
344a2a9abb
progs/trivial: added two simple texture tests
...
One draws a series of quads with different textures.
The other draws with one texture which is changed with glTexSubImage2D().
2009-11-30 15:31:34 -07:00
cddc7e3a9c
brw: add dumping to gem winsys
2009-11-30 15:37:27 +00:00
da0883114b
shaderutil: Fix detection of shaders
...
Check for versions >= 2.0 (because some drivers return 3.0), and return
GL_FALSE if shaders are not detected.
2009-11-23 18:33:50 -08:00
e19195c185
progs/xdemos: Fix memory leak in pbinfo.c.
2009-11-20 15:52:53 -08:00
e0857962b9
progs/xdemos: Fix memory leak in pbdemo.c.
2009-11-20 15:48:29 -08:00
538a8df652
progs/xdemos: Fix memory leak in glxpbdemo.c.
2009-11-20 15:18:19 -08:00
a4720a1a32
progs/xdemos: Remove duplicate code in glxinfo.c.
2009-11-20 15:06:56 -08:00
66a4ec14c3
progs/xdemos: Add assert in corender.c.
2009-11-20 15:03:16 -08:00
3fafe2b969
progs/vp: add param and imm test
2009-11-19 19:50:19 -08:00
7e5cd3eb14
progs/fp: add simple imm, param tests
2009-11-19 16:53:02 -08:00
8f24e863c3
progs: Fix quoting issue with empty set of PROGRAM_DIRS.
...
Quotes are important to make sure the argument to test -n really
is the empty string, but that requires stringifying PROGRAM_DIRS.
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-19 09:26:39 -07:00
8556fad751
progs/xdemos: Silence unused value warnings in sharedtex_mt.c.
2009-11-20 13:09:42 -08:00
f080567f4c
progs/xdemos: Fix memory leak in glxinfo.c.
2009-11-20 13:01:22 -08:00
02c3e0b82d
progs/tests: Silence unused value warnings in sharedtex.c.
2009-11-20 12:49:50 -08:00
48deddaa6f
progs/tests: Initialize variable in getprocaddress.c.
2009-11-20 12:34:21 -08:00
e26135a744
progs/util: Exit RawImageGetData early if malloc fails.
...
Prevents a null pointer deference later on.
2009-11-20 12:11:55 -08:00
c88b18a4df
progs/slang: Check for ftell failure in vstest.c.
2009-11-20 11:34:21 -08:00
d36cb2396c
progs/util: Fix memory leak if malloc fails in RawImageOpen.
2009-11-20 11:22:13 -08:00
b98db7bf69
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
2009-11-19 23:56:07 -08:00
760cf71572
progs/vp: Fix memory leak in vp-tris.c.
2009-11-19 22:59:01 -08:00
9553a42f63
progs/trivial: Redraw upon keypress.
2009-11-19 22:52:05 -08:00
881f55236a
progs/glsl: Redraw upon keypress.
2009-11-19 22:46:19 -08:00
4ab8dbe593
progs/xdemos: Add missing break statement in offset.c.
2009-11-19 14:20:26 -08:00
3790c6a13b
progs/trivial: Redraw upon keypress.
2009-11-19 13:03:12 -08:00
e3cfd78969
progs/tests: Fix memory leak in texdown.c if malloc fails.
2009-11-18 17:30:50 -08:00
cde6643724
progs/fp: Redraw upon keypress.
2009-11-18 14:41:40 -08:00
4b3ec2acf2
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
2009-11-18 14:02:20 -08:00
0d31990b47
progs/glsl: Fix noise GLSL compilation error on Mac OS.
2009-11-18 13:50:49 -08:00
d4dc2e30da
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
2009-11-18 12:49:31 -08:00
04442841fb
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
2009-11-17 23:15:25 -08:00
89e20ab3ae
progs/glsl: use ShadersSupported()
2009-11-17 19:22:29 -07:00
6acb82dab0
progs/util: warn when GLSL not supported
2009-11-17 19:22:11 -07:00
773de83d3c
progs/tests: Fix memory leak in arbgpuprog.c.
2009-11-17 15:24:40 -08:00
fc3c5ffcc8
progs/xdemos: change //-style comments
2009-11-17 16:16:30 -07:00
b08f447547
progs/glsl: change //-style comments
2009-11-17 16:16:30 -07:00
1888a72765
progs/demos: silence warnings
2009-11-17 16:16:30 -07:00
e8eec93854
progs/slang: Fix potential null pointer dereference in cltest.c.
2009-11-17 14:22:35 -08:00
47b5f584a6
progs/redbook: Fix memory leak in quadric.c.
2009-11-17 14:10:35 -08:00
d9508e8df9
progs/util: Fix memory leak if fopen fails in RawImageOpen.
2009-11-17 13:49:31 -08:00
d888bbc45a
progs/xdemos: added -lX11 -lpthread for GNU gold linker
2009-11-17 13:40:00 -07:00
11905da883
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
2009-11-17 12:00:22 -08:00
b8dcb79c53
progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.
...
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
2009-11-17 11:37:48 -08:00
786d539511
progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
2009-11-17 11:04:24 -08:00
041cd0e110
progs/util: Fix memory leak if LoadRGBImage fails.
2009-11-17 10:11:50 -08:00
0e783c7d03
progs/glsl: Fix memory leak in deriv.c.
2009-11-17 09:54:54 -08:00
28b8e4bcd7
progs/util: Fix memory if LoadRGBMipmaps2 fails.
2009-11-17 08:29:36 -08:00
0e790ac353
progs/util: Fix memory leak if LoadYUVImage fails.
2009-11-16 18:24:06 -08:00
6b480dc21d
progs/demos: Fix memory leak in ray.c.
2009-11-16 18:06:40 -08:00
ee555e3d69
progs/demos: Fix memory leak in projtex.c.
2009-11-16 16:31:34 -08:00
a1afe303de
progs/demos: Fix memory leak in ipers.c.
2009-11-16 15:44:52 -08:00
Chia-I Wu
Jesse Barnes
José Fonseca
Brian Paul
Vinson Lee
Roland Scheidegger
Keith Whitwell
Michal Krol
Andre Maasikas
Ian Romanick
Michel Dänzer
Jakob Bornecrantz
Tom Fogal