gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Markus Gothe
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ...
Date: Sat, 28 Oct 2006 09:19:40 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/28 09:19:40

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 
        macros         : gnashpkgtool.m4 

Log message:
        Replaced TU-wrapper code with the real stuff.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1427&r2=1.1428
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1427
retrieving revision 1.1428
diff -u -b -r1.1427 -r1.1428
--- ChangeLog   27 Oct 2006 18:27:40 -0000      1.1427
+++ ChangeLog   28 Oct 2006 09:19:40 -0000      1.1428
@@ -1,3 +1,9 @@
+2006-10-28 Markus Gothe <address@hidden>
+
+       * macros/gnashpkgtool.m4: Typo.
+       * backend/render_handler_ogl.cpp: Replaced TU-wrapper code with the 
+         real stuff.
+
 2006-10-27 Sandro Santilli <address@hidden>
 
        * server/asobj/Makefile.am: added includes from backend

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- backend/render_handler_ogl.cpp      27 Oct 2006 18:27:40 -0000      1.38
+++ backend/render_handler_ogl.cpp      28 Oct 2006 09:19:40 -0000      1.39
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.38 2006/10/27 18:27:40 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.39 2006/10/28 09:19:40 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -188,7 +188,7 @@
 
                void nvrc2tu2_combine_UV()
                {
-                       glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, 
GL_VARIABLE_A_NV,
+               /*      glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, 
GL_VARIABLE_A_NV,
                                                                                
                 GL_TEXTURE0_ARB, GL_HALF_BIAS_NORMAL_NV, GL_RGB);
                        glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, 
GL_VARIABLE_B_NV,
                                                                                
                 GL_CONSTANT_COLOR0_NV, GL_EXPAND_NORMAL_NV, GL_RGB);
@@ -206,12 +206,12 @@
                        glCombinerInputNV (GL_COMBINER1_NV, GL_RGB, 
GL_VARIABLE_D_NV,
                                                                                
                 GL_ZERO, GL_UNSIGNED_INVERT_NV, GL_RGB);
 
-                       glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 2);
+                       glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 
2);*/
                }
 
                void nvrc2tu2_combine_final()
                {
-                       glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, 
GL_VARIABLE_A_NV,
+               /*      glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, 
GL_VARIABLE_A_NV,
                                                                                
                 GL_TEXTURE0_ARB, GL_UNSIGNED_IDENTITY_NV, GL_RGB);
                        glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, 
GL_VARIABLE_B_NV,
                                                                                
                 GL_ZERO, GL_UNSIGNED_INVERT_NV, GL_RGB);
@@ -219,7 +219,7 @@
                                                                                
                 GL_TEXTURE1_ARB, GL_EXPAND_NORMAL_NV, GL_RGB);
                        glCombinerInputNV (GL_COMBINER0_NV, GL_RGB, 
GL_VARIABLE_D_NV,
                                                                                
                 GL_ZERO, GL_UNSIGNED_INVERT_NV, GL_RGB);
-                       glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 1);
+                       glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 
1);*/
                }
 
                void bind_tex()
@@ -250,9 +250,9 @@
                        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, planes[T].p2w, 
planes[T].p2h,
                                0, GL_RGB, GL_INT, NULL);
 
-                       glEnable(GL_REGISTER_COMBINERS_NV);
+                       /*glEnable(GL_REGISTER_COMBINERS_NV);
                        glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, 
yuv2rgb[0]);
-                       glCombinerParameterfvNV(GL_CONSTANT_COLOR1_NV, 
yuv2rgb[1]);
+                       glCombinerParameterfvNV(GL_CONSTANT_COLOR1_NV, 
yuv2rgb[1]);*/
                }
 
                void display(const matrix* mat, const rect* bounds)
@@ -759,7 +759,7 @@
                            // Both texels are white; left texel is all clear, 
right texel is all opaque.
                            unsigned char       edge_data[8] = { 255, 255, 255, 
0, 255, 255, 255, 255 };
 
-                           ogl::active_texture(GL_TEXTURE1_ARB);
+                           glActiveTextureARB(GL_TEXTURE1_ARB);
                            glEnable(GL_TEXTURE_2D);
                            glGenTextures(1, &s_edge_texture_id);
                            glBindTexture(GL_TEXTURE_2D, s_edge_texture_id);
@@ -774,7 +774,7 @@
                            glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, 
GL_MODULATE);        // @@ should we use a 1D texture???
 
                            glDisable(GL_TEXTURE_2D);
-                           ogl::active_texture(GL_TEXTURE0_ARB);
+                           glActiveTextureARB(GL_TEXTURE0_ARB);
                            glDisable(GL_TEXTURE_2D);
                        }
                }

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/gnashpkgtool.m4      26 Oct 2006 22:31:52 -0000      1.12
+++ macros/gnashpkgtool.m4      28 Oct 2006 09:19:40 -0000      1.13
@@ -35,10 +35,10 @@
 dnl  
 dnl 
 
-dnl $Id: gnashpkgtool.m4,v 1.12 2006/10/26 22:31:52 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.13 2006/10/28 09:19:40 nihilus Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
-dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()..
+dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()...
 
 AC_DEFUN([GNASH_PKG_INCLUDES], dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg 
images])
 [




reply via email to

[Prev in Thread] Current Thread [Next in Thread]