KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,700 Commits 1 Branch 0 Tags 356 MiB
Commit Graph

244 Commits

Author SHA1 Message Date
Brian Paul ec2b92f98c mesa: rename src/mesa/shader/ to src/mesa/program/ 2010-06-10 23:23:13 -06:00
Brian Paul f1c5043f94 mesa: move shader/slang/* sources to main/slang/* 
Reduce the source tree depth a bit.
 2010-06-10 22:48:16 -06:00
Jakob Bornecrantz 0528106cc7 glew: Drop glew now that we don't need it for the progs 
configs/beos           |    2 +-
 configs/darwin         |    2 +-
 configs/default        |    4 +-
 configs/freebsd-dri    |    2 +-
 configs/linux-cell     |    2 +-
 configs/linux-dri-xcb  |    2 +-
 configs/linux-indirect |    2 +-
 configure.ac           |    2 +-
 include/GL/glew.h      |14435 ------------------------------------------------
 include/GL/glxew.h     | 1476 -----
 include/GL/wglew.h     | 1247 -----
 src/SConscript         |    1 -
 src/glew/LICENSE.txt   |   73 -
 src/glew/Makefile      |   54 -
 src/glew/SConscript    |   69 -
 src/glew/glew.c        |14320 -----------------------------------------------
 src/glew/glewinfo.c    | 8441 ----------------------------
 src/glew/visualinfo.c  | 1173 ----
 18 files changed, 8 insertions(+), 41299 deletions(-)

Revert "glew: update to version 1.5.4"
This reverts commit a189b1c53b.

Revert "glew: Include X11 headers and libraries in SCons build."
This reverts commit efdd33985c.

Revert "scons: Fix GLEW build on Mac OS X."
This reverts commit 8f81769148.

Revert "scons: Use static glew library on Unices to avoid binary compatability issues"
This reverts commit de22c940a1.

Revert "glew: Update to version 1.5.2."
This reverts commit aaf7ecfd81.

Revert "scons: Build glew on all platforms."
This reverts commit 52eb3e4235.

Revert "scons: Put glut and glew shared libraries into build/xxx/bin or lib."
This reverts commit 8a318edd08.
Didn't revert scons/gallium.py

Revert "scons: Fix glew build on MSVC."
This reverts commit 14a8c9dac7.

Revert "scons: Build progs together with everything else."
This reverts commit 7bbf7f94ea.
Only changed src/glew/SConscript

Revert "mesa: include glew headers in MesaDemos tarballs"
This reverts commit c57d81ddc9.

Revert "mesa: include GLEW sources in MesaDemos tarball"
This reverts commit b9e2e32daf.

Revert "glew: correct misspelling of glFramebufferTextureLayer"
This reverts commit 1b05b5b4fe.

Revert "glew: fix GLEW_LIB_NAME"
This reverts commit c10df26a31.

Revert "Add dummy install target for glew to fix 'make install'"
This reverts commit c273dfe6a2.

Revert "autoconf: Add GLEW needed by progs when building GLUT"
This reverts commit 2977cee38e.

Revert "glew: Build it as a static lib."
This reverts commit fcf9353fea.

Revert "glew: Initial import."
This reverts commit 57d00016ca.
 2010-06-08 02:07:24 +02:00
Kristian Høgsberg 56c3cce2a1 Remove last bits of progs/ infrastructure 2010-06-07 10:08:48 -04:00
Brian Paul 0a401b5d2f mesa: remove old references to demo files and progs subdir 2010-06-04 17:47:53 -06:00
Chia-I Wu e8d8ea2a39 progs: Remove remaining EGL demos. 
They have been moved to git+ssh://git.freedesktop.org/git/mesa/demos.
 2010-05-21 22:13:32 -06:00
Chia-I Wu 238f782982 Update file list for the tarballs. 
Mainly for the recent work on mapi and gles.  The latter adds some
sources to src/mesa/main that are generated on the fly.  This makes
python a requirement for building Mesa.  An alternative is to package
those sources into the tarballs.  That may be done in another commit.
 2010-05-08 16:14:52 +08:00
Brian Paul 1fdedf067d mesa: added Makefile.egl to GALLIUM_FILES 2010-04-05 17:33:12 -06:00
Thierry Vignaud 7fc3a766c0 mesa: add missing file to GALLIUM_FILES 
Signed-off-by: Brian Paul <brianp@vmware.com>
 2010-04-05 17:31:28 -06:00
Chia-I Wu a49db89326 Update DEMO_FILES for demos using EGL. 
Reflect the recent addtion of eglut and reorganization of the EGL demos.
This helps remove ~2k lines of duplicated code

$ git diff --shortstat -M 57cc1db87b
 18 files changed, 298 insertions(+), 2178 deletions(-)
 2010-04-01 22:29:48 +08:00
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
Chia-I Wu 2ded27b2f0 Add missing EGL files to the tarballs. 
Add the Makefile of Gallium EGL drivers and demos using EGL to the
tarballs.
 2010-03-23 14:46:03 +08:00
Ian Romanick 4eead42550 mesa: set version string to 7.8-rc2 2010-03-22 18:09:15 -07:00
Pauli Nieminen f0f04cd12d Merge branch '7.8' into master 
Conflicts:
	Makefile
	src/mesa/main/version.h
 2010-03-17 11:26:48 +02:00
Ian Romanick c1c9fad293 Remove nonexistant files from tarballs rule of Makefile 
The Makefile should eventually be fixed to stop building tarballs if
one of the individual calls to tar fails.
 2010-03-16 10:21:37 -07:00
Ian Romanick f0c3262927 mesa: set version string to 7.8-rc1 2010-03-16 10:21:37 -07:00
George Sapountzis 323238864f include/GL: drop more deprecated headers 2010-03-06 15:18:51 +02:00
Brian Paul 6ce4a85e0b mesa: bump version to 7.9 
Now that the 7.8 branch has been created Mesa/master will be version 7.9
 2010-03-05 17:35:10 -07:00
Brian Paul e215830c38 mesa: update tarball file list, bump version string 2010-02-26 08:21:44 -07:00
George Sapountzis 9a4a219d20 drop header files and demos for dropped window systems 2010-02-26 04:02:41 +02:00
George Sapountzis ddecefbb82 drop linux-solo configs 2010-02-26 04:02:41 +02:00
Kristian Høgsberg 40c6bb58be Drop classic mesa svga driver 2010-02-25 17:40:10 -05:00
Kristian Høgsberg e14a5b14b2 Drop glide driver 2010-02-25 17:40:10 -05:00
Kristian Høgsberg 230d263aca Remove GGI support 2010-02-25 17:40:10 -05:00
Kristian Høgsberg b5c3199afe Remove dos driver 2010-02-25 17:40:10 -05:00
Kristian Høgsberg 4387580e50 Remove directfb support 2010-02-25 17:40:09 -05:00
George Sapountzis 295a02549d glapi: fix es after mv 2010-02-24 02:11:31 +02:00
José Fonseca c3168e050e makefiles: Don't complaint about changing configs if the same one is reselected. 
Otherwise it creates unnecessary pain when automating builds in a build
server/farm.
 2010-02-14 13:15:49 +00:00
Brian Paul 3c28fad20b mesa: remove darwin-x86ppc and dangling darwin refs in Makefile 2010-02-11 09:04:03 -07:00
Kristian Høgsberg 6e8897ff9f Retire miniglx and move the actual glx code up to src/glx 2010-02-09 09:58:36 -05:00
José Fonseca bee9964b29 Merge remote branch 'origin/master' into lp-binning 
Conflicts:
	Makefile
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/lp_flush.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_texture.c
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
	src/mesa/state_tracker/st_cb_condrender.c
 2010-01-31 05:36:33 +00:00
Chia-I Wu 562c127693 Merge branch 'master' into opengl-es-v2 
Conflicts:
	src/mesa/main/dd.h
 2010-01-12 11:25:02 +08:00
José Fonseca 080c40ab32 Merge remote branch 'origin/master' into lp-binning 
Conflicts:
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/Makefile
	src/gallium/drivers/llvmpipe/SConscript
	src/gallium/drivers/llvmpipe/lp_bld_arit.c
	src/gallium/drivers/llvmpipe/lp_bld_flow.c
	src/gallium/drivers/llvmpipe/lp_bld_interp.c
	src/gallium/drivers/llvmpipe/lp_clear.c
	src/gallium/drivers/llvmpipe/lp_context.c
	src/gallium/drivers/llvmpipe/lp_context.h
	src/gallium/drivers/llvmpipe/lp_draw_arrays.c
	src/gallium/drivers/llvmpipe/lp_jit.c
	src/gallium/drivers/llvmpipe/lp_jit.h
	src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_state.h
	src/gallium/drivers/llvmpipe/lp_state_blend.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_sampler.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.h
	src/gallium/drivers/llvmpipe/lp_tex_sample.h
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
 2010-01-08 15:42:57 +00:00
Brian Paul c9a210f158 makefile: added src/glsl/Makefile.template to tarball list 2010-01-07 08:43:24 -07:00
Chia-I Wu 976c858acc Clean up ES_FILES. 
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
 2010-01-05 08:08:30 -07:00
Keith Whitwell aa02683e45 Merge branch 'i965g-restart' 
Conflicts:
	configure.ac
 2009-12-22 09:40:39 +00:00
Brian Paul 9eb7fc6661 Merge branch 'mesa_7_7_branch' 
Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c
 2009-12-21 18:35:54 -07:00
Keith Whitwell a5585cb533 Merge commit 'origin/master' into i965g-restart 
Conflicts:
	SConstruct
	configs/default
	configs/linux-dri
 2009-12-21 19:18:41 +00:00
Brian Paul 6a7b6a530d llvmpipe: added linux-llvm-debug configuration 2009-12-18 11:17:06 -07:00
Michal Krol 75f371e973 Remove grammar module -- no dependencies left. 2009-12-12 16:58:43 +01:00
Michal Krol a3eb0f718e Merge branch 'master' into glsl-pp-rework-2 
Conflicts:
	progs/perf/drawoverhead.c
	progs/perf/teximage.c
	progs/perf/vbo.c
	progs/perf/vertexrate.c
	src/mesa/shader/slang/library/slang_common_builtin_gc.h
 2009-12-12 16:48:32 +01:00
michal 068596c9a7 Build mesa glsl with make. 
Still don't know how to add glsl to mesa dependencies.
 2009-12-10 01:03:15 +01:00
Ian Romanick ba167f812c mesa: set version string to 7.7-rc1 
Also modify the Makefile to use the correct version for the tarballs.
 2009-12-07 17:18:56 -08:00
Ian Romanick 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
Brian Paul cba614bd88 mesa: omit VC6, VC7 project files from tarballs 
Only VC8 project file is known to work.
 2009-11-19 09:00:16 -07:00
Chia-I Wu 97ea8e9263 Add new config for OpenGL ES. 
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
 2009-11-06 14:19:24 -07:00
Chia-I Wu bfa66bd6f9 mesa/es: Add OpenGL ES overlay. 
This is primitive support for OpenGL ES.  It uses a subset of mesa
sources to build libesXgallium.a and libesXapi.a, where X is 1 for
OpenGL ES 1.x, 2 for OpenGL ES 2.x.  The static libraries serve the same
purpose as libmesagallium.a and libglapi.a do for OpenGL.

This is based on the work of opengl-es branch.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
 2009-11-05 20:04:20 -07:00
Keith Whitwell 211d7ab22b i965g: add standalone xlib debug winsys 
Create a dummy winsys that just debug-prints on calls into the winsys
functions.  Will use this to get to the point where we are generating
sane-looking debug dumps and diassembly.

Also fix various warnings generated with the new compiler flags set in
this config.
 2009-11-04 13:03:35 +00:00
Brian Paul 24e2f61469 mesa: assorted top-level Makefile clean-ups 2009-10-14 19:09:08 -06:00
Brian Paul 0b1de63ad8 mesa: add progs/objviewer to tarball list 2009-10-01 13:14:50 -06:00