diff options
| author | Mark Mueller <MarkKMueller@gmail.com> | 2013-11-21 21:09:42 -0800 |
|---|---|---|
| committer | Mark Mueller <MarkKMueller@gmail.com> | 2014-01-13 09:44:30 -0800 |
| commit | 80b2102e5890b87577c5813c31e98c95cc329021 (patch) | |
| tree | 3a1bc59347fabb73b1b6c740c62b39fb4b5ccc52 | |
| parent | 74ac8f19c79773714364a433efc40df1e569c19d (diff) | |
more printouts
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_surface_formats.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp index 0b5fe76941..40f736a112 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp +++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp @@ -365,6 +365,7 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw, GLint dstX0, GLint dstY0, GLint width, GLint height) { + return false; /* BLORP is not supported before Gen6. */ if (brw->gen < 6) { DBG("%s: Older Gen not supported.\n", __FUNCTION__); @@ -2293,16 +2294,16 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw, return false; } if (!brw_format_for_sampling(brw, sample_format)) { - _mesa_debug(ctx, "%s: The translated source miptree format is not supported for sampling: %s.\n", - __FUNCTION__, _mesa_get_format_name(src_format)); + _mesa_debug(ctx, "%s: The translated source miptree format is not supported for sampling: %s: 0x%x.\n", + __FUNCTION__, _mesa_get_format_name(src_format), sample_format); return false; } BRW_SURFACE render_format; translate_tex_format(brw, dst_format, 0, 0, &render_format, 0); if (!brw_format_for_render(brw, render_format)) { - _mesa_debug(ctx, "%s: The translated target miptree format is not supported as a render target: %s.\n", - __FUNCTION__, _mesa_get_format_name(dst_format)); + _mesa_debug(ctx, "%s: The translated target miptree format is not supported as a render target: %s: 0x%x.\n", + __FUNCTION__, _mesa_get_format_name(dst_format), render_format); return false; } diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c index 55e43259a2..ad1bda7e2d 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -891,7 +891,7 @@ brw_format_for_mesa_format(gl_format mesa_format, blorp_process_format *process_ alpha_blend_render}, [MESA_FORMAT_XBGR16161616_UNORM] = {BRW_SURFACE_FORMAT_NONE, BRW_SURFACEFORMAT_R16G16B16X16_UNORM, - alpha_blend_render}, + 0}, [MESA_FORMAT_XBGR16161616_SNORM] = {BRW_SURFACE_FORMAT_NONE, BRW_SURFACEFORMAT_R16G16B16A16_SNORM, alpha_blend_render | swizzle_all | x_shadow}, @@ -943,7 +943,7 @@ brw_init_surface_formats(struct brw_context *brw) ctx->TextureFormatSupported[format] = brw_format_for_sampling(brw, sample_surface) && (brw_format_for_filter(brw, sample_surface) || is_integer) && - (0 == process_flags & not_supported_mask); + (0 == (process_flags & not_supported_mask)); if (BRW_SURFACE_FORMAT_NONE != render_surface) { struct surface_format_info render_target_info = surface_formats[render_surface]; diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 9c3f1e86e5..bdce98a4d8 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3043,6 +3043,9 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, internalFormat, format, type); } + _mesa_debug(ctx, "%s: Texture Format: %s\n", + __FUNCTION__, _mesa_get_format_name(texFormat)); + assert(texFormat != MESA_FORMAT_NONE); /* check that width, height, depth are legal for the mipmap level */ |