[MPlayer-cvslog] r36338 - in trunk/libvo: matrixview.c vo_matrixview.c

[reimar]

Author: reimar
Date: Wed Jun 12 20:54:15 2013
New Revision: 36338

Log:
Remove unused depth test code.

Modified:
   trunk/libvo/matrixview.c
   trunk/libvo/vo_matrixview.c

Modified: trunk/libvo/matrixview.c
==============================================================================
--- trunk/libvo/matrixview.c	Wed Jun 12 20:54:14 2013	(r36337)
+++ trunk/libvo/matrixview.c	Wed Jun 12 20:54:15 2013	(r36338)
@@ -269,10 +269,6 @@ void matrixview_init(int w, int h)
     // Color to clear color buffer to.
     mpglClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
-    // Depth to clear depth buffer to; type of test.
-    mpglClearDepth(1.0);
-    mpglDepthFunc(GL_LESS);
-
     // Allow adjusting of texture color via glColor
     mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
@@ -280,7 +276,6 @@ void matrixview_init(int w, int h)
     mpglEnable(GL_TEXTURE_2D);
 
     mpglBlendFunc(GL_SRC_ALPHA, GL_ONE);
-    mpglDisable(GL_DEPTH_TEST);
 
     matrixview_reshape(w, h);
 }
@@ -307,7 +302,7 @@ void matrixview_reshape(int w, int h)
 void matrixview_draw(double currentTime, const uint8_t *data)
 {
     // Clear the color and depth buffers.
-    mpglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    mpglClear(GL_COLOR_BUFFER_BIT);
 
     // OK, let's start drawing our planer quads.
     mpglBegin(GL_QUADS);

Modified: trunk/libvo/vo_matrixview.c
==============================================================================
--- trunk/libvo/vo_matrixview.c	Wed Jun 12 20:54:14 2013	(r36337)
+++ trunk/libvo/vo_matrixview.c	Wed Jun 12 20:54:15 2013	(r36338)
@@ -105,7 +105,6 @@ static int config(uint32_t width, uint32
     image_width  = width;
     image_format = format;
 
-    flags |= VOFLAG_DEPTH;
     if (mpglcontext_create_window(&glctx, d_width, d_height, flags, title) < 0)
         return -1;
     if (glctx.setGlWindow(&glctx) == SET_WINDOW_FAILED)