summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/intel_tex_subimage.c
diff options
context:
space:
mode:
authorMark Mueller <MarkKMueller@gmail.com>2014-01-20 14:21:43 -0800
committerMark Mueller <MarkKMueller@gmail.com>2014-01-27 14:29:13 -0800
commitef145ba4ded6aafb28e3bda02fb348e6b8bff12a (patch)
tree055904f1dd870171e87e792c878e9712ae50c722 /src/mesa/drivers/dri/i965/intel_tex_subimage.c
parent71fe9437169cfdafda8814aa814bb85429fb6cfc (diff)
downloadexternal_mesa3d-ef145ba4ded6aafb28e3bda02fb348e6b8bff12a.zip
external_mesa3d-ef145ba4ded6aafb28e3bda02fb348e6b8bff12a.tar.gz
external_mesa3d-ef145ba4ded6aafb28e3bda02fb348e6b8bff12a.tar.bz2
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/i965/intel_tex_subimage.c')
-rw-r--r--src/mesa/drivers/dri/i965/intel_tex_subimage.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index f1de6c9..1def8ca 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -576,8 +576,8 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
(texImage->TexFormat == MESA_FORMAT_A8 && format == GL_ALPHA)) {
cpp = 1;
mem_copy = memcpy;
- } else if ((texImage->TexFormat == MESA_FORMAT_ARGB8888) ||
- (texImage->TexFormat == MESA_FORMAT_XRGB8888)) {
+ } else if ((texImage->TexFormat == MESA_FORMAT_B8G8R8A8_UNORM) ||
+ (texImage->TexFormat == MESA_FORMAT_B8G8R8X8_UNORM)) {
cpp = 4;
if (format == GL_BGRA) {
mem_copy = memcpy;