#include "main/texstore.h"
#include "main/texformat.h"
#include "main/enums.h"
+#include "main/macros.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
+#include "pipe/p_screen.h"
#include "st_context.h"
#include "st_format.h"
+static GLuint
+format_bits(
+ pipe_format_rgbazs_t info,
+ GLuint comp )
+{
+ GLuint size;
+
+ if (pf_swizzle_x(info) == comp) {
+ size = pf_size_x(info);
+ }
+ else if (pf_swizzle_y(info) == comp) {
+ size = pf_size_y(info);
+ }
+ else if (pf_swizzle_z(info) == comp) {
+ size = pf_size_z(info);
+ }
+ else if (pf_swizzle_w(info) == comp) {
+ size = pf_size_w(info);
+ }
+ else {
+ size = 0;
+ }
+ return size << (pf_exp8(info) * 3);
+}
+
+static GLuint
+format_max_bits(
+ pipe_format_rgbazs_t info )
+{
+ GLuint size = format_bits( info, PIPE_FORMAT_COMP_R );
+
+ size = MAX2( size, format_bits( info, PIPE_FORMAT_COMP_G ) );
+ size = MAX2( size, format_bits( info, PIPE_FORMAT_COMP_B ) );
+ size = MAX2( size, format_bits( info, PIPE_FORMAT_COMP_A ) );
+ size = MAX2( size, format_bits( info, PIPE_FORMAT_COMP_Z ) );
+ size = MAX2( size, format_bits( info, PIPE_FORMAT_COMP_S ) );
+ return size;
+}
+static GLuint
+format_size(
+ pipe_format_rgbazs_t info )
+{
+ return
+ format_bits( info, PIPE_FORMAT_COMP_R ) +
+ format_bits( info, PIPE_FORMAT_COMP_G ) +
+ format_bits( info, PIPE_FORMAT_COMP_B ) +
+ format_bits( info, PIPE_FORMAT_COMP_A ) +
+ format_bits( info, PIPE_FORMAT_COMP_Z ) +
+ format_bits( info, PIPE_FORMAT_COMP_S );
+}
/*
* XXX temporary here
*/
-const struct pipe_format_info *
-st_get_format_info(GLuint format)
+GLboolean
+st_get_format_info(enum pipe_format format, struct pipe_format_info *pinfo)
{
- static const struct pipe_format_info info[] = {
- {
- PIPE_FORMAT_U_R8_G8_B8_A8, /* format */
- GL_RGBA, /* base_format */
- GL_UNSIGNED_BYTE, /* datatype for renderbuffers */
- 8, 8, 8, 8, 0, 0, /* color bits */
- 0, 0, /* depth, stencil */
- 4 /* size in bytes */
- },
- {
- PIPE_FORMAT_U_A8_R8_G8_B8,
- GL_RGBA, /* base_format */
- GL_UNSIGNED_BYTE, /* datatype for renderbuffers */
- 8, 8, 8, 8, 0, 0, /* color bits */
- 0, 0, /* depth, stencil */
- 4 /* size in bytes */
- },
- {
- PIPE_FORMAT_U_A1_R5_G5_B5,
- GL_RGBA, /* base_format */
- GL_UNSIGNED_SHORT, /* datatype for renderbuffers */
- 5, 5, 5, 1, 0, 0, /* color bits */
- 0, 0, /* depth, stencil */
- 2 /* size in bytes */
- },
- {
- PIPE_FORMAT_U_R5_G6_B5,
- GL_RGBA, /* base_format */
- GL_UNSIGNED_SHORT, /* datatype for renderbuffers */
- 5, 6, 5, 0, 0, 0, /* color bits */
- 0, 0, /* depth, stencil */
- 2 /* size in bytes */
- },
- {
- PIPE_FORMAT_S_R16_G16_B16_A16,
- GL_RGBA, /* base_format */
- GL_UNSIGNED_SHORT, /* datatype for renderbuffers */
- 16, 16, 16, 16, 0, 0, /* color bits */
- 0, 0, /* depth, stencil */
- 8 /* size in bytes */
- },
- {
- PIPE_FORMAT_U_Z16,
- GL_DEPTH_COMPONENT, /* base_format */
- GL_UNSIGNED_SHORT, /* datatype for renderbuffers */
- 0, 0, 0, 0, 0, 0, /* color bits */
- 16, 0, /* depth, stencil */
- 2 /* size in bytes */
- },
- {
- PIPE_FORMAT_U_Z32,
- GL_DEPTH_COMPONENT, /* base_format */
- GL_UNSIGNED_INT, /* datatype for renderbuffers */
- 0, 0, 0, 0, 0, 0, /* color bits */
- 32, 0, /* depth, stencil */
- 4 /* size in bytes */
- },
+ if (pf_layout(format) == PIPE_FORMAT_LAYOUT_RGBAZS) {
+ pipe_format_rgbazs_t info;
+
+ info = format;
+
+#if 0
{
- PIPE_FORMAT_S8_Z24,
- GL_DEPTH_STENCIL_EXT, /* base_format */
- GL_UNSIGNED_INT, /* datatype for renderbuffers */
- 0, 0, 0, 0, 0, 0, /* color bits */
- 24, 8, /* depth, stencil */
- 4 /* size in bytes */
+ char fmtname[256];
+
+ pf_sprint_name( fmtname, format );
+ printf(
+ "%s\n",
+ fmtname );
+ }
+#endif
+
+ /* Data type */
+ if (format == PIPE_FORMAT_A1R5G5B5_UNORM || format == PIPE_FORMAT_R5G6B5_UNORM) {
+ pinfo->datatype = GL_UNSIGNED_SHORT;
+ }
+ else {
+ GLuint size;
+
+ size = format_max_bits( info );
+ if (size == 8) {
+ if (pf_type(info) == PIPE_FORMAT_TYPE_UNORM)
+ pinfo->datatype = GL_UNSIGNED_BYTE;
+ else
+ pinfo->datatype = GL_BYTE;
+ }
+ else if (size == 16) {
+ if (pf_type(info) == PIPE_FORMAT_TYPE_UNORM)
+ pinfo->datatype = GL_UNSIGNED_SHORT;
+ else
+ pinfo->datatype = GL_SHORT;
+ }
+ else {
+ assert( size <= 32 );
+ if (pf_type(info) == PIPE_FORMAT_TYPE_UNORM)
+ pinfo->datatype = GL_UNSIGNED_INT;
+ else
+ pinfo->datatype = GL_INT;
+ }
+ }
+
+ /* Component bits */
+ pinfo->red_bits = format_bits( info, PIPE_FORMAT_COMP_R );
+ pinfo->green_bits = format_bits( info, PIPE_FORMAT_COMP_G );
+ pinfo->blue_bits = format_bits( info, PIPE_FORMAT_COMP_B );
+ pinfo->alpha_bits = format_bits( info, PIPE_FORMAT_COMP_A );
+ pinfo->depth_bits = format_bits( info, PIPE_FORMAT_COMP_Z );
+ pinfo->stencil_bits = format_bits( info, PIPE_FORMAT_COMP_S );
+ pinfo->luminance_bits = 0;
+ pinfo->intensity_bits = 0;
+
+ /* Format size */
+ pinfo->size = format_size( info ) / 8;
+
+ /* Luminance & Intensity bits */
+ if( pf_swizzle_x(info) == PIPE_FORMAT_COMP_R &&
+ pf_swizzle_y(info) == PIPE_FORMAT_COMP_R &&
+ pf_swizzle_z(info) == PIPE_FORMAT_COMP_R ) {
+ if( pf_swizzle_w(info) == PIPE_FORMAT_COMP_R ) {
+ pinfo->intensity_bits = pinfo->red_bits;
+ }
+ else {
+ pinfo->luminance_bits = pinfo->red_bits;
+ }
+ pinfo->red_bits = 0;
}
- /* XXX lots more cases to add */
- };
- GLuint i;
- for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
- if (info[i].format == format)
- return info + i;
+ /* Base format */
+ if (pinfo->depth_bits) {
+ if (pinfo->stencil_bits) {
+ pinfo->base_format = GL_DEPTH_STENCIL_EXT;
+ }
+ else {
+ pinfo->base_format = GL_DEPTH_COMPONENT;
+ }
+ }
+ else if (pinfo->stencil_bits) {
+ pinfo->base_format = GL_STENCIL_INDEX;
+ }
+ else {
+ pinfo->base_format = GL_RGBA;
+ }
+ }
+ else if (pf_layout(format) == PIPE_FORMAT_LAYOUT_YCBCR) {
+ pinfo->base_format = GL_YCBCR_MESA;
+ pinfo->datatype = GL_UNSIGNED_SHORT;
+ pinfo->size = 2; /* two bytes per "texel" */
}
- return NULL;
+ else {
+ /* compressed format? */
+ assert(0);
+ }
+
+#if 0
+ printf(
+ "ST_FORMAT: R(%u), G(%u), B(%u), A(%u), Z(%u), S(%u)\n",
+ pinfo->red_bits,
+ pinfo->green_bits,
+ pinfo->blue_bits,
+ pinfo->alpha_bits,
+ pinfo->depth_bits,
+ pinfo->stencil_bits );
+#endif
+
+ pinfo->format = format;
+
+ return GL_TRUE;
}
* Return bytes per pixel for the given format.
*/
GLuint
-st_sizeof_format(GLuint pipeFormat)
+st_sizeof_format(enum pipe_format format)
{
- const struct pipe_format_info *info = st_get_format_info(pipeFormat);
- assert(info);
- return info->size;
+ struct pipe_format_info info;
+ if (!st_get_format_info( format, &info )) {
+ assert( 0 );
+ return 0;
+ }
+ return info.size;
}
* Return bytes per pixel for the given format.
*/
GLenum
-st_format_datatype(GLuint pipeFormat)
+st_format_datatype(enum pipe_format format)
{
- const struct pipe_format_info *info = st_get_format_info(pipeFormat);
- assert(info);
- return info->datatype;
+ struct pipe_format_info info;
+ if (!st_get_format_info( format, &info )) {
+ assert( 0 );
+ return 0;
+ }
+ return info.datatype;
}
-GLuint
+enum pipe_format
st_mesa_format_to_pipe_format(GLuint mesaFormat)
{
switch (mesaFormat) {
/* fix this */
case MESA_FORMAT_ARGB8888_REV:
case MESA_FORMAT_ARGB8888:
- return PIPE_FORMAT_U_A8_R8_G8_B8;
+ return PIPE_FORMAT_A8R8G8B8_UNORM;
+ case MESA_FORMAT_ARGB1555:
+ return PIPE_FORMAT_A1R5G5B5_UNORM;
+ case MESA_FORMAT_ARGB4444:
+ return PIPE_FORMAT_A4R4G4B4_UNORM;
+ case MESA_FORMAT_RGB565:
+ return PIPE_FORMAT_R5G6B5_UNORM;
case MESA_FORMAT_AL88:
- return PIPE_FORMAT_U_A8_L8;
+ return PIPE_FORMAT_A8L8_UNORM;
case MESA_FORMAT_A8:
- return PIPE_FORMAT_U_A8;
+ return PIPE_FORMAT_A8_UNORM;
case MESA_FORMAT_L8:
- return PIPE_FORMAT_U_L8;
+ return PIPE_FORMAT_L8_UNORM;
case MESA_FORMAT_I8:
- return PIPE_FORMAT_U_I8;
+ return PIPE_FORMAT_I8_UNORM;
case MESA_FORMAT_Z16:
- return PIPE_FORMAT_U_Z16;
+ return PIPE_FORMAT_Z16_UNORM;
+ case MESA_FORMAT_Z32:
+ return PIPE_FORMAT_Z32_UNORM;
+ case MESA_FORMAT_Z24_S8:
+ return PIPE_FORMAT_Z24S8_UNORM;
+ case MESA_FORMAT_S8_Z24:
+ return PIPE_FORMAT_S8Z24_UNORM;
+ case MESA_FORMAT_YCBCR:
+ return PIPE_FORMAT_YCBCR;
+#if FEATURE_texture_s3tc
+ case MESA_FORMAT_RGB_DXT1:
+ return PIPE_FORMAT_DXT1_RGB;
+ case MESA_FORMAT_RGBA_DXT1:
+ return PIPE_FORMAT_DXT1_RGBA;
+ case MESA_FORMAT_RGBA_DXT3:
+ return PIPE_FORMAT_DXT3_RGBA;
+ case MESA_FORMAT_RGBA_DXT5:
+ return PIPE_FORMAT_DXT5_RGBA;
+#endif
default:
assert(0);
return 0;
}
}
-
/**
- * Search list of formats for first RGBA format.
+ * Find an RGBA format supported by the context/winsys.
*/
-static GLuint
-default_rgba_format(const GLuint formats[], GLuint num)
+static enum pipe_format
+default_rgba_format(struct pipe_screen *screen, uint type)
{
- GLuint i;
- for (i = 0; i < num; i++) {
- if (formats[i] == PIPE_FORMAT_U_R8_G8_B8_A8 ||
- formats[i] == PIPE_FORMAT_U_A8_R8_G8_B8 ||
- formats[i] == PIPE_FORMAT_U_R5_G6_B5) {
- return formats[i];
+ static const enum pipe_format colorFormats[] = {
+ PIPE_FORMAT_A8R8G8B8_UNORM,
+ PIPE_FORMAT_B8G8R8A8_UNORM,
+ PIPE_FORMAT_R8G8B8A8_UNORM,
+ PIPE_FORMAT_R5G6B5_UNORM
+ };
+ uint i;
+ for (i = 0; i < Elements(colorFormats); i++) {
+ if (screen->is_format_supported( screen, colorFormats[i], type )) {
+ return colorFormats[i];
}
}
return PIPE_FORMAT_NONE;
/**
* Search list of formats for first RGBA format with >8 bits/channel.
*/
-static GLuint
-default_deep_rgba_format(const GLuint formats[], GLuint num)
+static enum pipe_format
+default_deep_rgba_format(struct pipe_screen *screen, uint type)
{
- GLuint i;
- for (i = 0; i < num; i++) {
- if (formats[i] == PIPE_FORMAT_S_R16_G16_B16_A16) {
- return formats[i];
- }
+ if (screen->is_format_supported(screen, PIPE_FORMAT_R16G16B16A16_SNORM, type)) {
+ return PIPE_FORMAT_R16G16B16A16_SNORM;
}
- return PIPE_FORMAT_NONE;
+ if (type == PIPE_TEXTURE)
+ return default_rgba_format(screen, type);
+ else
+ return PIPE_FORMAT_NONE;
}
/**
- * Search list of formats for first depth/Z format.
+ * Find an Z format supported by the context/winsys.
*/
-static GLuint
-default_depth_format(const GLuint formats[], GLuint num)
+static enum pipe_format
+default_depth_format(struct pipe_screen *screen, uint type)
{
- GLuint i;
- for (i = 0; i < num; i++) {
- if (formats[i] == PIPE_FORMAT_U_Z16 ||
- formats[i] == PIPE_FORMAT_U_Z32 ||
- formats[i] == PIPE_FORMAT_S8_Z24) {
- return formats[i];
+ static const enum pipe_format zFormats[] = {
+ PIPE_FORMAT_Z16_UNORM,
+ PIPE_FORMAT_Z32_UNORM,
+ PIPE_FORMAT_S8Z24_UNORM,
+ PIPE_FORMAT_Z24S8_UNORM
+ };
+ uint i;
+ for (i = 0; i < Elements(zFormats); i++) {
+ if (screen->is_format_supported( screen, zFormats[i], type )) {
+ return zFormats[i];
}
}
return PIPE_FORMAT_NONE;
/**
- * Choose the PIPE_FORMAT_ to use for storing a texture image based
- * on the user's internalFormat, format and type parameters.
- * We query the pipe device for a list of formats which it supports
- * and choose from them.
- * If we find a device that needs a more intricate selection mechanism,
- * this function _could_ get pushed down into the pipe device.
- *
- * Note: also used for glRenderbufferStorageEXT()
- *
- * Note: format and type may be GL_NONE (see renderbuffers)
- *
- * \return PIPE_FORMAT_NONE if error/problem.
+ * Given an OpenGL internalFormat value for a texture or surface, return
+ * the best matching PIPE_FORMAT_x, or PIPE_FORMAT_NONE if there's no match.
*/
-GLuint
-st_choose_pipe_format(struct pipe_context *pipe, GLint internalFormat,
- GLenum format, GLenum type)
+enum pipe_format
+st_choose_format(struct pipe_context *pipe, GLint internalFormat,
+ uint surfType)
{
- const GLuint *supported;
- GLboolean allow[PIPE_FORMAT_COUNT];
- GLuint i, n;
-
- /* query supported formats and fill in bool allow[] table */
- supported = pipe->supported_formats(pipe, &n);
- assert(n < PIPE_FORMAT_COUNT); /* sanity check */
- memset(allow, 0, sizeof(allow));
- for (i = 0; i < n; i++) {
- allow[supported[i]] = 1;
- }
+ struct pipe_screen *screen = pipe->screen;
+
+ assert(surfType == PIPE_SURFACE ||
+ surfType == PIPE_TEXTURE);
switch (internalFormat) {
case 4:
case GL_RGBA:
case GL_COMPRESSED_RGBA:
- if (format == GL_BGRA) {
- if (type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) {
- if (allow[PIPE_FORMAT_U_A8_R8_G8_B8])
- return PIPE_FORMAT_U_A8_R8_G8_B8;
- }
- else if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {
- if (allow[PIPE_FORMAT_U_A4_R4_G4_B4])
- return PIPE_FORMAT_U_A4_R4_G4_B4;
- }
- else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {
- if (allow[PIPE_FORMAT_U_A1_R5_G5_B5])
- return PIPE_FORMAT_U_A1_R5_G5_B5;
- }
- }
- return default_rgba_format(supported, n);
-
case 3:
case GL_RGB:
case GL_COMPRESSED_RGB:
- if (format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5) {
- if (allow[PIPE_FORMAT_U_R5_G6_B5])
- return PIPE_FORMAT_U_R5_G6_B5;
- }
- return default_rgba_format(supported, n);
-
case GL_RGBA8:
case GL_RGB10_A2:
case GL_RGBA12:
- return default_rgba_format(supported, n);
+ return default_rgba_format( screen, surfType );
case GL_RGBA16:
- return default_deep_rgba_format(supported, n);
+ return default_deep_rgba_format( screen, surfType );
case GL_RGBA4:
case GL_RGBA2:
- if (allow[PIPE_FORMAT_U_A4_R4_G4_B4])
- return PIPE_FORMAT_U_A4_R4_G4_B4;
- return default_rgba_format(supported, n);
+ if (screen->is_format_supported( screen, PIPE_FORMAT_A4R4G4B4_UNORM, surfType ))
+ return PIPE_FORMAT_A4R4G4B4_UNORM;
+ return default_rgba_format( screen, surfType );
case GL_RGB5_A1:
- if (allow[PIPE_FORMAT_U_A1_R5_G5_B5])
- return PIPE_FORMAT_U_A1_R5_G5_B5;
- return default_rgba_format(supported, n);
+ if (screen->is_format_supported( screen, PIPE_FORMAT_A1R5G5B5_UNORM, surfType ))
+ return PIPE_FORMAT_A1R5G5B5_UNORM;
+ return default_rgba_format( screen, surfType );
case GL_RGB8:
case GL_RGB10:
case GL_RGB12:
case GL_RGB16:
- return default_rgba_format(supported, n);
+ return default_rgba_format( screen, surfType );
case GL_RGB5:
case GL_RGB4:
case GL_R3_G3_B2:
- if (allow[PIPE_FORMAT_U_A1_R5_G5_B5])
- return PIPE_FORMAT_U_A1_R5_G5_B5;
- return default_rgba_format(supported, n);
+ if (screen->is_format_supported( screen, PIPE_FORMAT_A1R5G5B5_UNORM, surfType ))
+ return PIPE_FORMAT_A1R5G5B5_UNORM;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_R5G6B5_UNORM, surfType ))
+ return PIPE_FORMAT_R5G6B5_UNORM;
+ return default_rgba_format( screen, surfType );
case GL_ALPHA:
case GL_ALPHA4:
case GL_ALPHA12:
case GL_ALPHA16:
case GL_COMPRESSED_ALPHA:
- if (allow[PIPE_FORMAT_U_A8])
- return PIPE_FORMAT_U_A8;
- return default_rgba_format(supported, n);
+ if (screen->is_format_supported( screen, PIPE_FORMAT_A8_UNORM, surfType ))
+ return PIPE_FORMAT_A8_UNORM;
+ return default_rgba_format( screen, surfType );
case 1:
case GL_LUMINANCE:
case GL_LUMINANCE12:
case GL_LUMINANCE16:
case GL_COMPRESSED_LUMINANCE:
- if (allow[PIPE_FORMAT_U_A8])
- return PIPE_FORMAT_U_A8;
- return default_rgba_format(supported, n);
+ if (screen->is_format_supported( screen, PIPE_FORMAT_L8_UNORM, surfType ))
+ return PIPE_FORMAT_L8_UNORM;
+ return default_rgba_format( screen, surfType );
case 2:
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE12_ALPHA12:
case GL_LUMINANCE16_ALPHA16:
case GL_COMPRESSED_LUMINANCE_ALPHA:
- if (allow[PIPE_FORMAT_U_A8_L8])
- return PIPE_FORMAT_U_A8_L8;
- return default_rgba_format(supported, n);
+ if (screen->is_format_supported( screen, PIPE_FORMAT_A8L8_UNORM, surfType ))
+ return PIPE_FORMAT_A8L8_UNORM;
+ return default_rgba_format( screen, surfType );
case GL_INTENSITY:
case GL_INTENSITY4:
case GL_INTENSITY12:
case GL_INTENSITY16:
case GL_COMPRESSED_INTENSITY:
- if (allow[PIPE_FORMAT_U_I8])
- return PIPE_FORMAT_U_I8;
- return default_rgba_format(supported, n);
+ if (screen->is_format_supported( screen, PIPE_FORMAT_I8_UNORM, surfType ))
+ return PIPE_FORMAT_I8_UNORM;
+ return default_rgba_format( screen, surfType );
case GL_YCBCR_MESA:
- if (type == GL_UNSIGNED_SHORT_8_8_MESA || type == GL_UNSIGNED_BYTE) {
- if (allow[PIPE_FORMAT_YCBCR])
- return PIPE_FORMAT_YCBCR;
+ if (screen->is_format_supported(screen, PIPE_FORMAT_YCBCR,
+ PIPE_TEXTURE)) {
+ return PIPE_FORMAT_YCBCR;
}
- else {
- if (allow[PIPE_FORMAT_YCBCR_REV])
- return PIPE_FORMAT_YCBCR_REV;
+ if (screen->is_format_supported(screen, PIPE_FORMAT_YCBCR_REV,
+ PIPE_TEXTURE)) {
+ return PIPE_FORMAT_YCBCR_REV;
}
return PIPE_FORMAT_NONE;
-#if 0
- case GL_COMPRESSED_RGB_FXT1_3DFX:
- return &_mesa_texformat_rgb_fxt1;
- case GL_COMPRESSED_RGBA_FXT1_3DFX:
- return &_mesa_texformat_rgba_fxt1;
-
case GL_RGB_S3TC:
case GL_RGB4_S3TC:
case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
- return &_mesa_texformat_rgb_dxt1;
+ return PIPE_FORMAT_DXT1_RGB;
case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
- return &_mesa_texformat_rgba_dxt1;
+ return PIPE_FORMAT_DXT1_RGBA;
case GL_RGBA_S3TC:
case GL_RGBA4_S3TC:
case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
- return &_mesa_texformat_rgba_dxt3;
+ return PIPE_FORMAT_DXT3_RGBA;
case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
- return &_mesa_texformat_rgba_dxt5;
+ return PIPE_FORMAT_DXT5_RGBA;
+
+#if 0
+ case GL_COMPRESSED_RGB_FXT1_3DFX:
+ return PIPE_FORMAT_RGB_FXT1;
+ case GL_COMPRESSED_RGBA_FXT1_3DFX:
+ return PIPE_FORMAT_RGB_FXT1;
#endif
case GL_DEPTH_COMPONENT16:
- if (allow[PIPE_FORMAT_U_Z16])
- return PIPE_FORMAT_U_Z16;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_Z16_UNORM, surfType ))
+ return PIPE_FORMAT_Z16_UNORM;
/* fall-through */
case GL_DEPTH_COMPONENT24:
- if (allow[PIPE_FORMAT_S8_Z24])
- return PIPE_FORMAT_S8_Z24;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_S8Z24_UNORM, surfType ))
+ return PIPE_FORMAT_S8Z24_UNORM;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_Z24S8_UNORM, surfType ))
+ return PIPE_FORMAT_Z24S8_UNORM;
/* fall-through */
case GL_DEPTH_COMPONENT32:
- if (allow[PIPE_FORMAT_U_Z32])
- return PIPE_FORMAT_U_Z32;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_Z32_UNORM, surfType ))
+ return PIPE_FORMAT_Z32_UNORM;
/* fall-through */
case GL_DEPTH_COMPONENT:
- return default_depth_format(supported, n);
+ return default_depth_format( screen, surfType );
case GL_STENCIL_INDEX:
case GL_STENCIL_INDEX1_EXT:
case GL_STENCIL_INDEX4_EXT:
case GL_STENCIL_INDEX8_EXT:
case GL_STENCIL_INDEX16_EXT:
- if (allow[PIPE_FORMAT_U_S8])
- return PIPE_FORMAT_U_S8;
- if (allow[PIPE_FORMAT_S8_Z24])
- return PIPE_FORMAT_S8_Z24;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_S8_UNORM, surfType ))
+ return PIPE_FORMAT_S8_UNORM;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_S8Z24_UNORM, surfType ))
+ return PIPE_FORMAT_S8Z24_UNORM;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_Z24S8_UNORM, surfType ))
+ return PIPE_FORMAT_Z24S8_UNORM;
return PIPE_FORMAT_NONE;
case GL_DEPTH_STENCIL_EXT:
case GL_DEPTH24_STENCIL8_EXT:
- if (allow[PIPE_FORMAT_S8_Z24])
- return PIPE_FORMAT_S8_Z24;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_S8Z24_UNORM, surfType ))
+ return PIPE_FORMAT_S8Z24_UNORM;
+ if (screen->is_format_supported( screen, PIPE_FORMAT_Z24S8_UNORM, surfType ))
+ return PIPE_FORMAT_Z24S8_UNORM;
return PIPE_FORMAT_NONE;
default:
}
-
-/* It works out that this function is fine for all the supported
- * hardware. However, there is still a need to map the formats onto
- * hardware descriptors.
- */
-/* Note that the i915 can actually support many more formats than
- * these if we take the step of simply swizzling the colors
- * immediately after sampling...
+/**
+ * Called by FBO code to choose a PIPE_FORMAT_ for drawing surfaces.
*/
-const struct gl_texture_format *
-st_ChooseTextureFormat(GLcontext * ctx, GLint internalFormat,
- GLenum format, GLenum type)
+enum pipe_format
+st_choose_renderbuffer_format(struct pipe_context *pipe, GLint internalFormat)
{
-#if 0
- struct intel_context *intel = intel_context(ctx);
- const GLboolean do32bpt = (intel->intelScreen->front.cpp == 4);
-#else
- const GLboolean do32bpt = 1;
-#endif
-
- switch (internalFormat) {
- case 4:
- case GL_RGBA:
- case GL_COMPRESSED_RGBA:
- if (format == GL_BGRA) {
- if (type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) {
- return &_mesa_texformat_argb8888;
- }
- else if (type == GL_UNSIGNED_SHORT_4_4_4_4_REV) {
- return &_mesa_texformat_argb4444;
- }
- else if (type == GL_UNSIGNED_SHORT_1_5_5_5_REV) {
- return &_mesa_texformat_argb1555;
- }
- }
- return do32bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_argb4444;
-
- case 3:
- case GL_RGB:
- case GL_COMPRESSED_RGB:
- if (format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5) {
- return &_mesa_texformat_rgb565;
- }
- return do32bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_rgb565;
-
- case GL_RGBA8:
- case GL_RGB10_A2:
- case GL_RGBA12:
- case GL_RGBA16:
- return do32bpt ? &_mesa_texformat_argb8888 : &_mesa_texformat_argb4444;
-
- case GL_RGBA4:
- case GL_RGBA2:
- return &_mesa_texformat_argb4444;
+ return st_choose_format(pipe, internalFormat, PIPE_SURFACE);
+}
- case GL_RGB5_A1:
- return &_mesa_texformat_argb1555;
- case GL_RGB8:
- case GL_RGB10:
- case GL_RGB12:
- case GL_RGB16:
+static const struct gl_texture_format *
+translate_gallium_format_to_mesa_format(enum pipe_format format)
+{
+ switch (format) {
+ case PIPE_FORMAT_A8R8G8B8_UNORM:
return &_mesa_texformat_argb8888;
-
- case GL_RGB5:
- case GL_RGB4:
- case GL_R3_G3_B2:
+ case PIPE_FORMAT_A1R5G5B5_UNORM:
+ return &_mesa_texformat_argb1555;
+ case PIPE_FORMAT_A4R4G4B4_UNORM:
+ return &_mesa_texformat_argb4444;
+ case PIPE_FORMAT_R5G6B5_UNORM:
return &_mesa_texformat_rgb565;
-
- case GL_ALPHA:
- case GL_ALPHA4:
- case GL_ALPHA8:
- case GL_ALPHA12:
- case GL_ALPHA16:
- case GL_COMPRESSED_ALPHA:
+ case PIPE_FORMAT_A8L8_UNORM:
+ return &_mesa_texformat_al88;
+ case PIPE_FORMAT_A8_UNORM:
return &_mesa_texformat_a8;
-
- case 1:
- case GL_LUMINANCE:
- case GL_LUMINANCE4:
- case GL_LUMINANCE8:
- case GL_LUMINANCE12:
- case GL_LUMINANCE16:
- case GL_COMPRESSED_LUMINANCE:
+ case PIPE_FORMAT_L8_UNORM:
return &_mesa_texformat_l8;
-
- case 2:
- case GL_LUMINANCE_ALPHA:
- case GL_LUMINANCE4_ALPHA4:
- case GL_LUMINANCE6_ALPHA2:
- case GL_LUMINANCE8_ALPHA8:
- case GL_LUMINANCE12_ALPHA4:
- case GL_LUMINANCE12_ALPHA12:
- case GL_LUMINANCE16_ALPHA16:
- case GL_COMPRESSED_LUMINANCE_ALPHA:
- return &_mesa_texformat_al88;
-
- case GL_INTENSITY:
- case GL_INTENSITY4:
- case GL_INTENSITY8:
- case GL_INTENSITY12:
- case GL_INTENSITY16:
- case GL_COMPRESSED_INTENSITY:
+ case PIPE_FORMAT_I8_UNORM:
return &_mesa_texformat_i8;
-
- case GL_YCBCR_MESA:
- if (type == GL_UNSIGNED_SHORT_8_8_MESA || type == GL_UNSIGNED_BYTE)
- return &_mesa_texformat_ycbcr;
- else
- return &_mesa_texformat_ycbcr_rev;
-
- case GL_COMPRESSED_RGB_FXT1_3DFX:
- return &_mesa_texformat_rgb_fxt1;
- case GL_COMPRESSED_RGBA_FXT1_3DFX:
- return &_mesa_texformat_rgba_fxt1;
-
- case GL_RGB_S3TC:
- case GL_RGB4_S3TC:
- case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+ case PIPE_FORMAT_Z16_UNORM:
+ return &_mesa_texformat_z16;
+ case PIPE_FORMAT_Z32_UNORM:
+ return &_mesa_texformat_z32;
+ case PIPE_FORMAT_Z24S8_UNORM:
+ return &_mesa_texformat_z24_s8;
+ case PIPE_FORMAT_S8Z24_UNORM:
+ return &_mesa_texformat_s8_z24;
+ case PIPE_FORMAT_YCBCR:
+ return &_mesa_texformat_ycbcr;
+ case PIPE_FORMAT_YCBCR_REV:
+ return &_mesa_texformat_ycbcr_rev;
+#if FEATURE_texture_s3tc
+ case PIPE_FORMAT_DXT1_RGB:
return &_mesa_texformat_rgb_dxt1;
-
- case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+ case PIPE_FORMAT_DXT1_RGBA:
return &_mesa_texformat_rgba_dxt1;
-
- case GL_RGBA_S3TC:
- case GL_RGBA4_S3TC:
- case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+ case PIPE_FORMAT_DXT3_RGBA:
return &_mesa_texformat_rgba_dxt3;
-
- case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+ case PIPE_FORMAT_DXT5_RGBA:
return &_mesa_texformat_rgba_dxt5;
+#endif
+ /* XXX add additional cases */
+ default:
+ assert(0);
+ return NULL;
+ }
+}
- case GL_DEPTH_COMPONENT:
- case GL_DEPTH_COMPONENT16:
- case GL_DEPTH_COMPONENT24:
- case GL_DEPTH_COMPONENT32:
- return &_mesa_texformat_z16;
- case GL_DEPTH_STENCIL_EXT:
- case GL_DEPTH24_STENCIL8_EXT:
- return &_mesa_texformat_z24_s8;
+/**
+ * Called via ctx->Driver.chooseTextureFormat().
+ */
+const struct gl_texture_format *
+st_ChooseTextureFormat(GLcontext *ctx, GLint internalFormat,
+ GLenum format, GLenum type)
+{
+ enum pipe_format pFormat;
- default:
- fprintf(stderr, "unexpected texture format %s in %s\n",
- _mesa_lookup_enum_by_nr(internalFormat), __FUNCTION__);
+ (void) format;
+ (void) type;
+
+ pFormat = st_choose_format(ctx->st->pipe, internalFormat, PIPE_TEXTURE);
+ if (pFormat == PIPE_FORMAT_NONE)
return NULL;
- }
- return NULL; /* never get here */
+ return translate_gallium_format_to_mesa_format(pFormat);
}
projects / mesa.git / blobdiff