intel: Finish renaming fallback_debug() to perf_debug().
They're about to change to handle GL_ARB_debug_output, so just make one function. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
@@ -461,11 +461,6 @@ extern int INTEL_DEBUG;
|
||||
dbg_printf(__VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define fallback_debug(...) do { \
|
||||
if (unlikely(INTEL_DEBUG & DEBUG_PERF)) \
|
||||
dbg_printf(__VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define perf_debug(...) do { \
|
||||
if (unlikely(INTEL_DEBUG & DEBUG_PERF)) \
|
||||
dbg_printf(__VA_ARGS__); \
|
||||
|
@@ -858,8 +858,8 @@ intel_miptree_copy_slice(struct intel_context *intel,
|
||||
width, height,
|
||||
GL_COPY)) {
|
||||
|
||||
fallback_debug("miptree validate blit for %s failed\n",
|
||||
_mesa_get_format_name(format));
|
||||
perf_debug("miptree validate blit for %s failed\n",
|
||||
_mesa_get_format_name(format));
|
||||
|
||||
intel_miptree_copy_slice_sw(intel, dst_mt, src_mt, level, slice,
|
||||
width, height);
|
||||
|
@@ -97,7 +97,7 @@ do_blit_copypixels(struct gl_context * ctx,
|
||||
switch (type) {
|
||||
case GL_COLOR:
|
||||
if (fb->_NumColorDrawBuffers != 1) {
|
||||
fallback_debug("glCopyPixels() fallback: MRT\n");
|
||||
perf_debug("glCopyPixels() fallback: MRT\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -110,23 +110,23 @@ do_blit_copypixels(struct gl_context * ctx,
|
||||
intel_renderbuffer(read_fb->Attachment[BUFFER_DEPTH].Renderbuffer);
|
||||
break;
|
||||
case GL_DEPTH:
|
||||
fallback_debug("glCopyPixels() fallback: GL_DEPTH\n");
|
||||
perf_debug("glCopyPixels() fallback: GL_DEPTH\n");
|
||||
return false;
|
||||
case GL_STENCIL:
|
||||
fallback_debug("glCopyPixels() fallback: GL_STENCIL\n");
|
||||
perf_debug("glCopyPixels() fallback: GL_STENCIL\n");
|
||||
return false;
|
||||
default:
|
||||
fallback_debug("glCopyPixels(): Unknown type\n");
|
||||
perf_debug("glCopyPixels(): Unknown type\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!draw_irb) {
|
||||
fallback_debug("glCopyPixels() fallback: missing draw buffer\n");
|
||||
perf_debug("glCopyPixels() fallback: missing draw buffer\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!read_irb) {
|
||||
fallback_debug("glCopyPixels() fallback: missing read buffer\n");
|
||||
perf_debug("glCopyPixels() fallback: missing read buffer\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -136,9 +136,9 @@ do_blit_copypixels(struct gl_context * ctx,
|
||||
if (draw_format != read_format &&
|
||||
!(draw_format == MESA_FORMAT_XRGB8888 &&
|
||||
read_format == MESA_FORMAT_ARGB8888)) {
|
||||
fallback_debug("glCopyPixels() fallback: mismatched formats (%s -> %s\n",
|
||||
_mesa_get_format_name(read_format),
|
||||
_mesa_get_format_name(draw_format));
|
||||
perf_debug("glCopyPixels() fallback: mismatched formats (%s -> %s\n",
|
||||
_mesa_get_format_name(read_format),
|
||||
_mesa_get_format_name(draw_format));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -183,7 +183,7 @@ intelReadPixels(struct gl_context * ctx,
|
||||
intel_prepare_render(intel);
|
||||
intel->front_buffer_dirty = dirty;
|
||||
|
||||
fallback_debug("%s: fallback to swrast\n", __FUNCTION__);
|
||||
perf_debug("%s: fallback to swrast\n", __FUNCTION__);
|
||||
|
||||
/* Update Mesa state before calling _mesa_readpixels().
|
||||
* XXX this may not be needed since ReadPixels no longer uses the
|
||||
|
@@ -198,7 +198,7 @@ intelCopyTexSubImage(struct gl_context *ctx, GLuint dims,
|
||||
}
|
||||
|
||||
/* Finally, fall back to meta. This will likely be slow. */
|
||||
fallback_debug("%s - fallback to swrast\n", __FUNCTION__);
|
||||
perf_debug("%s - fallback to swrast\n", __FUNCTION__);
|
||||
_mesa_meta_CopyTexSubImage(ctx, dims, texImage,
|
||||
xoffset, yoffset, zoffset,
|
||||
rb, x, y, width, height);
|
||||
|
Reference in New Issue
Block a user