Commit Graph

334 Commits

Author SHA1 Message Date
Brian
9612a3011f fix some dependencies, remove some CFLAGS 2007-04-08 15:42:26 -06:00
Brian
0420d8505a disable MakeTexture() 2007-03-27 16:06:48 -06:00
Brian
180cc2f845 disable assertion 2007-03-21 11:41:41 -06:00
Brian
2cf5fd48d1 Merge branch 'origin' into glsl-compiler-1
Conflicts:

	src/mesa/main/context.c
2007-03-09 11:43:53 -07:00
Brian
9f37be694e s/ARB/MESA/ in extension check (bug 10126) 2007-02-28 11:58:06 -07:00
Brian
29c471aafc Merge branch 'origin' into glsl-compiler-1
Conflicts:

	src/mesa/main/state.c
	src/mesa/shader/program.c
	src/mesa/shader/program.h
	src/mesa/shader/programopt.c
	src/mesa/shader/slang/slang_execute.c
	src/mesa/sources
	src/mesa/swrast/s_arbshader.c
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_context.c
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_vb_arbprogram.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/tnl/t_vtx_eval.c
2007-02-22 08:53:33 -07:00
Brian
917a5086b3 Use gl_LightSource[0].position intead of a light position uniform. 2007-02-21 15:57:55 -07:00
Brian
f4e345c1a8 minor fprintf() change 2007-01-17 16:30:11 -07:00
Brian
46a9241248 add texturing, other options 2007-01-17 10:25:44 -07:00
Xiang, Haihao
afba8f0d30 Fix bug#9673
Cast from pointer to unsinged long and cast to pointer from
 unsinged long
2007-01-17 10:17:10 +08:00
Brian
becb393d42 Use extfuncs.h helper. Added command line options for loading
vertex/fragment shaders from files.
2006-12-15 09:31:14 -07:00
Michel Dänzer
14f92636b0 Make git ignore files only generated at build time. 2006-12-06 14:17:56 +01:00
Brian Paul
4b43054c4b added fsligght 2006-11-03 00:16:12 +00:00
Brian Paul
24ea2c2cef yet another deriviative of the fplight.c demo for OpenGL 2.0 shading language 2006-11-03 00:04:06 +00:00
Keith Whitwell
48e6fff3a9 merge the (rest of) texmem branch 2006-11-01 14:26:10 +00:00
Ian Romanick
e4298b9492 Add missing call to glutInit. 2006-10-24 20:50:08 +00:00
Brian Paul
1ad12874b3 allocate larger TempImage, use COMBO var to choose test format/type 2006-09-23 16:09:26 +00:00
Roland Scheidegger
af1dc7e487 move initialization code aroudn so glPointParameter isn't called before checking the extension is present 2006-08-28 21:19:34 +00:00
Brian Paul
a394f546a4 check for GL_ARB_point_parameters 2006-08-28 14:20:19 +00:00
Michal Krol
1616f5b621 Change fragment shader to utilize faster vec4 operations. 2006-08-02 14:46:50 +00:00
Brian Paul
cc738e004f casts and assertions 2006-08-01 20:03:29 +00:00
Brian Paul
f05e7eba95 code to draw engine block 2006-08-01 20:03:05 +00:00
Michal Krol
39dd5196e6 Optimize shaders.
Use frame counter.
2006-07-29 09:42:03 +00:00
Brian Paul
883f9891cb LIB_DIR is now just 'lib' or 'lib64'
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
2006-07-13 02:50:27 +00:00
Brian Paul
d8bb5ea967 call glutDestroyWindow() to allow checking for mem leaks upon exit 2006-07-12 02:32:21 +00:00
Brian Paul
1ff8daf21e New animated engine demo. 2006-07-04 21:43:21 +00:00
Brian Paul
66c9be06f9 remove occlude.c demo since GL_HP_occlusion_test no longer available 2006-06-30 15:57:05 +00:00
Brian Paul
4e0617849c use trackball code for mouse rotation 2006-06-26 23:00:15 +00:00
Michel Dänzer
73e73ffdd5 Fix command line parsing. 2006-06-13 08:37:03 +00:00
Ian Romanick
ee34e6ef71 Add support for GL_APPLE_vertex_array_object. Several test programs
and demos are also added.

Adding basic support to drivers should be as easy as just enabling the
extension, though thorough test would also be required.
2006-06-12 16:26:29 +00:00
Michal Krol
6acf1e93a2 Remove carriage returns. 2006-04-25 10:11:59 +00:00
Brian Paul
c4a4864210 compile fix from Dan Schikore 2006-04-13 01:49:45 +00:00
Brian Paul
68ad7ca3ba allow rotation w/ mouse 2006-04-11 23:41:40 +00:00
Brian Paul
e099ce85ca re-enable animation 2006-04-06 04:34:09 +00:00
Brian Paul
762c3618f5 Added render to depth texture support with GL_EXT_framebuffer_object.
Only render the shadow/depth texture when really needed, not every frame.
Remove support for old SGIX shadow extensions.
2006-04-06 04:11:28 +00:00
Brian Paul
1979b6b2de set the texture border color for the depth texture 2006-04-05 03:26:12 +00:00
Brian Paul
ec83f38e2e fix bad call to FindLine() 2006-03-30 14:26:29 +00:00
Brian Paul
197d725601 added -f option for full-screeen 2006-03-30 14:25:54 +00:00
Brian Paul
693a66aea9 press '0' for glDrawBuffer(GL_NONE) 2006-03-30 14:24:58 +00:00
Brian Paul
62c325af3f fix GETPROCADDRESS usage, remove carriage return chars (bug 6430) 2006-03-29 23:20:49 +00:00
Brian Paul
32244ac7e9 s/glslnose.c/glslnoise/ (bug 6430) 2006-03-29 23:18:13 +00:00
Karl Schultz
b7a5a9db88 Windows makefile to easily build all demo programs. 2006-03-29 04:02:44 +00:00
Karl Schultz
b687531f69 Undef a conflicting symbol in Windows. 2006-03-29 03:42:32 +00:00
Karl Schultz
54b65e080e add showbuffer.[ch] which could be in this dir after the targets are built. 2006-03-29 03:41:38 +00:00
Karl Schultz
4f21180416 Remove unneeded includes of time.h 2006-03-29 02:09:47 +00:00
Brian Paul
10f08cc202 use 'p' key to toggle use of GL_EXT_packed_depth_stencil 2006-03-15 01:44:03 +00:00
Michal Krol
cc1591667d More GLSL code:
- uniforms (only GetLocation, Uniform1f and Uniform4fv for now for demos);
- fix bugs and optimize array size handling;
- 2D texture sampling (needs Enable(TEXTURE_2D) to work);
- decrease built-in library assembly size by 30%.
2006-02-21 12:35:06 +00:00
Michal Krol
3654193a4d More GLSL code.
- general constructors allowed;
- implement noise functions (from Stefan Gustavson - thanks!)
- cosmetic stuff.
2006-02-18 15:11:18 +00:00
Michal Krol
3699751b0b Demonstrate GLSL fragment and vertex shaders. 2006-02-15 10:58:52 +00:00
Brian Paul
7905b19ec9 use fmod() when incrementing CubeRot 2006-01-30 15:35:35 +00:00