Permalink
Browse files

Some build system modifications after testing a new clone on a Linux …

…system.
  • Loading branch information...
1 parent 163d635 commit c0a7ca4129a59b24b5bcec40f0dd6b941113755e @gzorin committed Mar 6, 2012
View
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -104,8 +104,6 @@ am__relativize = \
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -167,6 +165,7 @@ PSL1GHT_CPPFLAGS = @PSL1GHT_CPPFLAGS@
PSL1GHT_LDFLAGS = @PSL1GHT_LDFLAGS@
PSL1GHT_PATH = @PSL1GHT_PATH@
PWDCMD = @PWDCMD@
+PYTHON = @PYTHON@
RANLIB = @RANLIB@
RSXGL_CONFIG_RSX_compatibility = @RSXGL_CONFIG_RSX_compatibility@
RSXGL_CONFIG_samples_host_ip = @RSXGL_CONFIG_samples_host_ip@
@@ -262,7 +261,7 @@ SUBDIRS = @RSXGL_SUBDIRS@
all: all-recursive
.SUFFIXES:
-am--refresh: Makefile
+am--refresh:
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -512,15 +511,15 @@ dist-gzip: distdir
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
@@ -570,7 +569,6 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -599,16 +597,8 @@ distcheck: dist
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @test -n '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: trying to run $@ with an empty' \
- '$$(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- $(am__cd) '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ @$(am__cd) '$(distuninstallcheck_dir)' \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -639,15 +629,10 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
View
@@ -17,8 +17,11 @@ with a configure script. It requires the following projects:
* [ps3toolchain](http://github.com/ps3dev/ps3toolchain)
* [PSL1GHT](http://github.com/ps3dev/PSL1GHT)
-NVIDIA's cgc shader compiler, from the Cg toolkit, is also required to
-use vertex and fragment GPU programs.
+RSXGL incorporates parts of the Mesa project, primarily to provide
+runtime compilation of GLSL programs. Suitable versions of Mesa and
+libdrm are included with RSXGL. python 2.6 with the libxml2 module is
+required by Mesa's build process (specifically for building GLSL's
+builtin functions).
The RSXGL library depends upon a toolchain that can generate binaries for the
PS3's PPU, and also upon parts of the PSL1GHT SDK. The sample programs also
View
23 STATUS
@@ -1,12 +1,14 @@
Briefly, the following OpenGL 3.1 features haven't been implemented
yet (the RSX is capable of supporting most of them):
-* Full GLSL support. Currently, GLSL and Cg shaders can be compiled offline and
- used with a OpenGL ES 2 style API.
+* Support for OpenGL 3.1-level GLSL (version 1.40). RSXGL incorporates
+ Mesa's GLSL compiler, which implements GLSL 1.30.
+* Transform feedback, geometry shaders, uniform buffer objects.
* A variety of capabilities related to texture maps (rectangular and
cube textures, the behavior of glPixelStore, copying from the
- framebuffer, mipmap generation, and texture formats, including
- compressed formats, that require conversion and/or swizzling).
+ framebuffer (glCopyTexImage* and glCopyTexSubImage*), mipmap generation,
+ and texture formats, including compressed formats, that require
+ conversion and/or swizzling).
* Client-side vertex array data. OpenGL 3.1's core profile
specifically omits this, but it is specified by OpenGL ES 2 (as well
as the OpenGL 3 compatibility profile), and is likely still widely
@@ -19,6 +21,19 @@ yet (the RSX is capable of supporting most of them):
Further details follow:
-------------------------------------------------------------------------------
+6 March 2012
+
+* MESA MERGE
+
+Parts of Mesa have been incorporated into RSXGL: its GLSL 1.30
+compiler as well as its library for transfering textures between
+different formats.
+
+Some OpenGL features that previously worked, such as point sprites,
+instanced rendering, and multiple render targets are, at the moment,
+disabled or untested.
+
+-------------------------------------------------------------------------------
20 September 2011
* FULL GLSL SUPPORT
Oops, something went wrong.

0 comments on commit c0a7ca4

Please sign in to comment.