Brian Paul
a196a5d330
progs/samples: improve copy.c demo
...
If the test image was larger than the window, nothing was drawn because
of invalid raster position. Use glWindowPos instead of glRasterPos.
Also, use integer src/dst coordinates to avoid grabbing black pixels
outside of the src image region.
2010-03-17 10:17:06 -06:00
Brian Paul
bf1974b37d
progs/samples: silence warnings
2010-03-17 10:11:09 -06:00
Brian Paul
5ac16495a2
Merge branch 'mesa_7_7_branch'
...
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
2010-01-04 19:16:24 -07:00
Vinson Lee
3ea5a95078
progs/samples: Silence compiler warnings.
2010-01-03 21:29:33 -08:00
Vinson Lee
646c8ce032
progs/samples: 'Silence no previous prototype' warnings.
2010-01-01 17:54:11 -08:00
José Fonseca
7bbf7f94ea
scons: Build progs together with everything else.
...
This is a substantial reorganization, This particular commit enables:
- building the progs for unices platforms
- glew is now built as a shared library (it is the default, and it is
inconvenient and pointless to shift away from that default)
- all progs get built by default
2010-01-01 12:16:19 +00:00
José Fonseca
58b401315b
progs: Ignore derived files.
2010-01-01 12:16:19 +00:00
Vinson Lee
1cf60c9810
progs/samples: Byte swap individual members of struct _rawImageRec.
2009-12-10 15:41:13 -08:00
Vinson Lee
1446f30875
progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.
2009-12-05 01:43:29 -08:00
Vinson Lee
412aeeed1c
progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.
2009-12-05 01:38:14 -08:00
Vinson Lee
6212c8103a
progs/samples: Add rgbtoppm to Makefile.
2009-12-05 01:28:47 -08:00
Brian Paul
d762b5459b
progs/samples: added test/debug code for culling
2009-08-31 19:34:47 -06:00
Brian Paul
5be48307d5
demos: remove some old debug/test code
2009-05-27 19:37:32 -06:00
Brian Paul
0d0028e6df
demos: use larger buffer for snprintf() call, see bug 21220
2009-04-16 09:25:52 -06:00
José Fonseca
52233f27bb
progs: Build samples dir with scons and glew.
2009-02-10 20:28:08 +00:00
Keith Whitwell
cc7dd4fc1b
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
Makefile
progs/demos/Makefile
progs/glsl/Makefile
progs/redbook/Makefile
progs/samples/Makefile
progs/tests/Makefile
progs/trivial/Makefile
progs/xdemos/Makefile
src/gallium/Makefile
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/vbo/vbo_exec_draw.c
2008-09-11 18:32:05 +01:00
Brian Paul
90c93bbeee
define new APP_CC configuration variable for building apps/demos/tests
...
For Cell, need to use different compilers for the libraries vs. the demos/tests
to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
2008-09-11 11:00:54 -06: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
Dan Nicholson
0a4867bd4c
Ignore more generated files in progs/
...
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
2008-05-20 19:04:57 -04:00
José Fonseca
2d38d1b300
Remove files of unsupported build systems.
2008-02-25 17:11:28 +09:00
Brian
92e4090b4c
add a few more logicop modes, simplify code
2007-11-27 10:31:55 -07:00
Dan Nicholson
c05aa5ec4c
specify app lib dependencies in Makefiles (patch 1/3)
2007-10-29 09:03:01 -06:00
José Fonseca
414a933ad2
Ignore generated files.
2007-10-25 23:25:02 +01:00
Dan Nicholson
b182613f2f
Ignore more generated files in progs/
...
Many of the directories in progs/ were missing .gitignore files or
were tracking generated files. This patch is basically the process of
running `make' in each directory and then finding the untracked files
with `git-ls-files -o --exclude-per-directory=.gitignore'. The existing
files were also sorted.
2007-10-10 08:44:58 -06:00
Dan Nicholson
2a3e33865d
add support for LDFLAGS env var
2007-09-28 18:42:21 -06:00
Zhang
35f35294cd
more Mingw32 fixes
2007-07-27 11:19:35 -06:00
michal
e0a26b0467
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
2007-07-27 10:05:40 +02:00
Zhang
76fb808910
Fix a number of MINGW32 issues
2007-07-21 11:28:06 -06:00
Brian
86352ff70d
Added colormask, dither, multisample state. Implement colormasking stage.
2007-07-12 12:20:14 -06:00
Brian
e7e5279fc0
Remove unused Imakefiles.
2007-04-20 19:18:13 -06:00
Michel Dänzer
14f92636b0
Make git ignore files only generated at build time.
2006-12-06 14:17:56 +01: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
Daniel Borca
731f1b12a0
remove stupid flags
2005-05-23 22:02:53 +00:00
Brian Paul
6f3d16c64a
assorted warning clean-ups for x86_64, etc (Mikko T.)
2005-05-07 17:06:49 +00:00
Daniel Borca
fc4cabbfa8
makefile update (readtex, showbuffer)
2005-01-31 13:23:55 +00:00
Brian Paul
527af7571e
minor readtex fixes
2005-01-09 18:05:02 +00:00
Brian Paul
c1065ee977
compute reasonable animate rate (Marcelo Magallon)
2005-01-08 23:52:01 +00:00
Brian Paul
0261042beb
fix-up rules for sphere demo, which uses readtex utility
2005-01-08 23:51:50 +00:00
Daniel Borca
3f1205819a
updated makefiles for gcc 3.4.3 and bnu 2.15
2004-12-15 08:00:43 +00:00
Brian Paul
be9b759ab0
remove BeOS conditional code. oglinfo should be moved to xdemos since it's a GLX program
2004-08-25 14:51:18 +00:00
Philippe Houdoin
ea446b56ab
Obsolete BeOS-specific makefile.
...
Removed the oglinfo target from samples from BeOS build, as it depends on X.
2004-08-14 10:03:11 +00:00
Roland Scheidegger
9e29536f28
use OGL 1.1 color logic ops in addition to GL_EXT_blend_logic_op
2004-05-21 17:03:38 +00:00
Brian Paul
362f1df210
obsolete
2004-04-22 00:42:38 +00:00
Brian Paul
5c2040c768
minor fixes
2004-03-26 23:58:08 +00:00
Brian Paul
46727c7496
Tweaks for make clean / realclean.
2004-03-26 20:31:05 +00:00
Brian Paul
de0ee3187c
New Makefile system
2004-03-26 15:19:11 +00:00
Daniel Borca
0ee5f6203c
reverted TMUs for proper multitexturing
2003-12-23 14:11:22 +00:00
Daniel Borca
009d7f8ba1
Minor MinGW fixes
2003-10-09 15:15:07 +00:00
Brian Paul
5fd77da4f6
improved 'clean' targets (Otto Solares)
2003-10-03 14:03:14 +00:00
Brian Paul
a75246f8f5
updates from Daniel Borca
2003-10-02 17:36:43 +00:00
