Brian Paul
|
b0caa10a85
|
Merge commit 'origin/master' into gallium-0.2
|
2008-12-16 15:50:14 -07:00 |
Brian Paul
|
702b5b076b
|
mesa: rename slang_library_noise.[ch] to prog_noise.[ch] and rename functions
The noise functions were not glsl-specific.
Also, ran indent on the code to clean it up.
|
2008-12-15 18:37:39 -07:00 |
Keith Whitwell
|
0397b2bb41
|
Merge branch 'gallium-0.1' into gallium-0.2
A first attempt at moving gallium onto a branch directly off master...
It will be interesting to see how much work this takes to get running.
Have resolved the conflicts semi-arbitarily, not compiled or tested.
Conflicts:
.gitignore
Makefile
configs/config.mgw
configs/darwin
configs/darwin-x86ppc
configs/default
configs/freebsd-dri
configs/linux-dri
configs/linux-dri-xcb
configs/linux-fbdev
configs/linux-static
configs/linux-x86-64-static
configs/linux-x86-static
doxygen/Makefile
include/GL/gl.h
progs/demos/Makefile
progs/demos/descrip.mms
progs/demos/texenv.c
progs/egl/.gitignore
progs/egl/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/convolutions.c
progs/samples/Makefile.mgw
progs/tests/.gitignore
progs/trivial/.gitignore
progs/trivial/point-param.c
progs/trivial/tri.c
progs/xdemos/.gitignore
progs/xdemos/glthreads.c
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/Makefile
src/glu/sgi/Makefile
src/glu/sgi/Makefile.mgw
src/glut/glx/Makefile.mgw
src/glut/os2/WarpWin.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/x11/dri_glx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/Makefile.mgw
src/mesa/descrip.mms
src/mesa/drivers/beos/Makefile
src/mesa/drivers/common/descrip.mms
src/mesa/drivers/common/driverfuncs.c
src/mesa/drivers/directfb/Makefile
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/drivers/dri/common/mmio.h
src/mesa/drivers/dri/common/utils.c
src/mesa/drivers/dri/common/utils.h
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i810/i810screen.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/server/i830_common.h
src/mesa/drivers/dri/i915/server/i830_dri.h
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/i965/server/i830_dri.h
src/mesa/drivers/dri/mach64/mach64_screen.c
src/mesa/drivers/dri/nouveau/nouveau_context.h
src/mesa/drivers/dri/nouveau/nouveau_fifo.c
src/mesa/drivers/dri/nouveau/nouveau_fifo.h
src/mesa/drivers/dri/nouveau/nouveau_screen.c
src/mesa/drivers/dri/nouveau/nouveau_screen.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/savage/savageioctl.h
src/mesa/drivers/fbdev/Makefile
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/osmesa/descrip.mms
src/mesa/drivers/x11/Makefile
src/mesa/drivers/x11/descrip.mms
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glthread.c
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/descrip.mms
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/glheader.h
src/mesa/main/imports.c
src/mesa/main/mipmap.c
src/mesa/main/mm.c
src/mesa/main/mm.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/math/descrip.mms
src/mesa/shader/arbprogram.c
src/mesa/shader/descrip.mms
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/prog_uniform.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/shader_api.c
src/mesa/shader/slang/descrip.mms
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/sources
src/mesa/swrast/descrip.mms
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast_setup/descrip.mms
src/mesa/tnl/descrip.mms
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/tnl.h
src/mesa/vbo/descrip.mms
src/mesa/vbo/vbo_context.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/x86-64/xform4.S
src/mesa/x86/rtasm/x86sse.c
src/mesa/x86/rtasm/x86sse.h
windows/VC6/progs/glut/glut.dsp
windows/VC7/mesa/gdi/gdi.vcproj
windows/VC7/mesa/glu/glu.vcproj
windows/VC7/mesa/mesa.sln
windows/VC7/mesa/mesa/mesa.vcproj
windows/VC7/mesa/osmesa/osmesa.vcproj
windows/VC7/progs/glut/glut.vcproj
windows/VC8/mesa/gdi/gdi.vcproj
windows/VC8/mesa/glu/glu.vcproj
windows/VC8/mesa/mesa.sln
windows/VC8/mesa/mesa/mesa.vcproj
windows/VC8/progs/glut/glut.vcproj
|
2008-09-11 16:05:15 +01:00 |
Brian Paul
|
ef56a563a1
|
undo prev change to this VC7 project file
Meant to update the VC8 project file.
|
2008-05-29 10:46:39 -06:00 |
Brian Paul
|
645c131264
|
Assorted Windows fixes (Karl Schultz)
|
2008-05-29 10:42:02 -06:00 |
Brian
|
65685785fa
|
Replace glut_fbc.c with glut_fcb.c (cb=callback)
|
2008-02-25 11:01:23 -07:00 |
José Fonseca
|
2d38d1b300
|
Remove files of unsupported build systems.
|
2008-02-25 17:11:28 +09:00 |
Christoph Kubisch
|
8822069e71
|
updated VC7 project files
|
2007-09-05 10:04:37 -06:00 |
Brian
|
b0b02507b4
|
remove t_save_api.c and some other obsolete files, may be more
|
2007-06-28 07:18:43 -06:00 |
Brian Paul
|
24edd90159
|
Move mipmap generation functions, texture scaling functions into new
mipmap.c file.
|
2006-09-29 01:24:26 +00:00 |
Brian Paul
|
a97492f4df
|
added arrayobj.[ch] files
|
2006-07-21 19:56:52 +00:00 |
Brian Paul
|
d2e5598cd3
|
added rbadaptors.[ch] files
|
2006-05-19 03:37:41 +00:00 |
Karl Schultz
|
cec74532bf
|
Add newest source code files to project.
|
2006-03-29 20:55:48 +00:00 |
Brian Paul
|
2c61fdafd6
|
added s_blit.c
|
2006-03-01 02:00:58 +00:00 |
Brian Paul
|
1add059bd1
|
Removed the GL_SGIX/SGIS_pixel_texture extensions. Same thing can be
done with fragment programs nowadays.
|
2005-12-14 03:04:58 +00:00 |
Brian Paul
|
9fd133511c
|
removed arbfragparse.[ch] arbvertparse.[ch]
|
2005-11-19 15:37:00 +00:00 |
Brian Paul
|
94f70fab64
|
added depthstencil.[ch]
|
2005-11-16 04:12:08 +00:00 |
Brian Paul
|
dc4070c787
|
updated for new mm.c, execmem.c files
|
2005-10-19 01:28:14 +00:00 |
Brian Paul
|
7fb9352fe4
|
replace s_texture.[ch] with s_texcombine.[ch] and s_texfilter.[ch]
|
2005-09-15 01:00:20 +00:00 |
Karl Schultz
|
ee850657e6
|
VC7 project file for building glut lib
|
2005-07-01 20:25:57 +00:00 |
Karl Schultz
|
0cf67634bb
|
VC7 project file for gears demo
|
2005-07-01 20:25:23 +00:00 |
Karl Schultz
|
101d05ad94
|
VC7 Solution file for building glut and demos
|
2005-07-01 20:24:49 +00:00 |
Karl Schultz
|
c5b6580c6f
|
VC7 project file for osmesa
|
2005-07-01 20:23:52 +00:00 |
Karl Schultz
|
35a11c14ee
|
VC7 project file for core mesa lib
|
2005-07-01 20:23:23 +00:00 |
Karl Schultz
|
ec171b7d02
|
VC7 project file for glu
|
2005-07-01 20:22:41 +00:00 |
Karl Schultz
|
2de5f6e252
|
VC7 project file for gdi driver
|
2005-07-01 20:21:45 +00:00 |
Karl Schultz
|
b64d60a2a6
|
Visual Studio 7 solution file for mesa lib
|
2005-07-01 20:19:47 +00:00 |