Mesa (master): Merge branch 'shader-file-reorg'

Brian Paul brianp at kemper.freedesktop.org
Wed Jun 23 21:31:07 PDT 2010


Module: Mesa
Branch: master
Commit: ca12aefdacd22fb42e3f1d3852db4c12de886554
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca12aefdacd22fb42e3f1d3852db4c12de886554

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jun 23 22:30:26 2010 -0600

Merge branch 'shader-file-reorg'

1. Move all GL entrypoint functions and files into src/mesa/main/
This includes the ARB vp/vp, NV vp/fp, ATI fragshader and GLSL bits
that were in src/mesa/shader/

2. Move src/mesa/shader/slang/ to src/mesa/slang/ to reduce the tree depth

3. Rename src/mesa/shader/ to src/mesa/program/ since all the
remaining files are concerned with GPU programs.

4. Misc code refactoring.  In particular, I got rid of most of the
GLSL-related ctx->Driver hook functions.  None of the drivers used
them.

Conflicts:
	src/mesa/drivers/dri/i965/brw_context.c

---





More information about the mesa-commit mailing list