diff options
author | Mark Mueller <MarkKMueller@gmail.com> | 2014-01-04 14:11:43 -0800 |
---|---|---|
committer | Mark Mueller <MarkKMueller@gmail.com> | 2014-01-27 14:28:46 -0800 |
commit | 71fe9437169cfdafda8814aa814bb85429fb6cfc (patch) | |
tree | 7eb5b04c681c7347de9dd5b0a69aa4f75343293d /src/mesa/drivers/dri/radeon/radeon_texture.c | |
parent | bc0ed682757607172eca6b8a7031c81a73287524 (diff) | |
download | external_mesa3d-71fe9437169cfdafda8814aa814bb85429fb6cfc.zip external_mesa3d-71fe9437169cfdafda8814aa814bb85429fb6cfc.tar.gz external_mesa3d-71fe9437169cfdafda8814aa814bb85429fb6cfc.tar.bz2 |
mesa: change gl_format to mesa_format
s/\bgl_format\b/mesa_format/g. Use better name for Mesa Formats enum
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_texture.c')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index 52cf95d..8455b82 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -213,7 +213,7 @@ radeon_unmap_texture_image(struct gl_context *ctx, } /* try to find a format which will only need a memcopy */ -static gl_format radeonChoose8888TexFormat(radeonContextPtr rmesa, +static mesa_format radeonChoose8888TexFormat(radeonContextPtr rmesa, GLenum srcFormat, GLenum srcType, GLboolean fbo) { @@ -242,7 +242,7 @@ static gl_format radeonChoose8888TexFormat(radeonContextPtr rmesa, #endif } -gl_format radeonChooseTextureFormat_mesa(struct gl_context * ctx, +mesa_format radeonChooseTextureFormat_mesa(struct gl_context * ctx, GLenum target, GLint internalFormat, GLenum format, @@ -252,7 +252,7 @@ gl_format radeonChooseTextureFormat_mesa(struct gl_context * ctx, type, 0); } -gl_format radeonChooseTextureFormat(struct gl_context * ctx, +mesa_format radeonChooseTextureFormat(struct gl_context * ctx, GLint internalFormat, GLenum format, GLenum type, GLboolean fbo) @@ -504,7 +504,7 @@ static void teximage_assign_miptree(radeonContextPtr rmesa, "%s Failed to allocate miptree.\n", __func__); } -unsigned radeonIsFormatRenderable(gl_format mesa_format) +unsigned radeonIsFormatRenderable(mesa_format mesa_format) { if (mesa_format == _radeon_texformat_argb8888 || mesa_format == _radeon_texformat_rgb565 || mesa_format == _radeon_texformat_argb1555 || mesa_format == _radeon_texformat_argb4444) @@ -579,12 +579,12 @@ void radeon_image_target_texture_2d(struct gl_context *ctx, GLenum target, fprintf(stderr, "miptree doesn't match image\n"); } -gl_format _radeon_texformat_rgba8888 = MESA_FORMAT_NONE; -gl_format _radeon_texformat_argb8888 = MESA_FORMAT_NONE; -gl_format _radeon_texformat_rgb565 = MESA_FORMAT_NONE; -gl_format _radeon_texformat_argb4444 = MESA_FORMAT_NONE; -gl_format _radeon_texformat_argb1555 = MESA_FORMAT_NONE; -gl_format _radeon_texformat_al88 = MESA_FORMAT_NONE; +mesa_format _radeon_texformat_rgba8888 = MESA_FORMAT_NONE; +mesa_format _radeon_texformat_argb8888 = MESA_FORMAT_NONE; +mesa_format _radeon_texformat_rgb565 = MESA_FORMAT_NONE; +mesa_format _radeon_texformat_argb4444 = MESA_FORMAT_NONE; +mesa_format _radeon_texformat_argb1555 = MESA_FORMAT_NONE; +mesa_format _radeon_texformat_al88 = MESA_FORMAT_NONE; /*@}*/ |