Brian Paul
1f196b786d
Merge branch 'texformat-rework'
...
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
2009-10-28 21:24:11 -06:00
Brian Paul
3bee7610be
progs/tests: added new blitfb.c test
...
Tests glBlitFramebuffer() between two texture/renderbuffer surfaces.
In particular, blit from level[1] of a cube map face to a 2D texture.
Used to find/fix bug in intel do_copy_texsubimage().
See commit aef1ab1073f3e30d699b99dae17518ed48b57c72
2009-10-27 17:00:31 -06:00
Vinson Lee
50e113e375
progs/tests: Fix MSVC build.
2009-10-26 15:03:52 -06:00
Brian Paul
d8ded352ec
progs/tests: disable blending while drawing text
2009-10-25 18:10:45 -06:00
Brian Paul
51bc12d623
progs/tests: fix sub texture offsets
2009-10-24 11:08:01 -06:00
Eric Anholt
49d402e275
Merge remote branch 'origin/mesa_7_6_branch'
...
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
2009-10-23 15:21:05 -07:00
Brian Paul
b01937a3c9
progs/tests: print requested/internal format info
2009-10-23 14:52:10 -06:00
Vinson Lee
952bf63e2c
progs/tests: Fix MSVC build.
2009-10-23 13:49:13 -06:00
Keith Whitwell
19403935aa
progs/demos: add fps to multiarb
2009-10-23 13:56:07 +01:00
Brian Paul
ab9d1011f5
Merge branch 'mesa_7_6_branch'
2009-10-22 18:38:19 -06:00
Brian Paul
61a96a2ac7
progs/xdemos: fix command line flag typo
2009-10-22 17:11:59 -06:00
Alex Deucher
5e77b61e39
Merge branch 'mesa_7_6_branch' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa
2009-10-22 12:02:31 -04:00
Chia-I Wu
4e2bdd6635
progs/egl: Add support for pixmap and pbuffer surface to xeglgears.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-10-22 09:33:27 -06:00
Brian Paul
82ffc5884c
progs/tests: draw Z values as luminance, no pixel zoom
2009-10-21 21:51:19 -06:00
Brian Paul
5283a3fb25
progs/trivial: check if GL_ARB_occlusion_query is supported
2009-10-20 16:22:03 -06:00
José Fonseca
166957abeb
progs/tests: Use rand() instead of random().
...
Forgot these on previous commit.
2009-10-16 11:42:13 +01:00
José Fonseca
699260b195
progs/tests: Use rand() instead of random().
...
More portable. Same implementation on Linux.
2009-10-16 11:39:29 +01:00
Vinson Lee
60b6c74583
prog/tests: Fix MSVC build.
2009-10-16 11:36:09 +01:00
Brian Paul
5b7d9053a0
progs/egl: put declarations before code
2009-10-15 13:00:03 -06:00
Brian Paul
31f7e8efb2
progs/Makefile: remove extra quoting
...
This reverts part of commit 115edf24a9 and
fixes the error: "/bin/sh: line 0: test: too many arguments".
2009-10-14 09:37:53 -06:00
Brian Paul
91bd87c06e
progs/demos: try different depth formats in fbo_firecube.c
2009-10-14 19:13:32 -06:00
Tom Fogal
115edf24a9
Fix build when PROGRAM_DIRS is empty.
...
SUBDIRS just takes PROGRAM_DIRS value. If PROGRAM_DIRS gets set
to the empty string (as can happen when building only OSMesa), a
'for' loop will lack anything to iterate over, causing a parse
error.
This fixes the issue by making sure SUBDIRS is the null string
when PROGRAM_DIRS is, and wrapping the for loops in if's, causing
them only to execute if there are directories to iterate over.
2009-10-13 16:22:09 -06:00
Brian Paul
9fd7e9ef05
Merge branch 'mesa_7_6_branch'
2009-10-14 09:40:05 -06:00
Brian Paul
ce3801ab87
Merge branch 'mesa_7_6_branch'
2009-10-14 09:22:30 -06:00
Vinson Lee
ea862ec8ff
prog/tests: Fix MSVC build.
2009-10-14 07:52:39 -06:00
Vinson Lee
96fd13c1a0
prog/tests: Fix MSVC build.
2009-10-12 18:05:23 -06:00
Vinson Lee
cbf46ed670
progs/perf: Fix MSVC build.
2009-10-10 10:45:16 -06:00
Vinson Lee
76d2ec3a0a
progs/tests: Add tests to Makefile.
2009-10-09 07:24:37 -06:00
Jakob Bornecrantz
023bab675a
progs/perf: Ignores!
2009-10-09 14:00:15 +01:00
José Fonseca
d54e9f54d0
progs: Remove unused empty file.
2009-10-09 11:08:17 +01:00
Vinson Lee
f7455ad7af
progs/tests: Fix MSVC build.
2009-10-08 08:08:11 -06:00
Nicolai Hähnle
5b4c0b864a
Merge branch 'mesa_7_6_branch'
2009-10-07 20:39:22 +02:00
Brian Paul
f36425b569
progs/xdemos: test glXQueryDrawable()
2009-10-07 09:41:38 -06:00
Brian Paul
846a6b0695
progs/xdemos: fix swapped parameters to CreatePbuffer()
2009-10-07 09:41:38 -06:00
Vinson Lee
4b3cbecb3a
progs/test: Fix MSVC build.
2009-10-07 07:54:31 -06:00
Vinson Lee
9c778a90ea
progs/tests: fix MSVC build.
2009-10-06 16:02:47 -06:00
Vinson Lee
017fae04ec
progs/perf: Fix MSVC build.
2009-10-06 09:13:14 -06:00
Brian Paul
55770d09c1
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
2009-10-05 14:42:08 -06:00
Jon TURNEY
a15d9ca9cc
Fix building of GLSL demos which use M_PI
...
Some <math.h> files do not define M_PI, in which case, provide our own definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-05 11:07:23 -06:00
Brian Paul
bb659f6e53
progs/tests: additional debug code
2009-10-01 16:43:22 -06:00
Brian Paul
15c57648cd
objviewer: remove disabled code
2009-10-01 13:14:50 -06:00
Brian Paul
9745e26adb
objviewer: mouse/keyboard info in README file
2009-10-01 13:14:50 -06:00
Brian Paul
8d93a4c639
objview: clean up drawing VBO code
2009-10-01 13:14:50 -06:00
Brian Paul
c7c62521fb
objview: set skybox texture filter
2009-10-01 13:14:50 -06:00
Brian Paul
336994e54c
objview: check GL version/extension
2009-10-01 13:14:49 -06:00
Brian Paul
ca1bda552d
progs/objviewer: Wavefront .obj file loader/viewer demo
...
Adapted from code written by Nate Robins. See README.txt.
2009-10-01 13:14:48 -06:00
Chia-I Wu
e82b02c7e8
progs/egl: Make demo3 work again.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00
Chia-I Wu
28c2190336
progs/egl: Check EGL_MESA_screen_surface is supported in demo2.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00
Chia-I Wu
e0b2848f4f
progs/egl: Fix a crash in demo1.
...
The variable "configs" in main() is used without initialization.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00
Chia-I Wu
fa8df0c40d
progs/egl: Replace EGL_i915 by EGL_DEFAULT_DISPLAY.
...
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
2009-09-30 08:15:30 -06:00