Commit 63432eb3 authored by Anuj Phogat's avatar Anuj Phogat
Browse files

mesa: Enable translation between astc 3d gl formats and mesa formats


Signed-off-by: Anuj Phogat's avatarAnuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Brian Paul's avatarBrian Paul <brianp@vmware.com>
parent 54cac7ad
......@@ -612,6 +612,46 @@ _mesa_glenum_to_compressed_format(GLenum format)
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12;
case GL_COMPRESSED_RGBA_ASTC_3x3x3_OES:
return MESA_FORMAT_RGBA_ASTC_3x3x3;
case GL_COMPRESSED_RGBA_ASTC_4x3x3_OES:
return MESA_FORMAT_RGBA_ASTC_4x3x3;
case GL_COMPRESSED_RGBA_ASTC_4x4x3_OES:
return MESA_FORMAT_RGBA_ASTC_4x4x3;
case GL_COMPRESSED_RGBA_ASTC_4x4x4_OES:
return MESA_FORMAT_RGBA_ASTC_4x4x4;
case GL_COMPRESSED_RGBA_ASTC_5x4x4_OES:
return MESA_FORMAT_RGBA_ASTC_5x4x4;
case GL_COMPRESSED_RGBA_ASTC_5x5x4_OES:
return MESA_FORMAT_RGBA_ASTC_5x5x4;
case GL_COMPRESSED_RGBA_ASTC_5x5x5_OES:
return MESA_FORMAT_RGBA_ASTC_5x5x5;
case GL_COMPRESSED_RGBA_ASTC_6x5x5_OES:
return MESA_FORMAT_RGBA_ASTC_6x5x5;
case GL_COMPRESSED_RGBA_ASTC_6x6x5_OES:
return MESA_FORMAT_RGBA_ASTC_6x6x5;
case GL_COMPRESSED_RGBA_ASTC_6x6x6_OES:
return MESA_FORMAT_RGBA_ASTC_6x6x6;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_3x3x3;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x3x3;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x3;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x4;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4x4;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x4;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x5;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5x5;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x5;
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES:
return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x6;
default:
return MESA_FORMAT_NONE;
......@@ -760,6 +800,46 @@ _mesa_compressed_format_to_glenum(struct gl_context *ctx, mesa_format mesaFormat
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR;
case MESA_FORMAT_RGBA_ASTC_3x3x3:
return GL_COMPRESSED_RGBA_ASTC_3x3x3_OES;
case MESA_FORMAT_RGBA_ASTC_4x3x3:
return GL_COMPRESSED_RGBA_ASTC_4x3x3_OES;
case MESA_FORMAT_RGBA_ASTC_4x4x3:
return GL_COMPRESSED_RGBA_ASTC_4x4x3_OES;
case MESA_FORMAT_RGBA_ASTC_4x4x4:
return GL_COMPRESSED_RGBA_ASTC_4x4x4_OES;
case MESA_FORMAT_RGBA_ASTC_5x4x4:
return GL_COMPRESSED_RGBA_ASTC_5x4x4_OES;
case MESA_FORMAT_RGBA_ASTC_5x5x4:
return GL_COMPRESSED_RGBA_ASTC_5x5x4_OES;
case MESA_FORMAT_RGBA_ASTC_5x5x5:
return GL_COMPRESSED_RGBA_ASTC_5x5x5_OES;
case MESA_FORMAT_RGBA_ASTC_6x5x5:
return GL_COMPRESSED_RGBA_ASTC_6x5x5_OES;
case MESA_FORMAT_RGBA_ASTC_6x6x5:
return GL_COMPRESSED_RGBA_ASTC_6x6x5_OES;
case MESA_FORMAT_RGBA_ASTC_6x6x6:
return GL_COMPRESSED_RGBA_ASTC_6x6x6_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_3x3x3:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x3x3:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x3:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4x4:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4x4:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x4:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5x5:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5x5:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x5:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES;
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x6:
return GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES;
default:
_mesa_problem(ctx, "Unexpected mesa texture format in"
" _mesa_compressed_format_to_glenum()");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment