[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/25 11:04:47

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 

Log message:
        #IFDEF VITALY

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1754&r2=1.1755
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.57&r2=1.58

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1754
retrieving revision 1.1755
diff -u -b -r1.1754 -r1.1755
--- ChangeLog   25 Nov 2006 01:30:58 -0000      1.1754
+++ ChangeLog   25 Nov 2006 11:04:47 -0000      1.1755
@@ -1,3 +1,7 @@
+2006-11-25 Markus Gothe <address@hidden>
+
+       * backend/render_handler_ogl.cpp: #ifdef'd VITALY to get OGL working.
+
 2006-11-24  Rob Savoye  <address@hidden>
 
        * config.guess: Update so it recognizes

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- backend/render_handler_ogl.cpp      24 Nov 2006 10:39:00 -0000      1.57
+++ backend/render_handler_ogl.cpp      25 Nov 2006 11:04:47 -0000      1.58
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.57 2006/11/24 10:39:00 alexeev Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.58 2006/11/25 11:04:47 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -27,6 +27,7 @@
        #include <SDL/SDL.h>    // for SDL_GL_GetProcAddress()
 #endif
 
+#ifdef VITALY
 // NV opengl extensions for fast video rendering
 // 2-3 ms per 1024x768 video frame
 static PFNGLCOMBINERINPUTNVPROC s_glCombinerInputNV = 0;
@@ -41,6 +42,8 @@
 #define glActiveTextureARB s_glActiveTextureARB
 #define glCombinerParameterfvNV s_glCombinerParameterfvNV
 
+#endif
+
 using namespace gnash;
 
 // choose the resampling method:
@@ -159,6 +162,7 @@
                }
 };
 
+#ifdef VITALY
 class YUV_video_ogl_NV : public gnash::YUV_video
 {
 
@@ -387,7 +391,8 @@
                        }
                }
 
-};
+}
+#endif
 
 class render_handler_ogl : public gnash::triangulating_render_handler
 {
@@ -683,6 +688,7 @@
 
        gnash::YUV_video*       create_YUV_video(int w, int h)
        {
+#ifdef VITALY
                // check opengl extensions for fast video
 #ifdef HAVE_SDL_H
                glCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC) 
SDL_GL_GetProcAddress("glCombinerInputNV");
@@ -701,6 +707,7 @@
                {
                        return new YUV_video_ogl_NV(w, h);
                }
+#endif
                return new YUV_video_ogl(w, h);
        }