On Sunday 27 August 2006 20:18, Johannes Sixt wrote:
> We've completed the merge. Expect a substantial number of svn commits soon.
The merge is not complete, yet, but almost.
You might be interested to try out OpenGL support, which I've committed to svn
a minute ago. You need the patches that I attach here to enable it. One of
them will find its way into svn later.
* If you have complete OpenGL 2.0 support (currently only available from
NVidia), apply only opengl-configure.diff.
* If you don't have complete OpenGL 2.0 support (e.g. MESA software
rendering), you can add both patches. But this will cripple most
OpenGL-enabled effects; they don't produce output or whatever. But at least
the Dissolve transition will work.
Apply the patches with patch -p1 < xxx.diff.
Run ./configure --enable-opengl
You have to choose X11-GL in the Preferences to enable OpenGL. Also read the
new manual about additional constraints (basically, don't mix hardware and
software effects).
Don't report bugs. Wait until the merge is complete. You can meet me at
#cinelerra on IRC in 9 hours from now if you need help.
-- Hannes
commit 8dc6f09832dcf1ef2732c6121cc7ba0055e5cd29
Author: Johannes Sixt <[EMAIL PROTECTED]>
Date: Mon Aug 21 22:46:06 2006 +0200
This makes OpenGL build.
diff --git a/guicast/bcpbuffer.C b/guicast/bcpbuffer.C
index 28c955b..03830d4 100644
--- a/guicast/bcpbuffer.C
+++ b/guicast/bcpbuffer.C
@@ -78,9 +78,9 @@ #define TOTAL_CONFIGS 1
GLX_ACCUM_GREEN_SIZE, 1,
GLX_ACCUM_BLUE_SIZE, 1,
GLX_ACCUM_ALPHA_SIZE, 1,
- GLX_RED_SIZE, 8,
- GLX_GREEN_SIZE, 8,
- GLX_BLUE_SIZE, 8,
+ GLX_RED_SIZE, 5,
+ GLX_GREEN_SIZE, 5,
+ GLX_BLUE_SIZE, 5,
GLX_ALPHA_SIZE, 8,
None
};
diff --git a/guicast/bcwindowbase.h b/guicast/bcwindowbase.h
index eeecf27..c438574 100644
--- a/guicast/bcwindowbase.h
+++ b/guicast/bcwindowbase.h
@@ -74,6 +74,25 @@ #include <X11/extensions/xf86vmode.h>
#endif
#ifdef HAVE_GL
#include <GL/glx.h>
+#define glAttachShader(...) 0
+#define glCompileShader(...) 0
+#define glCreateProgram(...) 0
+#define glCreateShader(...) 0
+#define glDeleteShader(...) 0
+#define glGetProgramInfoLog(...) 0
+#define glGetShaderInfoLog(...) 0
+#define glGetUniformLocation(...) 0
+#define glLinkProgram(...) 0
+#define glShaderSource(...) 0
+#define glUniform1f(...) 0
+#define glUniform1i(...) 0
+#define glUniform2f(...) 0
+#define glUniform2fv(...) 0
+#define glUniform3f(...) 0
+#define glUniform4f(...) 0
+#define glUniform4fv(...) 0
+#define glUniformMatrix3fv(...) 0
+#define glUseProgram(...) 0
#endif
commit aac9716cad561d0a4746e7d98dbdfee883668298
Author: Johannes Sixt <[EMAIL PROTECTED]>
Date: Thu Aug 31 22:40:43 2006 +0200
Provide a configure option to turn on OpenGL support.
diff --git a/configure.in b/configure.in
index 3a1a425..229755e 100644
--- a/configure.in
+++ b/configure.in
@@ -326,6 +326,18 @@ AC_CHECK_HEADER(lame/lame.h,[libmp3lameh
AC_CHECK_LIB(mp3lame,lame_init,[libmp3lame=yes],,[$XIPH_LIBS])
# END LAME
+############## OpenGL
+AH_TEMPLATE(HAVE_GL, [Define to 1 if OpenGL 2.0 is available.])
+AC_ARG_ENABLE(opengl,
+ AC_HELP_STRING([--enable-opengl],
+ [enables hardware accelerated rendering (requires OpenGL 2.0)]),
+ if test "x$enableval" = "x"; then
+ AC_DEFINE(HAVE_GL)
+ OPENGL_LIBS="-lGLU -lGL"
+ fi, [:])
+AC_SUBST(OPENGL_LIBS)
+# END OpenGL
+
############## .png TO .o CONVERSION
AC_CHECK_TOOL(OBJCOPY, objcopy)
diff --git a/guicast/Makefile.am b/guicast/Makefile.am
index eff8704..0757701 100644
--- a/guicast/Makefile.am
+++ b/guicast/Makefile.am
@@ -1,7 +1,7 @@
lib_LTLIBRARIES = libguicast.la
noinst_PROGRAMS=bootstrap
-libguicast_la_LIBADD = -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS)
+libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS)
libguicast_la_LDFLAGS = $(X_LIBS) -version-info 1:0:0
libguicast_la_SOURCES = \
bcbar.C \
