[g3dvl] add some more PIPE_VIDEO_CAPs

[mesa.git] / src / gallium / drivers / r600 / r600_query.c

diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index 7385a6f1e1903ccbd57c73aaa4cf7efcc562a0d4..174505c75e9c731cee6a52e5328cee28c894620d 100644 (file)
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -20,11 +20,8 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
-/* TODO:
- *     - fix mask for depth control & cull for query
- */
 #include "r600_pipe.h"
+#include "r600d.h"
 
 static struct pipe_query *r600_create_query(struct pipe_context *ctx, unsigned query_type)
 {
@@ -64,17 +61,44 @@ static boolean r600_get_query_result(struct pipe_context *ctx,
        struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
        struct r600_query *rquery = (struct r600_query *)query;
 
-       if (rquery->num_results) {
-               ctx->flush(ctx, 0, NULL);
+       return r600_context_query_result(&rctx->ctx, rquery, wait, vresult);
+}
+
+static void r600_render_condition(struct pipe_context *ctx,
+                                 struct pipe_query *query,
+                                 uint mode)
+{
+       struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
+       struct r600_query *rquery = (struct r600_query *)query;
+       int wait_flag = 0;
+
+       rctx->current_render_cond = query;
+       rctx->current_render_cond_mode = mode;
+
+       if (!query) {
+               rctx->ctx.predicate_drawing = false;
+               r600_query_predication(&rctx->ctx, NULL, PREDICATION_OP_CLEAR, 1);
+               return;
+       }
+
+       if (mode == PIPE_RENDER_COND_WAIT ||
+           mode == PIPE_RENDER_COND_BY_REGION_WAIT) {
+               wait_flag = 1;
        }
-       return r600_context_query_result(&rctx->ctx, (struct r600_query *)query, wait, vresult);
+
+       rctx->ctx.predicate_drawing = true;
+       r600_query_predication(&rctx->ctx, rquery, PREDICATION_OP_ZPASS, wait_flag);
+       
 }
 
-void r600_init_query_functions2(struct r600_pipe_context *rctx)
+void r600_init_query_functions(struct r600_pipe_context *rctx)
 {
        rctx->context.create_query = r600_create_query;
        rctx->context.destroy_query = r600_destroy_query;
        rctx->context.begin_query = r600_begin_query;
        rctx->context.end_query = r600_end_query;
        rctx->context.get_query_result = r600_get_query_result;
+
+       if (r600_get_num_backends(rctx->screen->radeon) > 0)
+           rctx->context.render_condition = r600_render_condition;
 }