Age | Commit message (Collapse) | Author |
|
|
|
Signed-off-by: Brian Paul <brianp@vmware.com>
|
|
Reflect the recent addtion of eglut and reorganization of the EGL demos.
This helps remove ~2k lines of duplicated code
$ git diff --shortstat -M 57cc1db87b5cacffd3344c49062c8289b7d46e78
18 files changed, 298 insertions(+), 2178 deletions(-)
|
|
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
|
|
Add the Makefile of Gallium EGL drivers and demos using EGL to the
tarballs.
|
|
|
|
Conflicts:
Makefile
src/mesa/main/version.h
|
|
The Makefile should eventually be fixed to stop building tarballs if
one of the individual calls to tar fails.
|
|
|
|
|
|
Now that the 7.8 branch has been created Mesa/master will be version 7.9
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Otherwise it creates unnecessary pain when automating builds in a build
server/farm.
|
|
|
|
|
|
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
|
|
Conflicts:
src/mesa/main/dd.h
|
|
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
|
|
|
|
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
|
|
Conflicts:
configure.ac
|
|
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
|
|
Conflicts:
SConstruct
configs/default
configs/linux-dri
|
|
|
|
|
|
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
|
|
Still don't know how to add glsl to mesa dependencies.
|
|
Also modify the Makefile to use the correct version for the tarballs.
|
|
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
|
|
Only VC8 project file is known to work.
|
|
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
|
|
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>
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The end user doesn't need the .y or .l or Makefile but include them anyway
in case someone wants to patch or debug things.
|
|
|