Added few more stubs so that control reaches to DestroyDevice().

[mesa.git] / src / gallium / drivers / softpipe / sp_surface.c

diff --git a/src/gallium/drivers/softpipe/sp_surface.c b/src/gallium/drivers/softpipe/sp_surface.c
index 9e1523fcf3ef74fccd8df7d4df6688ec8783f589..e0a4841edb0050a12172b50c237b1e2b5062aaf3 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_surface.c
+++ b/src/gallium/drivers/softpipe/sp_surface.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,14 +18,14 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * 
  **************************************************************************/
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_surface.h"
 #include "sp_context.h"
 #include "sp_surface.h"
@@ -36,6 +36,9 @@ static void sp_blit(struct pipe_context *pipe,
 {
    struct softpipe_context *sp = softpipe_context(pipe);
 
+   if (info->render_condition_enable && !softpipe_check_render_cond(sp))
+      return;
+
    if (info->src.resource->nr_samples > 1 &&
        info->dst.resource->nr_samples <= 1 &&
        !util_format_is_depth_or_stencil(info->src.resource->format) &&
@@ -64,8 +67,8 @@ static void sp_blit(struct pipe_context *pipe,
    util_blitter_save_so_targets(sp->blitter, sp->num_so_targets,
                      (struct pipe_stream_output_target**)sp->so_targets);
    util_blitter_save_rasterizer(sp->blitter, sp->rasterizer);
-   util_blitter_save_viewport(sp->blitter, &sp->viewport);
-   util_blitter_save_scissor(sp->blitter, &sp->scissor);
+   util_blitter_save_viewport(sp->blitter, &sp->viewports[0]);
+   util_blitter_save_scissor(sp->blitter, &sp->scissors[0]);
    util_blitter_save_fragment_shader(sp->blitter, sp->fs);
    util_blitter_save_blend(sp->blitter, sp->blend);
    util_blitter_save_depth_stencil_alpha(sp->blitter, sp->depth_stencil);
@@ -83,16 +86,23 @@ static void sp_blit(struct pipe_context *pipe,
    util_blitter_blit(sp->blitter, info);
 }
 
+static void
+sp_flush_resource(struct pipe_context *pipe,
+                  struct pipe_resource *resource)
+{
+}
+
 static void
 softpipe_clear_render_target(struct pipe_context *pipe,
                              struct pipe_surface *dst,
                              const union pipe_color_union *color,
                              unsigned dstx, unsigned dsty,
-                             unsigned width, unsigned height)
+                             unsigned width, unsigned height,
+                             bool render_condition_enabled)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
-   if (!softpipe_check_render_cond(softpipe))
+   if (render_condition_enabled && !softpipe_check_render_cond(softpipe))
       return;
 
    util_clear_render_target(pipe, dst, color,
@@ -107,11 +117,12 @@ softpipe_clear_depth_stencil(struct pipe_context *pipe,
                              double depth,
                              unsigned stencil,
                              unsigned dstx, unsigned dsty,
-                             unsigned width, unsigned height)
+                             unsigned width, unsigned height,
+                             bool render_condition_enabled)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
 
-   if (!softpipe_check_render_cond(softpipe))
+   if (render_condition_enabled && !softpipe_check_render_cond(softpipe))
       return;
 
    util_clear_depth_stencil(pipe, dst, clear_flags,
@@ -127,4 +138,5 @@ sp_init_surface_functions(struct softpipe_context *sp)
    sp->pipe.clear_render_target = softpipe_clear_render_target;
    sp->pipe.clear_depth_stencil = softpipe_clear_depth_stencil;
    sp->pipe.blit = sp_blit;
+   sp->pipe.flush_resource = sp_flush_resource;
 }