summaryrefslogtreecommitdiffstats
path: root/windows
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '7.8'Brian Paul2010-03-231-2/+2
|\ | | | | | | | | | | | | | | | | | | 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
| * Fix potential compilation issue in visual studio project fileKarl Schultz2010-03-221-2/+2
| | | | | | | | | | Add quotes around filespec in post-build event to allow paths with embedded spaces.
* | windows: Add new file to project file.Karl Schultz2010-03-111-0/+4
|/
* windows: fix compilation errors and warningsKarl Schultz2010-03-102-0/+47
|
* windows: Quiet warning by not defining YY_NO_UNISTD_H.Karl Schultz2010-03-101-32/+32
|
* glapi: Move src/mesa/main/dispatch.c to glapi and rename.Chia-I Wu2010-02-252-7/+7
| | | | | | 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.
* Turn off 64-bit portability problems detection.Karl Schultz2010-02-111-2/+2
|
* Update Visual Studio Project files to compile the shader compiler and build ↵Karl Schultz2010-02-103-29/+795
| | | | the prebuilt shader header files.
* windows: assorted build fixesBrian Paul2010-01-292-2/+18
| | | | | | | These changes were originally submitted by Karl Schultz for Mesa 7.7-rc2 but weren't applied. (cherry picked from commit 82c76cd16f35f4d903f49761af7eb28a755ad299)
* Remove grammar module -- no dependencies left.Michal Krol2009-12-122-65/+6
|
* Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-11-301-333/+0
|\ | | | | | | | | | | | | Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
| * windows: remove old VC6 project files directoryBrian Paul2009-11-191-333/+0
| | | | | | | | Very out of date, according to Karl Schultz.
* | Merge branch 'mesa_7_6_branch'Brian Paul2009-11-041-99/+103
|\| | | | | | | | | | | Conflicts: src/mesa/drivers/windows/gdi/mesa.def
| * windows: updated VC8 project fileKarl Schultz2009-11-031-99/+103
| | | | | | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* | Merge branch 'texformat-rework'Brian Paul2009-10-282-2/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | mesa: rename texformat_tmp.h to texfetch_tmp.hBrian Paul2009-09-302-2/+2
| | |
| * | mesa: move texel fetch/store into new texfetch.[ch] filesBrian Paul2009-09-302-0/+14
| | |
* | | windows: added remap.[ch] to project filesBrian Paul2009-10-262-0/+14
|/ / | | | | | | Untested. Other updates may be needed to reflect the current source files.
* | mesa: remove s_imaging.c from buildBrian Paul2009-09-192-7/+0
| |
* | mesa: remove s_texstore.c from makefile/project filesBrian Paul2009-09-192-7/+0
|/
* windows: updated VC8 project filesKarl Schultz2009-07-272-16/+40
| | | | See bug 22882.
* wgl: Port sharedtex_mt to WGL.Michal Krol2009-03-172-0/+140
|
* wgl: Port glthreads to WGL.Michal Krol2009-03-162-0/+153
|
* mesa: move shared context state functions to new shared.c fileBrian Paul2009-03-071-0/+8
|
* mesa: move glViewport and glDepthRange functions into new viewport.c fileBrian Paul2009-03-071-0/+8
| | | | A bit of refactoring with an eye toward ES2 and GL 3.1
* swrast: rename s_buffers.c -> s_clear.cBrian Paul2009-03-071-1/+1
|
* Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-228-225/+1668
|\ | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
| * windows: fix output dir for glut project fileThomas Henn2009-01-211-4/+4
| |
| * windows: another round of VC8 project file updatesKarl Schultz2009-01-218-134/+1211
| | | | | | | | | | New static configs generate DLLs that do not have a dependency on the MSCVR* DLL's.
| * Revert "windows: new VC8 projects statically linked against libcmt"Brian Paul2009-01-2110-7580/+0
| | | | | | | | | | | | | | This reverts commit bbda892c551e7d3f2d94cc877cc6e80f8568fa99. Static configs rolled into regular project files (in next commit). Provided by Karl Schultz.
| * windows: new VC8 projects statically linked against libcmtThomas Henn2009-01-2010-0/+7580
| |
| * windows: more VC8 project file updatesKarl Schultz2009-01-202-143/+11
| | | | | | | | | | Make some compiler flags per-file. Remove driverfuncs.c from osmesa project.
| * windows: updated VC8 project filesThomas Henn2009-01-195-46/+34
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-161-1/+18
|\| | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c
| * windows: updated VC8 project fileKarl Schultz2009-01-151-1/+18
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-142-2/+130
|\| | | | | | | | | | | | | | | | | | | | | 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
| * windows: remove reference to swizzle.c fileBrian Paul2009-01-141-4/+0
| |
| * windows: updated VC8 project filesThomas Henn2009-01-122-7/+99
| |
| * windows: added new sources for 7.3 (may be more, needs testing)Brian Paul2009-01-121-0/+40
| |
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-162-14/+14
|\|
| * mesa: rename slang_library_noise.[ch] to prog_noise.[ch] and rename functionsBrian Paul2008-12-152-14/+14
| | | | | | | | | | The noise functions were not glsl-specific. Also, ran indent on the code to clean it up.
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1116-5797/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Remove files of unsupported build systems.José Fonseca2008-02-2528-12235/+0
| |
* | undo prev change to this VC7 project fileBrian Paul2008-05-291-956/+422
| | | | | | | | Meant to update the VC8 project file.
* | added prog_uniform.[ch]Karl Schultz2008-05-291-0/+8
| |
* | Assorted Windows fixes (Karl Schultz)Brian Paul2008-05-293-430/+968
| |
* | dependency fixes (bug 13544)Karl Schultz2008-05-271-0/+3
| |
* | Replace glut_fbc.c with glut_fcb.c (cb=callback)Brian2008-02-253-3/+3
| |
* | updated VC7 project filesChristoph Kubisch2007-09-055-314/+475
|/
* remove t_save_api.c and some other obsolete files, may be moreBrian2007-06-282-19/+0
|