2689dd304c
Merge branch '7.8'
...
Conflicts:
Makefile
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_pixel_copy.c
src/mesa/main/version.h
2010-03-23 09:14:17 -06:00
092ca30366
Fix potential compilation issue in visual studio project file
...
Add quotes around filespec in post-build event to allow paths
with embedded spaces.
2010-03-22 12:18:02 -06:00
560d375006
windows: Add new file to project file.
2010-03-11 09:17:30 -07:00
60121c41ce
windows: fix compilation errors and warnings
2010-03-10 15:58:10 -07:00
7439f39016
windows: Quiet warning by not defining YY_NO_UNISTD_H.
2010-03-10 14:27:34 -07:00
27d260b410
glapi: Move src/mesa/main/dispatch.c to glapi and rename.
...
main/dispatch.c is a glapi source file. It is part of GLAPI_SOURCES in
sources.mak and part of glapi_sources in SConscript. This commit moves
it to glapi/ and renames it to glapi_dispatch.c.
2010-02-25 21:32:58 +08:00
2d1088cc17
Turn off 64-bit portability problems detection.
2010-02-11 15:55:04 -07:00
450524a87c
Update Visual Studio Project files to compile the shader compiler and build the prebuilt shader header files.
2010-02-10 15:21:06 -07:00
ee5e84eba6
windows: assorted build fixes
...
These changes were originally submitted by Karl Schultz for Mesa 7.7-rc2
but weren't applied.
(cherry picked from commit 82c76cd16f35f4d903f49761af7eb28a755ad299)
2010-01-29 08:37:15 -07:00
75f371e973
Remove grammar module -- no dependencies left.
2009-12-12 16:58:43 +01: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
3bcf2d49f3
windows: remove old VC6 project files directory
...
Very out of date, according to Karl Schultz.
2009-11-19 08:57:39 -07:00
898de4a9d5
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
2009-11-04 17:57:20 -07:00
804d367a47
windows: updated VC8 project file
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03 16:09:29 -07:00
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
87127c83dc
windows: added remap.[ch] to project files
...
Untested. Other updates may be needed to reflect the current source files.
2009-10-26 09:06:00 -06:00
3d6a20e5b6
mesa: rename texformat_tmp.h to texfetch_tmp.h
2009-09-30 21:08:06 -06:00
74ae14a2bd
mesa: move texel fetch/store into new texfetch.[ch] files
2009-09-30 20:47:54 -06:00
58e843dda0
mesa: remove s_imaging.c from build
2009-09-19 16:43:17 -06:00
14869c0984
mesa: remove s_texstore.c from makefile/project files
2009-09-19 11:08:20 -06:00
09ef339b69
windows: updated VC8 project files
...
See bug 22882.
2009-07-27 13:38:35 -06:00
f20a0155f3
wgl: Port sharedtex_mt to WGL.
2009-03-17 14:27:47 +01:00
ad908465f1
wgl: Port glthreads to WGL.
2009-03-16 09:45:23 +01:00
4045a2c7d3
mesa: move shared context state functions to new shared.c file
2009-03-07 13:14:37 -07:00
2c37851595
mesa: move glViewport and glDepthRange functions into new viewport.c file
...
A bit of refactoring with an eye toward ES2 and GL 3.1
2009-03-07 12:33:11 -07:00
2ee5ba0411
swrast: rename s_buffers.c -> s_clear.c
2009-03-07 12:09:33 -07:00
4df482086e
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
windows/VC8/mesa/osmesa/osmesa.vcproj
windows/VC8/progs/demos/gears.vcproj
windows/VC8/progs/progs.sln
2009-01-22 09:43:42 +00:00
470e10dfaa
windows: fix output dir for glut project file
2009-01-21 09:32:40 -07:00
787a001a67
windows: another round of VC8 project file updates
...
New static configs generate DLLs that do not have a dependency on the MSCVR*
DLL's.
2009-01-21 07:59:11 -07:00
dd92f483b0
Revert "windows: new VC8 projects statically linked against libcmt"
...
This reverts commit bbda892c55
2009-01-21 07:57:45 -07:00
bbda892c55
windows: new VC8 projects statically linked against libcmt
2009-01-20 09:07:01 -07:00
61a387dca1
windows: more VC8 project file updates
...
Make some compiler flags per-file.
Remove driverfuncs.c from osmesa project.
2009-01-20 09:07:01 -07:00
dbd8e4066b
windows: updated VC8 project files
2009-01-19 08:23:22 -07:00
2e28c1fda2
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/slang/slang_compile.c
2009-01-16 16:44:53 +00:00
a740858fc0
windows: updated VC8 project file
2009-01-15 11:32:47 -07:00
658b1bdb1c
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
docs/install.html
docs/relnotes-7.3.html
src/mesa/shader/slang/slang_codegen.c
src/mesa/shader/slang/slang_compile.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_preprocess.c
src/mesa/shader/slang/slang_preprocess.h
2009-01-14 23:33:41 +00:00
aac4a0509e
windows: remove reference to swizzle.c file
2009-01-14 12:07:25 -07:00
a0318d7f8e
windows: updated VC8 project files
2009-01-12 10:56:42 -07:00
88fdddcbbe
windows: added new sources for 7.3 (may be more, needs testing)
2009-01-12 08:36:21 -07:00
b0caa10a85
Merge commit 'origin/master' into gallium-0.2
2008-12-16 15:50:14 -07:00
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
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
ef56a563a1
undo prev change to this VC7 project file
...
Meant to update the VC8 project file.
2008-05-29 10:46:39 -06:00
1190261c47
added prog_uniform.[ch]
2008-05-29 10:43:48 -06:00
645c131264
Assorted Windows fixes (Karl Schultz)
2008-05-29 10:42:02 -06:00
9d3359d12a
dependency fixes (bug 13544)
2008-05-27 08:50:47 -06:00
65685785fa
Replace glut_fbc.c with glut_fcb.c (cb=callback)
2008-02-25 11:01:23 -07:00
2d38d1b300
Remove files of unsupported build systems.
2008-02-25 17:11:28 +09:00
8822069e71
updated VC7 project files
2007-09-05 10:04:37 -06:00
b0b02507b4
remove t_save_api.c and some other obsolete files, may be more
2007-06-28 07:18:43 -06:00
Brian Paul
Karl Schultz
Chia-I Wu
Michal Krol
Ian Romanick
Alan Hourihane
Thomas Henn
Karl Schultz
Brian Paul
Keith Whitwell
José Fonseca
Christoph Kubisch