Brian Paul
b40dc7e7fc
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/vbo/vbo_exec_draw.c
2009-06-30 08:56:53 -06:00
Keith Whitwell
14a2b5445a
progs/util: make sure function pointers are initialized
...
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
2009-06-30 15:41:43 +01:00
Jakob Bornecrantz
ba7f45ac0c
progs/tests: Add tests for glCompressedTexSubImage
2009-06-30 14:11:29 +02:00
Jon TURNEY
57955451f8
xdemos: Fix xdemos which default to using display :0.0 to default to $DISPLAY
...
Fix xdemos which default to using display :0.0 to default to $DISPLAY,
this is kind of irritating when testing on a display other than :0.0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-06-30 13:58:21 -06:00
Keith Whitwell
e5cb11adda
mesa/vbo: fix compile and replay of nodes ending in a FALLBACK
...
Where vbo save nodes are terminated with a call to DO_FALLBACK(), as in
the case of a recursive CallList which is itself within a Begin/End pair,
there two problems:
1) The display list node's primitive information was incorrect, stating
the cut-off prim had zero vertices
2) On replay, we would get confused by a primitive that started in a
node, but was terminated by individual opcodes.
This change fixes the first problem by correctly terminating the last
primitive on fallback, and the second by forcing the display list to
use the Loopback path, converting all nodes into immediate-mode rendering.
The loopback fix is a performance hit, but avoiding this would require
a fairly large rework of this code.
2009-06-30 19:59:38 +01:00
Keith Whitwell
53f8dccd0c
progs/trivial: test case for dlist statechange elimination
...
Creates a display list with redundant call to glShadeModel.
View dlist contents with MESA_VERBOSE=list
2009-06-30 12:20:24 +01:00
Brian Paul
8d24160a40
progs/glsl: link with GLEW library
...
(cherry picked from commit b1f2f92d9b
2009-06-30 11:47:51 +01:00
Brian Paul
7b5373c434
Merge branch 'mesa_7_5_branch'
2009-06-29 11:20:07 -06:00
Brian Paul
b1f2f92d9b
progs/glsl: link with GLEW library
2009-06-29 10:32:04 -06:00
Keith Whitwell
9014f475ff
progs/util: make sure function pointers are initialized
...
Call Init() from CompileShaderFile, was previously only called for the
Text version of this function.
2009-06-29 16:07:14 +01:00
Keith Whitwell
b799af91d5
progs/glsl: compile with scons and glew
...
Get most of these working with scons.
2009-06-29 14:15:08 +01:00
Brian Paul
eb1eee03a6
demos: improve argv parsing in fslight.c
2009-06-26 13:16:32 -06:00
Brian Paul
b79e6a59d8
demos: fix issues in glxcontexts.c
...
The reshape() function was called when there was no GLX context so
the viewport/modelview/projection setup wasn't doing anything. Move
the call to reshape() into draw().
Also, remove -stereo, -fullscreen options and do some general clean-up.
2009-06-23 09:31:27 -06:00
José Fonseca
1bee650ef3
progs/wgl: Fix shreadtex_mt too.
2009-06-17 15:23:25 +01:00
José Fonseca
6e24fdeae5
progs/wgl: Tweak the initialization wait in wglthreads.
...
There was still a non-zero probability for wglShareLists of failing.
2009-06-17 15:23:25 +01:00
José Fonseca
557421b6de
progs/wgl: Get wglShareLists working in wglthreads.
...
wglShareLists is a little picky -- it seems to check if it has exclusive
access to a lock, and fails if it doesn't.
This allows the texture to be shared with all windows.
2009-06-17 15:23:25 +01:00
José Fonseca
992000cce7
progs/wgl: Allow resizing wglthreads' windows.
2009-06-17 10:08:24 +01:00
José Fonseca
077c5e62d8
progs/wgl: Quit after displaying usage for -h option.
2009-06-16 12:34:29 +01:00
José Fonseca
06075711af
progs/wgl: Use appropriate types to silence msvc warnings.
2009-06-16 12:29:58 +01:00
José Fonseca
566bdbe67d
progs/wgl: Fix assertion failure in wglthreads' texture creation.
2009-06-16 12:29:58 +01:00
José Fonseca
0e1abced56
progs/tests: Use opaque colors.
...
Transparency is not relevant for this example, and leads to distraction
due to different results in alpha visuals, when capturing images to disk.
2009-06-15 15:40:10 +01:00
Jakob Bornecrantz
2fe65e8f14
Merge branch 'mesa_7_5_branch'
2009-06-14 16:56:34 +02:00
Brian Paul
f57280cc73
Merge branch 'arb_vertex_array_object'
2009-06-26 17:49:14 -06:00
Brian Paul
a18e209edb
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/gallium/drivers/softpipe/sp_screen.c
src/mesa/main/version.h
2009-06-26 17:07:07 -06:00
Brian Paul
31618f1a88
tests: update bufferobj.c to test GL_ARB_vertex_array_object
2009-06-22 17:51:30 -06:00
Brian Paul
9038b6c8bb
Merge branch 'ext-provoking-vertex'
...
Conflicts:
docs/relnotes-7.6.html
progs/tests/Makefile
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/glx/x11/indirect.c
src/mesa/glapi/Makefile
src/mesa/glapi/dispatch.h
src/mesa/glapi/glapioffsets.h
src/mesa/glapi/glapitable.h
src/mesa/glapi/glapitemp.h
src/mesa/glapi/glprocs.h
src/mesa/main/dlist.c
src/mesa/main/enums.c
src/mesa/sparc/glapi_sparc.S
src/mesa/x86-64/glapi_x86-64.S
src/mesa/x86/glapi_x86.S
2009-06-19 09:15:34 -06:00
Jakob Bornecrantz
edbec6b112
progs/rbug: Add small program to add block rules
2009-06-18 14:36:19 +02:00
Brian Paul
8d48222791
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/api_validate.c
2009-06-16 18:25:52 -06:00
Thomas Hellstrom
f5888d9ca5
Merge branch 'mesa_7_5_branch'
...
Conflicts:
progs/util/extfuncs.h
2009-06-15 11:43:48 +02:00
Jakob Bornecrantz
e99d13bbc6
progs/tests: Add yet another mipmap test
2009-06-14 01:44:34 +02:00
Brian Paul
a04af335a4
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/drivers/dri/i915/i915_tex_layout.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/drivers/dri/intel/intel_pixel_draw.c
src/mesa/main/enums.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_exec_array.c
2009-06-24 08:54:37 -06:00
Roland Scheidegger
7a5c5b9af3
demos: make cubemap work without EXT_fbo support
...
use SGIS_generate_mipmap if EXT_fbo support (for manual mipmap generation)
is not available.
2009-06-20 00:28:38 +02:00
Brian Paul
193177b732
tests: added persp_hint.c test
...
Test the effect of GL_PERSPECTIVE_CORRECTION_HINT on color interpolation.
2009-06-12 15:59:53 -06:00
Brian Paul
5379f35a15
tests: added arbgpuprog, for compile-testing ARB vertex/fragment programs
2009-06-12 08:16:18 -06:00
Brian Paul
fb64365642
demos: update fbotexture.c to use EXT or ARB functions exclusively
...
When the -arb option is specified we use GL_ARB_framebuffer_object intead
of GL_EXT_framebuffer_object.
For some vendors' OpenGL it's important to call the ARB entrypoints
instead of the EXT entrypoints to get correct behaviour. Use some
function pointer tricks to do this (instead of GLEW).
2009-06-12 08:15:33 -06:00
Brian Paul
476685c63c
util: additional function pointers
2009-06-12 08:15:33 -06:00
Jakob Bornecrantz
1cd0afffc9
progs/rbug: Add binary to bmp converter program
2009-06-12 15:07:57 +01:00
José Fonseca
bf89ecb6c9
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
2009-06-11 16:34:56 +01:00
José Fonseca
e3f14f2f3b
progs: Port fp programs to GLEW.
2009-06-11 13:19:34 +01:00
Brian Paul
0195cc1c0d
tests: prim.c demo, modified for GL_EXT_provoking_vertex
2009-06-09 22:00:22 -06:00
Brian Paul
39fd18014c
tests: need tkmap.c for prim.c
2009-06-09 21:59:36 -06:00
Jakob Bornecrantz
ee98ae5a29
Merge branch 'mesa_7_5_branch'
...
Conflicts:
Makefile
src/mesa/main/version.h
src/mesa/shader/slang/slang_preprocess.c
src/mesa/state_tracker/st_cb_bufferobjects.c
2009-06-09 07:53:25 +02:00
Brian Paul
29c79a03a4
tests: check for GL_EXT/ARB_framebuffer_object
2009-06-09 15:06:41 -06:00
Brian Paul
073c20befa
tests: also test glGetTexImage with render to texture
...
Also, adjust texture dims for the original test.
And use GLEW.
2009-06-09 15:05:36 -06:00
Brian Paul
139f2ddde4
tests: quick and dirty glGetTexImage() test program
2009-06-09 14:05:17 -06:00
Jakob Bornecrantz
283e84bfb3
progs/tests: Add some scissor tests
2009-06-08 14:45:40 +02:00
Brian Paul
9d58724c51
Merge branch 'mesa_7_5_branch'
...
Conflicts:
src/mesa/main/context.c
2009-06-04 13:16:13 -06:00
Keith Whitwell
97f5953ced
progs/vpglsl: add similar support for point rendering as progs/vp
2009-06-01 18:40:21 -07:00
Keith Whitwell
00e7a60077
trivial/tri-z: add controls for depthrange min/max
...
Also add key to set up quake-1 style ztrick rendering with clear depth
1.0, deptrange(1.0, 0.0) and depthfunc GL_GREATER.
2009-06-01 18:39:58 -07:00
José Fonseca
3c756ed39f
progs/wgl: Small cleanup to wglinfo.
2009-06-01 18:23:20 -07:00
