fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/glformats: Remove redundant helper _mesa_base_format_component_count

Browse source 
There exists _mesa_components_in_format() which already includes
all cases handled in _mesa_base_format_component_count().

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Eduardo Lima Mitev 2018-10-23 07:56:58 +02:00
parent ecb7775e1c
commit 22ddd4988e
4 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_blorp.c
View file

@ -1195,7 +1195,7 @@ set_write_disables(const struct intel_renderbuffer *irb,
* RGB we can treat alpha as not used and write whatever we like into it.
*/
const GLenum base_format = irb->Base.Base._BaseFormat;
const int components = _mesa_base_format_component_count(base_format);
const int components = _mesa_components_in_format(base_format);
bool disables = false;
assert(components > 0);

27
src/mesa/main/glformats.c
View file

@ -1630,33 +1630,6 @@ _mesa_base_format_has_channel(GLenum base_format, GLenum pname)
}
/**
* Returns the number of channels/components for a base format.
*/
GLint
_mesa_base_format_component_count(GLenum base_format)
{
switch (base_format) {
case GL_LUMINANCE:
case GL_RED:
case GL_ALPHA:
case GL_INTENSITY:
case GL_DEPTH_COMPONENT:
return 1;
case GL_RG:
case GL_LUMINANCE_ALPHA:
case GL_DEPTH_STENCIL:
return 2;
case GL_RGB:
return 3;
case GL_RGBA:
return 4;
default:
return -1;
}
}
/**
* If format is a generic compressed format, return the corresponding
* non-compressed format. For other formats, return the format as-is.

3
src/mesa/main/glformats.h
View file

@ -119,9 +119,6 @@ _mesa_unpack_format_to_base_format(GLenum format);
extern GLboolean
_mesa_base_format_has_channel(GLenum base_format, GLenum pname);
extern GLint
_mesa_base_format_component_count(GLenum base_format);
extern GLenum
_mesa_generic_compressed_format_to_uncompressed_format(GLenum format);

4
src/mesa/main/teximage.c
View file

@ -2407,8 +2407,8 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
if (_mesa_is_gles(ctx)) {
bool valid = true;
if (_mesa_base_format_component_count(baseFormat) >
_mesa_base_format_component_count(rb_base_format)) {
if (_mesa_components_in_format(baseFormat) >
_mesa_components_in_format(rb_base_format)) {
valid = false;
}
if (baseFormat == GL_DEPTH_COMPONENT ||