diff options
| author | Mark Mueller <[email protected]> | 2014-01-20 14:21:43 -0800 |
|---|---|---|
| committer | Mark Mueller <[email protected]> | 2014-01-27 14:29:13 -0800 |
| commit | ef145ba4ded6aafb28e3bda02fb348e6b8bff12a (patch) | |
| tree | 055904f1dd870171e87e792c878e9712ae50c722 /src/mesa/drivers/dri/i915/intel_blit.c | |
| parent | 71fe9437169cfdafda8814aa814bb85429fb6cfc (diff) | |
mesa: Rename 4 color component unsigned byte MESA_FORMATs
Change all 4 color component unsigned byte formats to meet spec for P
Type formats:
s/MESA_FORMAT_RGBA8888\b/MESA_FORMAT_A8B8G8R8_UNORM/g
s/MESA_FORMAT_RGBA8888_REV\b/MESA_FORMAT_R8G8B8A8_UNORM/g
s/MESA_FORMAT_ARGB8888\b/MESA_FORMAT_B8G8R8A8_UNORM/g
s/MESA_FORMAT_ARGB8888_REV\b/MESA_FORMAT_A8R8G8B8_UNORM/g
s/MESA_FORMAT_RGBX8888\b/MESA_FORMAT_X8B8G8R8_UNORM/g
s/MESA_FORMAT_RGBX8888_REV\b/MESA_FORMAT_R8G8B8X8_UNORM/g
s/MESA_FORMAT_XRGB8888\b/MESA_FORMAT_B8G8R8X8_UNORM/g
s/MESA_FORMAT_XRGB8888_REV\b/MESA_FORMAT_X8R8G8B8_UNORM/g
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_blit.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_blit.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_blit.c b/src/mesa/drivers/dri/i915/intel_blit.c index 267b096aeff..d4d6b430fbe 100644 --- a/src/mesa/drivers/dri/i915/intel_blit.c +++ b/src/mesa/drivers/dri/i915/intel_blit.c @@ -129,10 +129,10 @@ intel_miptree_blit(struct intel_context *intel, * channel to 1.0 at the end. */ if (src_format != dst_format && - ((src_format != MESA_FORMAT_ARGB8888 && - src_format != MESA_FORMAT_XRGB8888) || - (dst_format != MESA_FORMAT_ARGB8888 && - dst_format != MESA_FORMAT_XRGB8888))) { + ((src_format != MESA_FORMAT_B8G8R8A8_UNORM && + src_format != MESA_FORMAT_B8G8R8X8_UNORM) || + (dst_format != MESA_FORMAT_B8G8R8A8_UNORM && + dst_format != MESA_FORMAT_B8G8R8X8_UNORM))) { perf_debug("%s: Can't use hardware blitter from %s to %s, " "falling back.\n", __FUNCTION__, _mesa_get_format_name(src_format), @@ -201,8 +201,8 @@ intel_miptree_blit(struct intel_context *intel, return false; } - if (src_mt->format == MESA_FORMAT_XRGB8888 && - dst_mt->format == MESA_FORMAT_ARGB8888) { + if (src_mt->format == MESA_FORMAT_B8G8R8X8_UNORM && + dst_mt->format == MESA_FORMAT_B8G8R8A8_UNORM) { intel_miptree_set_alpha_to_one(intel, dst_mt, dst_x, dst_y, width, height); @@ -450,8 +450,8 @@ intelClearWithBlit(struct gl_context *ctx, GLbitfield mask) _mesa_unclamped_float_rgba_to_ubyte(clear, color); switch (intel_rb_format(irb)) { - case MESA_FORMAT_ARGB8888: - case MESA_FORMAT_XRGB8888: + case MESA_FORMAT_B8G8R8A8_UNORM: + case MESA_FORMAT_B8G8R8X8_UNORM: clear_val = PACK_COLOR_8888(clear[3], clear[0], clear[1], clear[2]); break; |