#include "main/imports.h"
#include "main/context.h"
+#include "main/enums.h"
+#include "main/formats.h"
#include "main/glformats.h"
+#include "main/texcompress.h"
#include "main/texgetimage.h"
#include "main/teximage.h"
#include "main/texstore.h"
#include "main/image.h"
#include "main/macros.h"
+#include "main/formatquery.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
* Translate Mesa format to Gallium format.
*/
enum pipe_format
-st_mesa_format_to_pipe_format(struct st_context *st, mesa_format mesaFormat)
+st_mesa_format_to_pipe_format(const struct st_context *st, mesa_format mesaFormat)
{
switch (mesaFormat) {
case MESA_FORMAT_A8B8G8R8_UNORM:
case MESA_FORMAT_BGR_SRGB8:
return PIPE_FORMAT_R8G8B8_SRGB;
case MESA_FORMAT_A8B8G8R8_SRGB:
- return PIPE_FORMAT_A8B8G8R8_SRGB;
- case MESA_FORMAT_B8G8R8A8_SRGB:
- return PIPE_FORMAT_B8G8R8A8_SRGB;
+ return PIPE_FORMAT_ABGR8888_SRGB;
case MESA_FORMAT_R8G8B8A8_SRGB:
- return PIPE_FORMAT_R8G8B8A8_SRGB;
+ return PIPE_FORMAT_RGBA8888_SRGB;
+ case MESA_FORMAT_B8G8R8A8_SRGB:
+ return PIPE_FORMAT_BGRA8888_SRGB;
+ case MESA_FORMAT_A8R8G8B8_SRGB:
+ return PIPE_FORMAT_ARGB8888_SRGB;
case MESA_FORMAT_RGBA_FLOAT32:
return PIPE_FORMAT_R32G32B32A32_FLOAT;
case MESA_FORMAT_RGBA_FLOAT16:
case MESA_FORMAT_G8R8_SNORM:
return PIPE_FORMAT_GR88_SNORM;
case MESA_FORMAT_R8G8B8A8_SNORM:
- return PIPE_FORMAT_R8G8B8A8_SNORM;
+ return PIPE_FORMAT_RGBA8888_SNORM;
+ case MESA_FORMAT_A8B8G8R8_SNORM:
+ return PIPE_FORMAT_ABGR8888_SNORM;
case MESA_FORMAT_A_SNORM8:
return PIPE_FORMAT_A8_SNORM;
case MESA_FORMAT_B5G5R5X1_UNORM:
return PIPE_FORMAT_B5G5R5X1_UNORM;
case MESA_FORMAT_R8G8B8X8_SNORM:
- return PIPE_FORMAT_R8G8B8X8_SNORM;
+ return PIPE_FORMAT_RGBX8888_SNORM;
+ case MESA_FORMAT_X8B8G8R8_SNORM:
+ return PIPE_FORMAT_XBGR8888_SNORM;
case MESA_FORMAT_R8G8B8X8_SRGB:
- return PIPE_FORMAT_R8G8B8X8_SRGB;
+ return PIPE_FORMAT_RGBX8888_SRGB;
+ case MESA_FORMAT_X8B8G8R8_SRGB:
+ return PIPE_FORMAT_XBGR8888_SRGB;
case MESA_FORMAT_RGBX_UINT8:
return PIPE_FORMAT_R8G8B8X8_UINT;
case MESA_FORMAT_RGBX_SINT8:
return PIPE_FORMAT_R32G32B32X32_SINT;
case MESA_FORMAT_B8G8R8X8_SRGB:
- return PIPE_FORMAT_B8G8R8X8_SRGB;
+ return PIPE_FORMAT_BGRX8888_SRGB;
+ case MESA_FORMAT_X8R8G8B8_SRGB:
+ return PIPE_FORMAT_XRGB8888_SRGB;
/* ETC2 formats are emulated as uncompressed ones.
* The destination formats mustn't be changed, because they are also
* destination formats of the unpack/decompression function. */
case MESA_FORMAT_ETC2_RGB8:
- case MESA_FORMAT_ETC2_RGBA8_EAC:
- case MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1:
- return PIPE_FORMAT_R8G8B8A8_UNORM;
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_RGB8 : PIPE_FORMAT_R8G8B8A8_UNORM;
case MESA_FORMAT_ETC2_SRGB8:
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_SRGB8 : PIPE_FORMAT_B8G8R8A8_SRGB;
+ case MESA_FORMAT_ETC2_RGBA8_EAC:
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_RGBA8 : PIPE_FORMAT_R8G8B8A8_UNORM;
case MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC:
- case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
- return PIPE_FORMAT_B8G8R8A8_SRGB;
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_SRGBA8 : PIPE_FORMAT_B8G8R8A8_SRGB;
case MESA_FORMAT_ETC2_R11_EAC:
- return PIPE_FORMAT_R16_UNORM;
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_R11_UNORM : PIPE_FORMAT_R16_UNORM;
case MESA_FORMAT_ETC2_RG11_EAC:
- return PIPE_FORMAT_R16G16_UNORM;
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_RG11_UNORM : PIPE_FORMAT_R16G16_UNORM;
case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
- return PIPE_FORMAT_R16_SNORM;
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_R11_SNORM : PIPE_FORMAT_R16_SNORM;
case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
- return PIPE_FORMAT_R16G16_SNORM;
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_RG11_SNORM : PIPE_FORMAT_R16G16_SNORM;
+ case MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1:
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_RGB8A1 : PIPE_FORMAT_R8G8B8A8_UNORM;
+ case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
+ return st->has_etc2 ? PIPE_FORMAT_ETC2_SRGB8A1 : PIPE_FORMAT_B8G8R8A8_SRGB;
+
+ case MESA_FORMAT_RGBA_ASTC_4x4:
+ return PIPE_FORMAT_ASTC_4x4;
+ case MESA_FORMAT_RGBA_ASTC_5x4:
+ return PIPE_FORMAT_ASTC_5x4;
+ case MESA_FORMAT_RGBA_ASTC_5x5:
+ return PIPE_FORMAT_ASTC_5x5;
+ case MESA_FORMAT_RGBA_ASTC_6x5:
+ return PIPE_FORMAT_ASTC_6x5;
+ case MESA_FORMAT_RGBA_ASTC_6x6:
+ return PIPE_FORMAT_ASTC_6x6;
+ case MESA_FORMAT_RGBA_ASTC_8x5:
+ return PIPE_FORMAT_ASTC_8x5;
+ case MESA_FORMAT_RGBA_ASTC_8x6:
+ return PIPE_FORMAT_ASTC_8x6;
+ case MESA_FORMAT_RGBA_ASTC_8x8:
+ return PIPE_FORMAT_ASTC_8x8;
+ case MESA_FORMAT_RGBA_ASTC_10x5:
+ return PIPE_FORMAT_ASTC_10x5;
+ case MESA_FORMAT_RGBA_ASTC_10x6:
+ return PIPE_FORMAT_ASTC_10x6;
+ case MESA_FORMAT_RGBA_ASTC_10x8:
+ return PIPE_FORMAT_ASTC_10x8;
+ case MESA_FORMAT_RGBA_ASTC_10x10:
+ return PIPE_FORMAT_ASTC_10x10;
+ case MESA_FORMAT_RGBA_ASTC_12x10:
+ return PIPE_FORMAT_ASTC_12x10;
+ case MESA_FORMAT_RGBA_ASTC_12x12:
+ return PIPE_FORMAT_ASTC_12x12;
+
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4:
+ return PIPE_FORMAT_ASTC_4x4_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4:
+ return PIPE_FORMAT_ASTC_5x4_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5:
+ return PIPE_FORMAT_ASTC_5x5_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5:
+ return PIPE_FORMAT_ASTC_6x5_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6:
+ return PIPE_FORMAT_ASTC_6x6_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5:
+ return PIPE_FORMAT_ASTC_8x5_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6:
+ return PIPE_FORMAT_ASTC_8x6_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8:
+ return PIPE_FORMAT_ASTC_8x8_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5:
+ return PIPE_FORMAT_ASTC_10x5_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6:
+ return PIPE_FORMAT_ASTC_10x6_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8:
+ return PIPE_FORMAT_ASTC_10x8_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10:
+ return PIPE_FORMAT_ASTC_10x10_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10:
+ return PIPE_FORMAT_ASTC_12x10_SRGB;
+ case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12:
+ return PIPE_FORMAT_ASTC_12x12_SRGB;
default:
return PIPE_FORMAT_NONE;
return MESA_FORMAT_L_SRGB8;
case PIPE_FORMAT_R8G8B8_SRGB:
return MESA_FORMAT_BGR_SRGB8;
- case PIPE_FORMAT_A8B8G8R8_SRGB:
+ case PIPE_FORMAT_ABGR8888_SRGB:
return MESA_FORMAT_A8B8G8R8_SRGB;
- case PIPE_FORMAT_B8G8R8A8_SRGB:
+ case PIPE_FORMAT_RGBA8888_SRGB:
+ return MESA_FORMAT_R8G8B8A8_SRGB;
+ case PIPE_FORMAT_BGRA8888_SRGB:
return MESA_FORMAT_B8G8R8A8_SRGB;
+ case PIPE_FORMAT_ARGB8888_SRGB:
+ return MESA_FORMAT_A8R8G8B8_SRGB;
case PIPE_FORMAT_R32G32B32A32_FLOAT:
return MESA_FORMAT_RGBA_FLOAT32;
case PIPE_FORMAT_R16G16B16A16_FLOAT:
return MESA_FORMAT_R8G8_SNORM;
case PIPE_FORMAT_GR88_SNORM:
return MESA_FORMAT_G8R8_SNORM;
- case PIPE_FORMAT_R8G8B8A8_SNORM:
+ case PIPE_FORMAT_RGBA8888_SNORM:
return MESA_FORMAT_R8G8B8A8_SNORM;
+ case PIPE_FORMAT_ABGR8888_SNORM:
+ return MESA_FORMAT_A8B8G8R8_SNORM;
case PIPE_FORMAT_A8_SNORM:
return MESA_FORMAT_A_SNORM8;
return MESA_FORMAT_B4G4R4X4_UNORM;
case PIPE_FORMAT_B5G5R5X1_UNORM:
return MESA_FORMAT_B5G5R5X1_UNORM;
- case PIPE_FORMAT_R8G8B8X8_SNORM:
+ case PIPE_FORMAT_RGBX8888_SNORM:
return MESA_FORMAT_R8G8B8X8_SNORM;
- case PIPE_FORMAT_R8G8B8X8_SRGB:
+ case PIPE_FORMAT_XBGR8888_SNORM:
+ return MESA_FORMAT_X8B8G8R8_SNORM;
+ case PIPE_FORMAT_RGBX8888_SRGB:
return MESA_FORMAT_R8G8B8X8_SRGB;
+ case PIPE_FORMAT_XBGR8888_SRGB:
+ return MESA_FORMAT_X8B8G8R8_SRGB;
case PIPE_FORMAT_R8G8B8X8_UINT:
return MESA_FORMAT_RGBX_UINT8;
case PIPE_FORMAT_R8G8B8X8_SINT:
case PIPE_FORMAT_R32G32B32X32_SINT:
return MESA_FORMAT_RGBX_SINT32;
- case PIPE_FORMAT_B8G8R8X8_SRGB:
+ case PIPE_FORMAT_BGRX8888_SRGB:
return MESA_FORMAT_B8G8R8X8_SRGB;
- case PIPE_FORMAT_R8G8B8A8_SRGB:
- return MESA_FORMAT_R8G8B8A8_SRGB;
+ case PIPE_FORMAT_XRGB8888_SRGB:
+ return MESA_FORMAT_X8R8G8B8_SRGB;
+
+ case PIPE_FORMAT_ETC2_RGB8:
+ return MESA_FORMAT_ETC2_RGB8;
+ case PIPE_FORMAT_ETC2_SRGB8:
+ return MESA_FORMAT_ETC2_SRGB8;
+ case PIPE_FORMAT_ETC2_RGB8A1:
+ return MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1;
+ case PIPE_FORMAT_ETC2_SRGB8A1:
+ return MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1;
+ case PIPE_FORMAT_ETC2_RGBA8:
+ return MESA_FORMAT_ETC2_RGBA8_EAC;
+ case PIPE_FORMAT_ETC2_SRGBA8:
+ return MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC;
+ case PIPE_FORMAT_ETC2_R11_UNORM:
+ return MESA_FORMAT_ETC2_R11_EAC;
+ case PIPE_FORMAT_ETC2_R11_SNORM:
+ return MESA_FORMAT_ETC2_SIGNED_R11_EAC;
+ case PIPE_FORMAT_ETC2_RG11_UNORM:
+ return MESA_FORMAT_ETC2_RG11_EAC;
+ case PIPE_FORMAT_ETC2_RG11_SNORM:
+ return MESA_FORMAT_ETC2_SIGNED_RG11_EAC;
+
+ case PIPE_FORMAT_ASTC_4x4:
+ return MESA_FORMAT_RGBA_ASTC_4x4;
+ case PIPE_FORMAT_ASTC_5x4:
+ return MESA_FORMAT_RGBA_ASTC_5x4;
+ case PIPE_FORMAT_ASTC_5x5:
+ return MESA_FORMAT_RGBA_ASTC_5x5;
+ case PIPE_FORMAT_ASTC_6x5:
+ return MESA_FORMAT_RGBA_ASTC_6x5;
+ case PIPE_FORMAT_ASTC_6x6:
+ return MESA_FORMAT_RGBA_ASTC_6x6;
+ case PIPE_FORMAT_ASTC_8x5:
+ return MESA_FORMAT_RGBA_ASTC_8x5;
+ case PIPE_FORMAT_ASTC_8x6:
+ return MESA_FORMAT_RGBA_ASTC_8x6;
+ case PIPE_FORMAT_ASTC_8x8:
+ return MESA_FORMAT_RGBA_ASTC_8x8;
+ case PIPE_FORMAT_ASTC_10x5:
+ return MESA_FORMAT_RGBA_ASTC_10x5;
+ case PIPE_FORMAT_ASTC_10x6:
+ return MESA_FORMAT_RGBA_ASTC_10x6;
+ case PIPE_FORMAT_ASTC_10x8:
+ return MESA_FORMAT_RGBA_ASTC_10x8;
+ case PIPE_FORMAT_ASTC_10x10:
+ return MESA_FORMAT_RGBA_ASTC_10x10;
+ case PIPE_FORMAT_ASTC_12x10:
+ return MESA_FORMAT_RGBA_ASTC_12x10;
+ case PIPE_FORMAT_ASTC_12x12:
+ return MESA_FORMAT_RGBA_ASTC_12x12;
+
+ case PIPE_FORMAT_ASTC_4x4_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4;
+ case PIPE_FORMAT_ASTC_5x4_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4;
+ case PIPE_FORMAT_ASTC_5x5_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5;
+ case PIPE_FORMAT_ASTC_6x5_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5;
+ case PIPE_FORMAT_ASTC_6x6_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6;
+ case PIPE_FORMAT_ASTC_8x5_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5;
+ case PIPE_FORMAT_ASTC_8x6_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6;
+ case PIPE_FORMAT_ASTC_8x8_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8;
+ case PIPE_FORMAT_ASTC_10x5_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5;
+ case PIPE_FORMAT_ASTC_10x6_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6;
+ case PIPE_FORMAT_ASTC_10x8_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8;
+ case PIPE_FORMAT_ASTC_10x10_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10;
+ case PIPE_FORMAT_ASTC_12x10_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10;
+ case PIPE_FORMAT_ASTC_12x12_SRGB:
+ return MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12;
default:
return MESA_FORMAT_NONE;
if (i == PIPE_FORMAT_ETC1_RGB8 && !st->has_etc1)
continue;
+ if (_mesa_is_format_etc2(mf) && !st->has_etc2)
+ continue;
+
if (mf != MESA_FORMAT_NONE) {
enum pipe_format pf = st_mesa_format_to_pipe_format(st, mf);
assert(pf == i);
#define DEFAULT_RGBA_FORMATS \
- PIPE_FORMAT_B8G8R8A8_UNORM, \
PIPE_FORMAT_R8G8B8A8_UNORM, \
+ PIPE_FORMAT_B8G8R8A8_UNORM, \
PIPE_FORMAT_A8R8G8B8_UNORM, \
PIPE_FORMAT_A8B8G8R8_UNORM, \
0
#define DEFAULT_RGB_FORMATS \
- PIPE_FORMAT_B8G8R8X8_UNORM, \
PIPE_FORMAT_R8G8B8X8_UNORM, \
+ PIPE_FORMAT_B8G8R8X8_UNORM, \
PIPE_FORMAT_X8R8G8B8_UNORM, \
PIPE_FORMAT_X8B8G8R8_UNORM, \
PIPE_FORMAT_B5G6R5_UNORM, \
DEFAULT_RGBA_FORMATS
#define DEFAULT_SRGBA_FORMATS \
- PIPE_FORMAT_B8G8R8A8_SRGB, \
PIPE_FORMAT_R8G8B8A8_SRGB, \
+ PIPE_FORMAT_B8G8R8A8_SRGB, \
PIPE_FORMAT_A8R8G8B8_SRGB, \
PIPE_FORMAT_A8B8G8R8_SRGB, \
0
{
{ GL_RGB10, 0 },
{ PIPE_FORMAT_B10G10R10X2_UNORM, PIPE_FORMAT_B10G10R10A2_UNORM,
- DEFAULT_RGB_FORMATS }
+ PIPE_FORMAT_R10G10B10A2_UNORM, DEFAULT_RGB_FORMATS }
},
{
{ GL_RGB10_A2, 0 },
- { PIPE_FORMAT_B10G10R10A2_UNORM, PIPE_FORMAT_R10G10B10A2_UNORM,
+ { PIPE_FORMAT_R10G10B10A2_UNORM, PIPE_FORMAT_B10G10R10A2_UNORM,
DEFAULT_RGBA_FORMATS }
},
{
{ 4, GL_RGBA, GL_RGBA8, 0 },
- { DEFAULT_RGBA_FORMATS }
+ { PIPE_FORMAT_R8G8B8A8_UNORM, DEFAULT_RGBA_FORMATS }
},
{
{ GL_BGRA, 0 },
},
{
{ 3, GL_RGB, GL_RGB8, 0 },
- { DEFAULT_RGB_FORMATS }
+ { PIPE_FORMAT_R8G8B8X8_UNORM, DEFAULT_RGB_FORMATS }
},
{
{ GL_RGB12, GL_RGB16, 0 },
/* basic Alpha formats */
{
{ GL_ALPHA12, GL_ALPHA16, 0 },
- { PIPE_FORMAT_A16_UNORM, PIPE_FORMAT_A8_UNORM,
- DEFAULT_RGBA_FORMATS }
+ { PIPE_FORMAT_A16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM,
+ PIPE_FORMAT_A8_UNORM, DEFAULT_RGBA_FORMATS }
},
{
{ GL_ALPHA, GL_ALPHA4, GL_ALPHA8, GL_COMPRESSED_ALPHA, 0 },
/* basic Luminance formats */
{
{ GL_LUMINANCE12, GL_LUMINANCE16, 0 },
- { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS }
+ { PIPE_FORMAT_L16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM,
+ PIPE_FORMAT_L8_UNORM, DEFAULT_RGB_FORMATS }
},
{
{ 1, GL_LUMINANCE, GL_LUMINANCE4, GL_LUMINANCE8, 0 },
{
{ GL_LUMINANCE12_ALPHA4, GL_LUMINANCE12_ALPHA12,
GL_LUMINANCE16_ALPHA16, 0},
- { PIPE_FORMAT_L16A16_UNORM, PIPE_FORMAT_L8A8_UNORM,
- DEFAULT_RGBA_FORMATS }
+ { PIPE_FORMAT_L16A16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM,
+ PIPE_FORMAT_L8A8_UNORM, DEFAULT_RGBA_FORMATS }
},
{
{ 2, GL_LUMINANCE_ALPHA, GL_LUMINANCE6_ALPHA2, GL_LUMINANCE8_ALPHA8, 0 },
/* basic Intensity formats */
{
{ GL_INTENSITY12, GL_INTENSITY16, 0 },
- { PIPE_FORMAT_I16_UNORM, PIPE_FORMAT_I8_UNORM, DEFAULT_RGBA_FORMATS }
+ { PIPE_FORMAT_I16_UNORM, PIPE_FORMAT_R16G16B16A16_UNORM,
+ PIPE_FORMAT_I8_UNORM, DEFAULT_RGBA_FORMATS }
},
{
{ GL_INTENSITY, GL_INTENSITY4, GL_INTENSITY8,
},
{
{ GL_SRGB_ALPHA_EXT, GL_SRGB8_ALPHA8_EXT, 0 },
- { DEFAULT_SRGBA_FORMATS }
+ { PIPE_FORMAT_R8G8B8A8_SRGB, DEFAULT_SRGBA_FORMATS }
},
{
{ GL_COMPRESSED_SRGB_EXT, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, 0 },
/* 32-bit float formats */
{
{ GL_RGBA32F_ARB, 0 },
- { PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ { PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
{
{ GL_RGB32F_ARB, 0 },
{ PIPE_FORMAT_R32G32B32_FLOAT, PIPE_FORMAT_R32G32B32X32_FLOAT,
- PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
{
{ GL_LUMINANCE_ALPHA32F_ARB, 0 },
- { PIPE_FORMAT_L32A32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT,
- PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ { PIPE_FORMAT_L32A32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
{
{ GL_ALPHA32F_ARB, 0 },
{ PIPE_FORMAT_A32_FLOAT, PIPE_FORMAT_L32A32_FLOAT,
- PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_A16_FLOAT,
- PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
{
{ GL_INTENSITY32F_ARB, 0 },
{ PIPE_FORMAT_I32_FLOAT, PIPE_FORMAT_L32A32_FLOAT,
- PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_I16_FLOAT,
- PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
{
{ GL_LUMINANCE32F_ARB, 0 },
{ PIPE_FORMAT_L32_FLOAT, PIPE_FORMAT_L32A32_FLOAT,
- PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_L16_FLOAT,
- PIPE_FORMAT_L16A16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
{
{ GL_R32F, 0 },
{ PIPE_FORMAT_R32_FLOAT, PIPE_FORMAT_R32G32_FLOAT,
- PIPE_FORMAT_R32G32B32A32_FLOAT, PIPE_FORMAT_R16_FLOAT,
- PIPE_FORMAT_R16G16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
{
{ GL_RG32F, 0 },
- { PIPE_FORMAT_R32G32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT,
- PIPE_FORMAT_R16G16_FLOAT, PIPE_FORMAT_R16G16B16A16_FLOAT, 0 }
+ { PIPE_FORMAT_R32G32_FLOAT, PIPE_FORMAT_R32G32B32A32_FLOAT, 0 }
},
/* R, RG formats */
{ PIPE_FORMAT_ETC1_RGB8, 0 }
},
+ /* ETC2 */
+ {
+ { GL_COMPRESSED_RGB8_ETC2, 0 },
+ { PIPE_FORMAT_ETC2_RGB8, 0 }
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ETC2, 0 },
+ { PIPE_FORMAT_ETC2_SRGB8, 0 }
+ },
+ {
+ { GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, 0 },
+ { PIPE_FORMAT_ETC2_RGB8A1, 0 }
+ },
+ {
+ { GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, 0 },
+ { PIPE_FORMAT_ETC2_SRGB8A1, 0 }
+ },
+ {
+ { GL_COMPRESSED_RGBA8_ETC2_EAC, 0 },
+ { PIPE_FORMAT_ETC2_RGBA8, 0 }
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, 0 },
+ { PIPE_FORMAT_ETC2_SRGBA8, 0 }
+ },
+ {
+ { GL_COMPRESSED_R11_EAC, 0 },
+ { PIPE_FORMAT_ETC2_R11_UNORM, 0 }
+ },
+ {
+ { GL_COMPRESSED_SIGNED_R11_EAC, 0 },
+ { PIPE_FORMAT_ETC2_R11_SNORM, 0 }
+ },
+ {
+ { GL_COMPRESSED_RG11_EAC, 0 },
+ { PIPE_FORMAT_ETC2_RG11_UNORM, 0 }
+ },
+ {
+ { GL_COMPRESSED_SIGNED_RG11_EAC, 0 },
+ { PIPE_FORMAT_ETC2_RG11_SNORM, 0 }
+ },
+
/* BPTC */
{
{ GL_COMPRESSED_RGBA_BPTC_UNORM, 0 },
{ PIPE_FORMAT_BPTC_RGB_UFLOAT, 0 },
},
+ /* ASTC */
+ {
+ { GL_COMPRESSED_RGBA_ASTC_4x4_KHR, 0 },
+ { PIPE_FORMAT_ASTC_4x4, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_5x4_KHR, 0 },
+ { PIPE_FORMAT_ASTC_5x4, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_5x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_5x5, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_6x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_6x5, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_6x6_KHR, 0 },
+ { PIPE_FORMAT_ASTC_6x6, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_8x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_8x5, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_8x6_KHR, 0 },
+ { PIPE_FORMAT_ASTC_8x6, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_8x8_KHR, 0 },
+ { PIPE_FORMAT_ASTC_8x8, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_10x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x5, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_10x6_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x6, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_10x8_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x8, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_10x10_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x10, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_12x10_KHR, 0 },
+ { PIPE_FORMAT_ASTC_12x10, 0},
+ },
+ {
+ { GL_COMPRESSED_RGBA_ASTC_12x12_KHR, 0 },
+ { PIPE_FORMAT_ASTC_12x12, 0},
+ },
+
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR, 0 },
+ { PIPE_FORMAT_ASTC_4x4_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR, 0 },
+ { PIPE_FORMAT_ASTC_5x4_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_5x5_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_6x5_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR, 0 },
+ { PIPE_FORMAT_ASTC_6x6_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_8x5_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR, 0 },
+ { PIPE_FORMAT_ASTC_8x6_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR, 0 },
+ { PIPE_FORMAT_ASTC_8x8_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x5_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x6_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x8_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR, 0 },
+ { PIPE_FORMAT_ASTC_10x10_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR, 0 },
+ { PIPE_FORMAT_ASTC_12x10_SRGB, 0},
+ },
+ {
+ { GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR, 0 },
+ { PIPE_FORMAT_ASTC_12x12_SRGB, 0},
+ },
+
/* signed/unsigned integer formats.
*/
{
{ 0, 0, 0 }
};
-static const struct exact_format_mapping rgba1010102_tbl[] =
-{
- { GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, PIPE_FORMAT_B10G10R10A2_UNORM },
- /* No Mesa formats for these Gallium formats:
- { GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, PIPE_FORMAT_R10G10B10A2_UNORM },
- { GL_ABGR_EXT, GL_UNSIGNED_INT_10_10_10_2, PIPE_FORMAT_R10G10B10A2_UNORM },
- { GL_ABGR_EXT, GL_UNSIGNED_INT, PIPE_FORMAT_R10G10B10A2_UNORM },
- */
- { 0, 0, 0 }
-};
-
/**
- * If there is an exact pipe_format match for {internalFormat, format, type}
- * return that, otherwise return PIPE_FORMAT_NONE so we can do fuzzy matching.
+ * For unsized/base internal formats, we may choose a convenient effective
+ * internal format for {format, type}. If one exists, return that, otherwise
+ * return PIPE_FORMAT_NONE.
*/
static enum pipe_format
find_exact_format(GLint internalFormat, GLenum format, GLenum type)
switch (internalFormat) {
case 4:
case GL_RGBA:
- case GL_RGBA8:
tbl = rgba8888_tbl;
break;
case 3:
case GL_RGB:
- case GL_RGB8:
tbl = rgbx8888_tbl;
break;
- case GL_RGB10_A2:
- tbl = rgba1010102_tbl;
- break;
default:
return PIPE_FORMAT_NONE;
}
unsigned bindings, boolean allow_dxt)
{
struct pipe_screen *screen = st->pipe->screen;
- int i, j;
+ unsigned i;
+ int j;
enum pipe_format pf;
#ifdef DEBUG
return pf;
/* search table for internalFormat */
- for (i = 0; i < Elements(format_map); i++) {
+ for (i = 0; i < ARRAY_SIZE(format_map); i++) {
const struct format_mapping *mapping = &format_map[i];
for (j = 0; mapping->glFormats[j]; j++) {
if (mapping->glFormats[j] == internalFormat) {
}
if (_mesa_format_matches_format_and_type(mesa_format, format, type,
- swapBytes)) {
+ swapBytes, NULL)) {
enum pipe_format format =
st_mesa_format_to_pipe_format(st, mesa_format);
GLint internalFormat,
GLenum format, GLenum type)
{
- const boolean want_renderable =
- internalFormat == 3 || internalFormat == 4 ||
- internalFormat == GL_RGB || internalFormat == GL_RGBA ||
- internalFormat == GL_RGB8 || internalFormat == GL_RGBA8 ||
- internalFormat == GL_BGRA;
struct st_context *st = st_context(ctx);
enum pipe_format pFormat;
+ mesa_format mFormat;
unsigned bindings;
- enum pipe_texture_target pTarget = gl_target_to_pipe(target);
+ bool is_renderbuffer = false;
+ enum pipe_texture_target pTarget;
+
+ if (target == GL_RENDERBUFFER) {
+ pTarget = PIPE_TEXTURE_2D;
+ is_renderbuffer = true;
+ } else {
+ pTarget = gl_target_to_pipe(target);
+ }
if (target == GL_TEXTURE_1D || target == GL_TEXTURE_1D_ARRAY) {
/* We don't do compression for these texture targets because of
}
/* GL textures may wind up being render targets, but we don't know
- * that in advance. Specify potential render target flags now.
+ * that in advance. Specify potential render target flags now for formats
+ * that we know should always be renderable.
*/
bindings = PIPE_BIND_SAMPLER_VIEW;
- if (want_renderable) {
- if (_mesa_is_depth_or_stencil_format(internalFormat))
- bindings |= PIPE_BIND_DEPTH_STENCIL;
- else
+ if (_mesa_is_depth_or_stencil_format(internalFormat))
+ bindings |= PIPE_BIND_DEPTH_STENCIL;
+ else if (is_renderbuffer || internalFormat == 3 || internalFormat == 4 ||
+ internalFormat == GL_RGB || internalFormat == GL_RGBA ||
+ internalFormat == GL_RGB8 || internalFormat == GL_RGBA8 ||
+ internalFormat == GL_BGRA ||
+ internalFormat == GL_RGB16F ||
+ internalFormat == GL_RGBA16F ||
+ internalFormat == GL_RGB32F ||
+ internalFormat == GL_RGBA32F)
bindings |= PIPE_BIND_RENDER_TARGET;
- }
/* GLES allows the driver to choose any format which matches
* the format+type combo, because GLES only supports unsized internal
if (pFormat != PIPE_FORMAT_NONE)
return st_pipe_format_to_mesa_format(pFormat);
- /* try choosing format again, this time without render target bindings */
- pFormat = st_choose_matching_format(st, PIPE_BIND_SAMPLER_VIEW,
- format, type,
- ctx->Unpack.SwapBytes);
- if (pFormat != PIPE_FORMAT_NONE)
- return st_pipe_format_to_mesa_format(pFormat);
+ if (!is_renderbuffer) {
+ /* try choosing format again, this time without render target bindings */
+ pFormat = st_choose_matching_format(st, PIPE_BIND_SAMPLER_VIEW,
+ format, type,
+ ctx->Unpack.SwapBytes);
+ if (pFormat != PIPE_FORMAT_NONE)
+ return st_pipe_format_to_mesa_format(pFormat);
+ }
}
}
pFormat = st_choose_format(st, internalFormat, format, type,
pTarget, 0, bindings, ctx->Mesa_DXTn);
- if (pFormat == PIPE_FORMAT_NONE) {
+ if (pFormat == PIPE_FORMAT_NONE && !is_renderbuffer) {
/* try choosing format again, this time without render target bindings */
pFormat = st_choose_format(st, internalFormat, format, type,
pTarget, 0, PIPE_BIND_SAMPLER_VIEW,
}
if (pFormat == PIPE_FORMAT_NONE) {
+ /* lie about using etc1/etc2 natively if we do decoding tricks */
+ mFormat = _mesa_glenum_to_compressed_format(internalFormat);
+ if ((mFormat == MESA_FORMAT_ETC1_RGB8 && !st->has_etc1) ||
+ (_mesa_is_format_etc2(mFormat) && !st->has_etc2))
+ return mFormat;
+
/* no luck at all */
return MESA_FORMAT_NONE;
}
- return st_pipe_format_to_mesa_format(pFormat);
+ mFormat = st_pipe_format_to_mesa_format(pFormat);
+
+ /* Debugging aid */
+ if (0) {
+ debug_printf("%s(intFormat=%s, format=%s, type=%s) -> %s, %s\n",
+ __func__,
+ _mesa_enum_to_string(internalFormat),
+ _mesa_enum_to_string(format),
+ _mesa_enum_to_string(type),
+ util_format_name(pFormat),
+ _mesa_get_format_name(mFormat));
+ }
+
+ return mFormat;
}
/**
- * Called via ctx->Driver.ChooseTextureFormat().
+ * Called via ctx->Driver.QueryInternalFormat().
*/
-size_t
+static size_t
st_QuerySamplesForFormat(struct gl_context *ctx, GLenum target,
GLenum internalFormat, int samples[16])
{
return num_sample_counts;
}
+/**
+ * ARB_internalformat_query2 driver hook.
+ */
+void
+st_QueryInternalFormat(struct gl_context *ctx, GLenum target,
+ GLenum internalFormat, GLenum pname, GLint *params)
+{
+ struct st_context *st = st_context(ctx);
+ /* The API entry-point gives us a temporary params buffer that is non-NULL
+ * and guaranteed to have at least 16 elements.
+ */
+ assert(params != NULL);
+
+ switch (pname) {
+ case GL_SAMPLES:
+ st_QuerySamplesForFormat(ctx, target, internalFormat, params);
+ break;
+
+ case GL_NUM_SAMPLE_COUNTS: {
+ size_t num_samples;
+ num_samples = st_QuerySamplesForFormat(ctx, target, internalFormat,
+ params);
+ params[0] = (GLint) num_samples;
+ break;
+ }
+ case GL_INTERNALFORMAT_PREFERRED: {
+ params[0] = GL_NONE;
+
+ /* We need to resolve an internal format that is compatible with
+ * the passed internal format, and optimal to the driver. By now,
+ * we just validate that the passed internal format is supported by
+ * the driver, and if so return the same internal format, otherwise
+ * return GL_NONE.
+ */
+ uint usage;
+ if (_mesa_is_depth_or_stencil_format(internalFormat))
+ usage = PIPE_BIND_DEPTH_STENCIL;
+ else
+ usage = PIPE_BIND_RENDER_TARGET;
+ enum pipe_format pformat = st_choose_format(st,
+ internalFormat,
+ GL_NONE,
+ GL_NONE,
+ PIPE_TEXTURE_2D, 1,
+ usage, FALSE);
+ if (pformat)
+ params[0] = internalFormat;
+ break;
+ }
+ default:
+ /* For the rest of the pnames, we call back the Mesa's default
+ * function for drivers that don't implement ARB_internalformat_query2.
+ */
+ _mesa_query_internal_format_default(ctx, target, internalFormat, pname,
+ params);
+ }
+}
/**
* This is used for translating texture border color and the clear
projects / mesa.git / blobdiff