From: Brian <brian.paul@tungstengraphics.com>
Date: Sat, 11 Aug 2007 18:57:50 +0000 (+0100)
Subject: remove some temp pipe hacks
X-Git-Tag: android-x86-1.6~16^2~1465^2~390^2~4350
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=24e21301e0cc16f0a3a81bfd7ac7ae8765174da8;p=android-x86%2Fexternal-mesa.git

remove some temp pipe hacks
---

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index fc04dde3f49..0e59ba615a7 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -30,11 +30,6 @@
 #include "queryobj.h"
 #include "mtypes.h"
 
-#if 1 /*PIPE*/
-#include "pipe/p_context.h"
-#include "state_tracker/st_context.h"
-#endif
-
 
 /**
  * Allocate a new query object.  This is a fallback routine called via
@@ -225,10 +220,6 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
    q->Result = 0;
    q->Ready = GL_FALSE;
 
-#if 1 /*PIPE*/
-   ctx->st->pipe->reset_occlusion_counter(ctx->st->pipe);
-#endif
-
    if (target == GL_SAMPLES_PASSED_ARB) {
       ctx->Query.CurrentOcclusionObject = q;
    }
@@ -291,12 +282,6 @@ _mesa_EndQueryARB(GLenum target)
       /* if we're using software rendering/querying */
       q->Ready = GL_TRUE;
    }
-
-#if 1 /*PIPE*/
-   if (target == GL_SAMPLES_PASSED_ARB) {
-      q->Result = ctx->st->pipe->get_occlusion_counter(ctx->st->pipe);
-   }
-#endif
 }