[Top][All Lists]
[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: |
Tue, 31 Oct 2006 20:43:33 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/31 20:43:33
Modified files:
. : ChangeLog
backend : render_handler_ogl.cpp
Log message:
Clean up and added comments to understand what the combiner registers
does.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1465&r2=1.1466
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.43&r2=1.44
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1465
retrieving revision 1.1466
diff -u -b -r1.1465 -r1.1466
--- ChangeLog 31 Oct 2006 15:58:58 -0000 1.1465
+++ ChangeLog 31 Oct 2006 20:43:33 -0000 1.1466
@@ -1,3 +1,8 @@
+2006-10-31 Markus Gothe <address@hidden>
+
+ * backend/render_handler_ogl.cpp: Clean up and added comments to
+ understand what the combiner registers do.
+
2006-10-31 Sandro Santilli <address@hidden>
* server/asobj/MovieClipLoader.cpp: fixed event handlers calls
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- backend/render_handler_ogl.cpp 31 Oct 2006 20:33:42 -0000 1.43
+++ backend/render_handler_ogl.cpp 31 Oct 2006 20:43:33 -0000 1.44
@@ -6,7 +6,7 @@
// A render_handler that uses SDL & OpenGL
-/* $Id: render_handler_ogl.cpp,v 1.43 2006/10/31 20:33:42 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.44 2006/10/31 20:43:33 nihilus Exp $ */
//#include "gnash.h"
#include "render_handler.h"
@@ -107,38 +107,36 @@
void nvrc2tu2_combine_UV()
{
- /* 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);
- glCombinerInputNV (GL_COMBINER0_NV, GL_RGB,
GL_VARIABLE_C_NV,
-
GL_TEXTURE1_ARB, GL_HALF_BIAS_NORMAL_NV, GL_RGB);
- glCombinerInputNV (GL_COMBINER0_NV, GL_RGB,
GL_VARIABLE_D_NV,
-
GL_CONSTANT_COLOR1_NV, GL_EXPAND_NORMAL_NV, GL_RGB);
-
- glCombinerInputNV (GL_COMBINER1_NV, GL_RGB,
GL_VARIABLE_A_NV,
-
GL_SPARE0_NV, GL_SIGNED_IDENTITY_NV, GL_RGB);
- glCombinerInputNV (GL_COMBINER1_NV, GL_RGB,
GL_VARIABLE_B_NV,
-
GL_ZERO, GL_UNSIGNED_INVERT_NV, GL_RGB);
- glCombinerInputNV (GL_COMBINER1_NV, GL_RGB,
GL_VARIABLE_C_NV,
-
GL_ZERO, GL_HALF_BIAS_NEGATE_NV, GL_RGB);
- 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);*/
+ /*
+ //Combiner 1
+ 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);
+ glCombinerInputNV (GL_COMBINER0_NV, GL_RGB,
GL_VARIABLE_C_NV, GL_TEXTURE1_ARB, GL_HALF_BIAS_NORMAL_NV, GL_RGB);
+ glCombinerInputNV (GL_COMBINER0_NV, GL_RGB,
GL_VARIABLE_D_NV, GL_CONSTANT_COLOR1_NV, GL_EXPAND_NORMAL_NV, GL_RGB);
+
+ //Combiner 2
+ glCombinerInputNV (GL_COMBINER1_NV, GL_RGB,
GL_VARIABLE_A_NV, GL_SPARE0_NV, GL_SIGNED_IDENTITY_NV, GL_RGB);
+ glCombinerInputNV (GL_COMBINER1_NV, GL_RGB,
GL_VARIABLE_B_NV, GL_ZERO, GL_UNSIGNED_INVERT_NV, GL_RGB);
+ glCombinerInputNV (GL_COMBINER1_NV, GL_RGB,
GL_VARIABLE_C_NV, GL_ZERO, GL_HALF_BIAS_NEGATE_NV, GL_RGB);
+ glCombinerInputNV (GL_COMBINER1_NV, GL_RGB,
GL_VARIABLE_D_NV, GL_ZERO, GL_UNSIGNED_INVERT_NV, GL_RGB);
+
+ // Total number of combiner registers...
+ glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 2);
+ */
}
void nvrc2tu2_combine_final()
{
- /* 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);
- glCombinerInputNV (GL_COMBINER0_NV, GL_RGB,
GL_VARIABLE_C_NV,
-
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);*/
+ /*
+ //Combiner 1
+ 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);
+ glCombinerInputNV (GL_COMBINER0_NV, GL_RGB,
GL_VARIABLE_C_NV, 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);
+
+ // Total number of combiner registers...
+ glCombinerParameteriNV (GL_NUM_GENERAL_COMBINERS_NV, 1);
+ */
}
void bind_tex()
@@ -169,9 +167,13 @@
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, planes[T].p2w,
planes[T].p2h,
0, GL_RGB, GL_INT, NULL);
- /*glEnable(GL_REGISTER_COMBINERS_NV);
+ /*
+ //Enable Combiner registers
+ 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)
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp, Sandro Santilli, 2006/10/13
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp, Sandro Santilli, 2006/10/18
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp, Markus Gothe, 2006/10/27
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp, Markus Gothe, 2006/10/27
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp, Markus Gothe, 2006/10/27
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp, Markus Gothe, 2006/10/27
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp, Markus Gothe, 2006/10/27
- [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp,
Markus Gothe <=