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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/27 17:02:33

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 

Log message:
        Don't use GLew since it useless... TODO: rewrite NV-ext to generic OGL 
so it works.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1424&r2=1.1425
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1424
retrieving revision 1.1425
diff -u -b -r1.1424 -r1.1425
--- ChangeLog   27 Oct 2006 16:23:45 -0000      1.1424
+++ ChangeLog   27 Oct 2006 17:02:33 -0000      1.1425
@@ -8,6 +8,8 @@
        * server/asobj/NetStream.{h,cpp}: Uint8 -> uint8_t. #ifdef USE_FFMPEG.
          Fixed typo of StreamProvider.h for case-sensitive-compilers.
          Sleep -> sleep. #ifndef __GNUC__ fmod = std::fmod.
+       * backend/render_handler_ogl.cpp: Don't use GLew since it useless...
+         TODO: rewrite NV-ext to generic OGL so it works.
 
 2006-10-27 Vitaly Alexeev <address@hidden>
 

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- backend/render_handler_ogl.cpp      27 Oct 2006 14:46:03 -0000      1.34
+++ backend/render_handler_ogl.cpp      27 Oct 2006 17:02:33 -0000      1.35
@@ -6,14 +6,15 @@
 // A render_handler that uses SDL & OpenGL
 
 
+/* $Id: render_handler_ogl.cpp,v 1.35 2006/10/27 17:02:33 nihilus Exp $ */
+
 //#include "gnash.h"
-#include <GL/glew.h>   // OpenGL extension
 #include "render_handler.h"
 #include "render_handler_tri.h"
 #include "types.h"
 #include "image.h"
 #include "utility.h"
-// #include "tu_opengl_includes.h"
+#include "tu_opengl_includes.h"
 
 #include <cstring>
 #include <cmath>
@@ -22,7 +23,9 @@
 #      include <Windows.h>
 #endif
 
+#ifdef USE_FFMPEG
 #include <ffmpeg/avformat.h>
+#endifs
 
 using namespace gnash;
 
@@ -145,7 +148,6 @@
 
 static GLfloat yuv2rgb[2][4] = {{0.500000f, 0.413650f, 0.944700f, 0.f},        
{0.851850f, 0.320550f, 0.500000f, 1.f}};
 static GLint quad[] = {-1, 1, 1, 1, 1, -1, -1, -1};
-static bool do_init_glew = true;
 
 class YUV_video_ogl : public gnash::YUV_video
 {
@@ -256,17 +258,6 @@
                void display(const matrix* mat, const rect* bounds)
                {
 
-                       if (do_init_glew)
-                       {
-                               do_init_glew = false;
-                               GLenum err = glewInit();
-                               if (err != GLEW_OK)
-                               {
-                                       fprintf(stderr, "glewInit: %s\n", 
glewGetErrorString(err));
-                                       exit(0);
-                               }
-                       }
-
                        glPushAttrib(GL_ENABLE_BIT);
 //             glPushAttrib(GL_ALL_ATTRIB_BITS);