diff options
| author | Samuel Iglesias Gonsalvez <[email protected]> | 2014-11-21 16:31:09 +0100 |
|---|---|---|
| committer | Iago Toral Quiroga <[email protected]> | 2015-01-12 11:20:30 +0100 |
| commit | c471b09bf480c5e66d6def4946886f8bf345e9f9 (patch) | |
| tree | 1225e17d1bb311c7e82284e46a7c0bb85b04e0f6 /src/mesa/main/formats.c | |
| parent | 769de5165c71315d66bab2bc27be98ec481ea9f8 (diff) | |
mesa: restrict use of GL_ABGR_EXT format to allowed data types
GL_UNSIGNED_SHORT_5_5_5_1, GL_UNSIGNED_SHORT_1_5_5_5_REV,
GL_UNSIGNED_INT_10_10_10_2, GL_UNSIGNED_INT_2_10_10_10_REV data types
are not explicitly allowed to work with GL_ABGR_EXT format neither
in GL nor GL_EXT_abgr specs.
Removed the corresponding mesa formats as there are no other functions
using them inside Mesa anymore.
Signed-off-by: Samuel Iglesias Gonsalvez <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/main/formats.c')
| -rw-r--r-- | src/mesa/main/formats.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index a2df2859d91..8ac0583c027 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -1023,18 +1023,10 @@ _mesa_format_to_type_and_comps(mesa_format format, *datatype = GL_UNSIGNED_SHORT_4_4_4_4; *comps = 4; return; - case MESA_FORMAT_R1G5B5A5_UNORM: - *datatype = GL_UNSIGNED_SHORT_5_5_5_1; - *comps = 4; - return; case MESA_FORMAT_R5G5B5A1_UNORM: *datatype = GL_UNSIGNED_SHORT_1_5_5_5_REV; *comps = 4; return; - case MESA_FORMAT_A5B5G5R1_UNORM: - *datatype = GL_UNSIGNED_SHORT_1_5_5_5_REV; - *comps = 4; - return; case MESA_FORMAT_A2B10G10R10_UNORM: case MESA_FORMAT_A2B10G10R10_UINT: *datatype = GL_UNSIGNED_INT_10_10_10_2; @@ -1045,14 +1037,6 @@ _mesa_format_to_type_and_comps(mesa_format format, *datatype = GL_UNSIGNED_INT_10_10_10_2; *comps = 4; return; - case MESA_FORMAT_R2G10B10A10_UNORM: - *datatype = GL_UNSIGNED_INT_10_10_10_2; - *comps = 4; - return; - case MESA_FORMAT_A10B10G10R2_UNORM: - *datatype = GL_UNSIGNED_INT_2_10_10_10_REV; - *comps = 4; - return; case MESA_FORMAT_B2G3R3_UNORM: *datatype = GL_UNSIGNED_BYTE_3_3_2; @@ -1730,15 +1714,9 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, return GL_FALSE; - case MESA_FORMAT_R1G5B5A5_UNORM: - return format == GL_ABGR_EXT && type == GL_UNSIGNED_SHORT_5_5_5_1; - case MESA_FORMAT_R5G5B5A1_UNORM: return format == GL_RGBA && type == GL_UNSIGNED_SHORT_1_5_5_5_REV; - case MESA_FORMAT_A5B5G5R1_UNORM: - return format == GL_ABGR_EXT && type == GL_UNSIGNED_SHORT_1_5_5_5_REV; - case MESA_FORMAT_A2B10G10R10_UNORM: return format == GL_RGBA && type == GL_UNSIGNED_INT_10_10_10_2; @@ -1751,12 +1729,6 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format, case MESA_FORMAT_A2R10G10B10_UINT: return format == GL_BGRA_INTEGER_EXT && type == GL_UNSIGNED_INT_10_10_10_2; - case MESA_FORMAT_R2G10B10A10_UNORM: - return format == GL_ABGR_EXT && type == GL_UNSIGNED_INT_10_10_10_2; - - case MESA_FORMAT_A10B10G10R2_UNORM: - return format == GL_ABGR_EXT && type == GL_UNSIGNED_INT_2_10_10_10_REV; - case MESA_FORMAT_A_UNORM8: return format == GL_ALPHA && type == GL_UNSIGNED_BYTE; case MESA_FORMAT_A_UNORM16: |