Mesa (master): glhd: Grab resource_copy_region from r300g.

Corbin Simpson csimpson at kemper.freedesktop.org
Wed Jun 23 00:12:50 PDT 2010


Module: Mesa
Branch: master
Commit: 3f758d4ed42f6b4c6bed60f8270ef908d3829ee5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f758d4ed42f6b4c6bed60f8270ef908d3829ee5

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Tue Jun 22 22:46:15 2010 -0700

glhd: Grab resource_copy_region from r300g.

---

 src/gallium/drivers/galahad/glhd_context.c |    8 ++++++++
 src/gallium/drivers/r300/r300_blit.c       |    8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c
index ae4fc92..6dfee2c 100644
--- a/src/gallium/drivers/galahad/glhd_context.c
+++ b/src/gallium/drivers/galahad/glhd_context.c
@@ -27,6 +27,8 @@
 
 
 #include "pipe/p_context.h"
+
+#include "util/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
 
@@ -633,6 +635,12 @@ galahad_resource_copy_region(struct pipe_context *_pipe,
    struct pipe_resource *dst = glhd_resource_dst->resource;
    struct pipe_resource *src = glhd_resource_src->resource;
 
+   if (_dst->format != _src->format) {
+      glhd_warn("Format mismatch: Source is %s, destination is %s",
+         util_format_short_name(_src->format),
+         util_format_short_name(_dst->format));
+   }
+
    pipe->resource_copy_region(pipe,
                               dst,
                               subdst,
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 2a47701..389354c 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -185,14 +185,6 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
     enum pipe_format old_format = dst->format;
     enum pipe_format new_format = old_format;
 
-    if (dst->format != src->format) {
-        debug_printf("r300: Implementation error: Format mismatch in %s\n"
-            "    : src: %s dst: %s\n", __FUNCTION__,
-            util_format_short_name(src->format),
-            util_format_short_name(dst->format));
-        debug_assert(0);
-    }
-
     if (!pipe->screen->is_format_supported(pipe->screen,
                                            old_format, src->target,
                                            src->nr_samples,



More information about the mesa-commit mailing list