Brian Paul
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
Karl Schultz
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
Karl Schultz
560d375006
windows: Add new file to project file.
2010-03-11 09:17:30 -07:00
Karl Schultz
60121c41ce
windows: fix compilation errors and warnings
2010-03-10 15:58:10 -07:00
Karl Schultz
7439f39016
windows: Quiet warning by not defining YY_NO_UNISTD_H.
2010-03-10 14:27:34 -07:00
Chia-I Wu
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
Karl Schultz
2d1088cc17
Turn off 64-bit portability problems detection.
2010-02-11 15:55:04 -07:00
Karl Schultz
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
Brian Paul
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
Michal Krol
75f371e973
Remove grammar module -- no dependencies left.
2009-12-12 16:58:43 +01:00
Brian Paul
898de4a9d5
Merge branch 'mesa_7_6_branch'
...
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
2009-11-04 17:57:20 -07:00
Karl Schultz
804d367a47
windows: updated VC8 project file
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03 16:09:29 -07:00
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
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
Brian Paul
3d6a20e5b6
mesa: rename texformat_tmp.h to texfetch_tmp.h
2009-09-30 21:08:06 -06:00
Brian Paul
74ae14a2bd
mesa: move texel fetch/store into new texfetch.[ch] files
2009-09-30 20:47:54 -06:00
Brian Paul
58e843dda0
mesa: remove s_imaging.c from build
2009-09-19 16:43:17 -06:00
Brian Paul
14869c0984
mesa: remove s_texstore.c from makefile/project files
2009-09-19 11:08:20 -06:00
Karl Schultz
09ef339b69
windows: updated VC8 project files
...
See bug 22882.
2009-07-27 13:38:35 -06:00
Brian Paul
4045a2c7d3
mesa: move shared context state functions to new shared.c file
2009-03-07 13:14:37 -07:00
Brian Paul
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
Brian Paul
2ee5ba0411
swrast: rename s_buffers.c -> s_clear.c
2009-03-07 12:09:33 -07:00
Thomas Henn
470e10dfaa
windows: fix output dir for glut project file
2009-01-21 09:32:40 -07:00
Karl Schultz
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
Brian Paul
dd92f483b0
Revert "windows: new VC8 projects statically linked against libcmt"
...
This reverts commit bbda892c55
.
Static configs rolled into regular project files (in next commit).
Provided by Karl Schultz.
2009-01-21 07:57:45 -07:00
Thomas Henn
bbda892c55
windows: new VC8 projects statically linked against libcmt
2009-01-20 09:07:01 -07:00
Karl Schultz
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
Thomas Henn
dbd8e4066b
windows: updated VC8 project files
2009-01-19 08:23:22 -07:00
Karl Schultz
a740858fc0
windows: updated VC8 project file
2009-01-15 11:32:47 -07:00
Brian Paul
aac4a0509e
windows: remove reference to swizzle.c file
2009-01-14 12:07:25 -07:00
Thomas Henn
a0318d7f8e
windows: updated VC8 project files
2009-01-12 10:56:42 -07:00
Brian Paul
88fdddcbbe
windows: added new sources for 7.3 (may be more, needs testing)
2009-01-12 08:36:21 -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
Karl Schultz
1190261c47
added prog_uniform.[ch]
2008-05-29 10:43:48 -06:00
Brian Paul
645c131264
Assorted Windows fixes (Karl Schultz)
2008-05-29 10:42:02 -06:00
Karl Schultz
9d3359d12a
dependency fixes (bug 13544)
2008-05-27 08:50:47 -06:00
Brian
65685785fa
Replace glut_fbc.c with glut_fcb.c (cb=callback)
2008-02-25 11:01:23 -07:00
Brian
3b0bd0ce17
new VC8 project files
2007-04-24 08:52:34 -06:00